Download as
Browse Code »

Commit a40fc2e6bcd310811a834f24ad87bc2f55f5aa10

Authored by Cyril Mougel
1 parent fb783205
Exists in master and in 1 other branch production

update some gem and fix issue with travis

Showing 2 changed files with 31 additions and 33 deletions   Show diff stats
Gemfile
  Diff comments   View file @a40fc2e
... ... @@ -89,11 +89,9 @@ group :development, :test do
89 89 gem 'rspec-rails', '~> 2.6'
90 90 gem 'webmock', :require => false
91 91 gem 'airbrake', :require => false
92   - unless ENV["CI"]
93   - gem 'ruby-debug', :platform => :mri_18
94   - gem 'debugger', :platform => :mri_19
95   - gem 'pry-rails'
96   - end
  92 + gem 'ruby-debug', :platform => :mri_18
  93 + gem 'debugger', :platform => :mri_19
  94 + gem 'pry-rails'
97 95 # gem 'rpm_contrib'
98 96 # gem 'newrelic_rpm'
99 97 gem 'quiet_assets'
... ...
Gemfile.lock
  Diff comments   View file @a40fc2e
... ... @@ -40,13 +40,13 @@ GEM
40 40 activesupport (3.2.13)
41 41 i18n (= 0.6.1)
42 42 multi_json (~> 1.0)
43   - addressable (2.3.4)
  43 + addressable (2.3.5)
44 44 airbrake (3.1.12)
45 45 activesupport
46 46 builder
47 47 json
48 48 arel (3.0.2)
49   - bcrypt-ruby (3.0.1)
  49 + bcrypt-ruby (3.1.1)
50 50 better_errors (0.9.0)
51 51 coderay (>= 1.0.0)
52 52 erubis (>= 2.6.6)
... ... @@ -66,7 +66,7 @@ GEM
66 66 callsite (0.0.11)
67 67 campy (0.1.3)
68 68 multi_json (~> 1.0)
69   - capistrano (2.15.4)
  69 + capistrano (2.15.5)
70 70 highline
71 71 net-scp (>= 1.0.0)
72 72 net-sftp (>= 2.0.0)
... ... @@ -90,19 +90,19 @@ GEM
90 90 rest-client
91 91 simplecov (>= 0.7)
92 92 thor
93   - crack (0.4.0)
  93 + crack (0.4.1)
94 94 safe_yaml (~> 0.9.0)
95 95 css_parser (1.3.4)
96 96 addressable
97 97 daemons (1.1.9)
98 98 database_cleaner (0.9.1)
99 99 debug_inspector (0.0.2)
100   - debugger (1.6.0)
  100 + debugger (1.6.1)
101 101 columnize (>= 0.3.1)
102 102 debugger-linecache (~> 1.2.0)
103   - debugger-ruby_core_source (~> 1.2.1)
  103 + debugger-ruby_core_source (~> 1.2.3)
104 104 debugger-linecache (1.2.0)
105   - debugger-ruby_core_source (1.2.2)
  105 + debugger-ruby_core_source (1.2.3)
106 106 decent_exposure (2.2.0)
107 107 devise (2.2.4)
108 108 bcrypt-ruby (~> 3.0)
... ... @@ -111,7 +111,7 @@ GEM
111 111 warden (~> 1.2.1)
112 112 diff-lcs (1.2.4)
113 113 dotenv (0.8.0)
114   - email_spec (1.4.0)
  114 + email_spec (1.5.0)
115 115 launchy (~> 2.1)
116 116 mail (~> 2.2)
117 117 erubis (2.7.0)
... ... @@ -119,8 +119,8 @@ GEM
119 119 execjs (1.4.0)
120 120 multi_json (~> 1.0)
121 121 fabrication (1.3.2)
122   - faraday (0.8.7)
123   - multipart-post (~> 1.1)
  122 + faraday (0.8.8)
  123 + multipart-post (~> 1.2.0)
124 124 faraday_middleware (0.8.8)
125 125 faraday (>= 0.7.4, < 0.9)
126 126 ffi (1.9.0)
... ... @@ -198,11 +198,11 @@ GEM
198 198 multi_json (1.7.7)
199 199 multi_xml (0.5.4)
200 200 multipart-post (1.2.0)
201   - net-scp (1.1.1)
  201 + net-scp (1.1.2)
