Download as
Browse Code »

Commit 471a287241ad96972fdf421530e2932f9d8d42b0

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

Update Gem like rails 3.2.15

Showing 2 changed files with 40 additions and 40 deletions   Show diff stats
Gemfile
  Diff comments   View file @471a287
... ... @@ -93,7 +93,7 @@ group :development, :test do
93 93 end
94 94  
95 95 group :development do
96   - gem 'capistrano'
  96 + gem 'capistrano', '~> 2.0', :require => false
97 97  
98 98 # better errors
99 99 gem 'better_errors'
... ...
Gemfile.lock
  Diff comments   View file @471a287
... ... @@ -8,16 +8,16 @@ GIT
8 8 GEM
9 9 remote: https://rubygems.org/
10 10 specs:
11   - actionmailer (3.2.14)
12   - actionpack (= 3.2.14)
  11 + actionmailer (3.2.15)
  12 + actionpack (= 3.2.15)
13 13 mail (~> 2.5.4)
14 14 actionmailer_inline_css (1.5.3)
15 15 actionmailer (>= 3.0.0)
16 16 nokogiri (>= 1.4.4)
17 17 premailer (>= 1.7.1)
18   - actionpack (3.2.14)
19   - activemodel (= 3.2.14)
20   - activesupport (= 3.2.14)
  18 + actionpack (3.2.15)
  19 + activemodel (= 3.2.15)
  20 + activesupport (= 3.2.15)
21 21 builder (~> 3.0.0)
22 22 erubis (~> 2.7.0)
23 23 journey (~> 1.0.4)
... ... @@ -25,18 +25,18 @@ GEM
25 25 rack-cache (~> 1.2)
26 26 rack-test (~> 0.6.1)
27 27 sprockets (~> 2.2.1)
28   - activemodel (3.2.14)
29   - activesupport (= 3.2.14)
  28 + activemodel (3.2.15)
  29 + activesupport (= 3.2.15)
30 30 builder (~> 3.0.0)
31   - activerecord (3.2.14)
32   - activemodel (= 3.2.14)
33   - activesupport (= 3.2.14)
  31 + activerecord (3.2.15)
  32 + activemodel (= 3.2.15)
  33 + activesupport (= 3.2.15)
34 34 arel (~> 3.0.2)
35 35 tzinfo (~> 0.3.29)
36   - activeresource (3.2.14)
37   - activemodel (= 3.2.14)
38   - activesupport (= 3.2.14)
39   - activesupport (3.2.14)
  36 + activeresource (3.2.15)
  37 + activemodel (= 3.2.15)
  38 + activesupport (= 3.2.15)
  39 + activesupport (3.2.15)
40 40 i18n (~> 0.6, >= 0.6.4)
41 41 multi_json (~> 1.0)
42 42 addressable (2.3.5)
... ... @@ -85,7 +85,7 @@ GEM
85 85 safe_yaml (~> 0.9.0)
86 86 css_parser (1.3.5)
87 87 addressable
88   - database_cleaner (1.1.1)
  88 + database_cleaner (1.2.0)
89 89 debug_inspector (0.0.2)
90 90 debugger (1.6.2)
91 91 columnize (>= 0.3.1)
... ... @@ -106,7 +106,7 @@ GEM
106 106 launchy (~> 2.1)
107 107 mail (~> 2.2)
108 108 erubis (2.7.0)
109   - execjs (2.0.1)
  109 + execjs (2.0.2)
110 110 fabrication (2.8.1)
111 111 faraday (0.8.8)
112 112 multipart-post (~> 1.2.0)
... ... @@ -134,8 +134,8 @@ GEM
134 134 activesupport
135 135 builder
136 136 htmlentities (4.3.1)
137   - httparty (0.11.0)
138   - multi_json (~> 1.0)
  137 + httparty (0.12.0)
  138 + json (~> 1.8)
139 139 multi_xml (>= 0.5.2)
140 140 httpauth (0.2.0)
141 141 i18n (0.6.5)
... ... @@ -187,7 +187,7 @@ GEM
187 187 rails (>= 3.2.0)
188 188 railties (>= 3.2.0)
189 189 moped (1.5.1)
190   - multi_json (1.8.1)
  190 + multi_json (1.8.2)