202 202 net-ssh (>= 2.6.5)
203 203 net-sftp (2.1.2)
204 204 net-ssh (>= 2.6.5)
205   - net-ssh (2.6.7)
  205 + net-ssh (2.6.8)
206 206 net-ssh-gateway (1.2.0)
207 207 net-ssh (>= 2.6.5)
208 208 nokogiri (1.5.10)
... ... @@ -224,7 +224,7 @@ GEM
224 224 omniauth (1.1.4)
225 225 hashie (>= 1.2, < 3)
226 226 rack
227   - omniauth-github (1.1.0)
  227 + omniauth-github (1.1.1)
228 228 omniauth (~> 1.0)
229 229 omniauth-oauth2 (~> 1.1)
230 230 omniauth-oauth2 (1.1.1)
... ... @@ -253,7 +253,7 @@ GEM
253 253 coderay (~> 1.0.5)
254 254 method_source (~> 0.8)
255 255 slop (~> 3.4)
256   - pry-rails (0.3.1)
  256 + pry-rails (0.3.2)
257 257 pry (>= 0.9.10)
258 258 quiet_assets (1.0.2)
259 259 railties (>= 3.1, < 5.0)
... ... @@ -293,17 +293,17 @@ GEM
293 293 rest-client (1.6.7)
294 294 mime-types (>= 1.16)
295 295 ri_cal (0.8.8)
296   - rspec-core (2.13.1)
297   - rspec-expectations (2.13.0)
  296 + rspec-core (2.14.4)
  297 + rspec-expectations (2.14.0)
298 298 diff-lcs (>= 1.1.3, < 2.0)
299   - rspec-mocks (2.13.1)
300   - rspec-rails (2.13.2)
  299 + rspec-mocks (2.14.2)
  300 + rspec-rails (2.14.0)
301 301 actionpack (>= 3.0)
302 302 activesupport (>= 3.0)
303 303 railties (>= 3.0)
304   - rspec-core (~> 2.13.0)
305   - rspec-expectations (~> 2.13.0)
306   - rspec-mocks (~> 2.13.0)
  304 + rspec-core (~> 2.14.0)
  305 + rspec-expectations (~> 2.14.0)
  306 + rspec-mocks (~> 2.14.0)
307 307 ruby-debug (0.10.4)
308 308 columnize (>= 0.1)
309 309 ruby-debug-base (~> 0.10.4.0)
... ... @@ -315,7 +315,7 @@ GEM
315 315 rushover (0.3.0)
316 316 json
317 317 rest-client
318   - safe_yaml (0.9.3)
  318 + safe_yaml (0.9.4)
319 319 selenium-webdriver (2.33.0)
320 320 childprocess (>= 0.2.5)
321 321 multi_json (~> 1.0)
... ... @@ -326,7 +326,7 @@ GEM
326 326 multi_json (~> 1.0)
327 327 simplecov-html (~> 0.7.1)
328 328 simplecov-html (0.7.1)
329   - slop (3.4.5)
  329 + slop (3.4.6)
330 330 sprockets (2.2.2)
331 331 hike (~> 1.2)
332 332 multi_json (~> 1.0)
... ... @@ -352,7 +352,7 @@ GEM
352 352 rack (>= 1.0.0)
353 353 thor (0.18.1)
354 354 tilt (1.4.1)
355   - timecop (0.6.1)
  355 + timecop (0.6.2.2)
356 356 treetop (1.4.14)
357 357 polyglot
358 358 polyglot (>= 0.3.1)
... ... @@ -360,18 +360,18 @@ GEM
360 360 railties (> 3.2.8, < 4.0.0)
361 361 sprockets (>= 2.0.0)
362 362 tzinfo (0.3.37)
363   - uglifier (2.1.1)
  363 + uglifier (2.1.2)
364 364 execjs (>= 0.3.0)
365 365 multi_json (~> 1.0, >= 1.0.2)
366   - underscore-rails (1.4.4)
  366 + underscore-rails (1.5.1)
367 367 unicorn (4.6.3)
368 368 kgio (~> 2.6)
369 369 rack
370 370 raindrops (~> 0.7)
371 371 useragent (0.6.0)
372   - warden (1.2.1)
  372 + warden (1.2.3)
373 373 rack (>= 1.0)
374   - webmock (1.12.0)
  374 + webmock (1.13.0)
375 375 addressable (>= 2.2.7)
376 376 crack (>= 0.3.2)
377 377 websocket (1.0.7)
... ...