191 191 multi_xml (0.5.5)
192 192 multipart-post (1.2.0)
193 193 net-scp (1.1.2)
... ... @@ -199,7 +199,7 @@ GEM
199 199 net-ssh (>= 2.6.5)
200 200 netrc (0.7.7)
201 201 nokogiri (1.5.10)
202   - nokogiri-happymapper (0.5.7)
  202 + nokogiri-happymapper (0.5.8)
203 203 nokogiri (~> 1.5)
204 204 oauth (0.4.7)
205 205 oauth2 (0.8.1)
... ... @@ -264,19 +264,19 @@ GEM
264 264 rack-ssl-enforcer (0.2.6)
265 265 rack-test (0.6.2)
266 266 rack (>= 1.0)
267   - rails (3.2.14)
268   - actionmailer (= 3.2.14)
269   - actionpack (= 3.2.14)
270   - activerecord (= 3.2.14)
271   - activeresource (= 3.2.14)
272   - activesupport (= 3.2.14)
  267 + rails (3.2.15)
  268 + actionmailer (= 3.2.15)
  269 + actionpack (= 3.2.15)
  270 + activerecord (= 3.2.15)
  271 + activeresource (= 3.2.15)
  272 + activesupport (= 3.2.15)
273 273 bundler (~> 1.0)
274   - railties (= 3.2.14)
  274 + railties (= 3.2.15)
275 275 rails_autolink (1.1.4)
276 276 rails (> 3.1)
277   - railties (3.2.14)
278   - actionpack (= 3.2.14)
279   - activesupport (= 3.2.14)
  277 + railties (3.2.15)
  278 + actionpack (= 3.2.15)
  279 + activesupport (= 3.2.15)
280 280 rack-ssl (~> 1.3.2)
281 281 rake (>= 0.8.7)
282 282 rdoc (~> 3.4)
... ... @@ -294,10 +294,10 @@ GEM
294 294 rspec-core (~> 2.14.0)
295 295 rspec-expectations (~> 2.14.0)
296 296 rspec-mocks (~> 2.14.0)
297   - rspec-core (2.14.5)
  297 + rspec-core (2.14.6)
298 298 rspec-expectations (2.14.3)
299 299 diff-lcs (>= 1.1.3, < 2.0)
300   - rspec-mocks (2.14.3)
  300 + rspec-mocks (2.14.4)
301 301 rspec-rails (2.14.0)
302 302 actionpack (>= 3.0)
303 303 activesupport (>= 3.0)
... ... @@ -348,29 +348,29 @@ GEM
348 348 atomic
349 349 tilt (1.4.1)
350 350 timecop (0.6.3)
351   - tins (0.11.0)
  351 + tins (0.12.0)
352 352 treetop (1.4.15)
353 353 polyglot
354 354 polyglot (>= 0.3.1)
355 355 turbo-sprockets-rails3 (0.3.10)
356 356 railties (> 3.2.8, < 4.0.0)
357 357 sprockets (>= 2.0.0)
358   - tzinfo (0.3.37)
  358 + tzinfo (0.3.38)
359 359 uglifier (2.2.1)
360 360 execjs (>= 0.3.0)
361 361 multi_json (~> 1.0, >= 1.0.2)
362   - underscore-rails (1.5.1)
  362 + underscore-rails (1.5.2)
363 363 unicorn (4.6.3)
364 364 kgio (~> 2.6)
365 365 rack
366 366 raindrops (~> 0.7)
367   - useragent (0.7.0)
  367 + useragent (0.8.3)
368 368 warden (1.2.3)
369 369 rack (>= 1.0)
370   - webmock (1.13.0)
  370 + webmock (1.15.0)
371 371 addressable (>= 2.2.7)
372 372 crack (>= 0.3.2)
373   - xmpp4r (0.5)
  373 + xmpp4r (0.5.5)
374 374 xpath (2.0.0)
375 375 nokogiri (~> 1.3)
376 376 yajl-ruby (1.1.0)
... ... @@ -387,7 +387,7 @@ DEPENDENCIES
387 387 binding_of_caller
388 388 bitbucket_rest_api
389 389 campy
390   - capistrano
  390 + capistrano (~> 2.0)
391 391 capybara
392 392 coveralls
393 393 database_cleaner
... ...