Download as
Browse Code »

Commit 680b5a0048be6f58cc020d80acc31a5a256b3f47

Authored by Arthur Neves
1 parent 093fbed2
Exists in master and in 1 other branch production

Update gems to rails 4 compatible

Showing 2 changed files with 81 additions and 78 deletions   Show diff stats
Gemfile
  Diff comments   View file @680b5a0
1 1 source 'https://rubygems.org'
2 2  
3   -RAILS_VERSION = '~> 3.2.21'
  3 +RAILS_VERSION = '~> 4.0.4'
4 4  
5 5 gem 'actionmailer', RAILS_VERSION
6 6 gem 'actionpack', RAILS_VERSION
7 7 gem 'railties', RAILS_VERSION
8 8  
9   -gem 'mongoid'
  9 +gem 'mongoid', github: 'mongoid/mongoid'
10 10  
11 11 gem 'mongoid_rails_migrations'
12 12 gem 'devise'
... ... @@ -16,7 +16,6 @@ gem 'rack-ssl', :require => 'rack/ssl' # force SSL
16 16  
17 17 gem 'useragent'
18 18 gem 'decent_exposure'
19   -gem 'strong_parameters'
20 19 gem 'actionmailer_inline_css'
21 20 gem 'kaminari', '>= 0.14.1'
22 21 gem 'rack-ssl-enforcer', :require => false
... ... @@ -113,5 +112,4 @@ group :assets do
113 112 gem 'jquery-rails', '~> 2.1.4'
114 113 gem 'pjax_rails'
115 114 gem 'underscore-rails'
116   - gem 'turbo-sprockets-rails3'
117 115 end
... ...
Gemfile.lock
  Diff comments   View file @680b5a0
  1 +GIT
  2 + remote: git://github.com/mongoid/mongoid.git
  3 + revision: dba1c17b1dba667e50347ab616aaf6f2e1bee094
  4 + specs:
  5 + mongoid (4.0.0.beta1)
  6 + activemodel (>= 4.0.0)
  7 + moped (~> 2.0.beta6)
  8 + origin (~> 2.1)
  9 + tzinfo (>= 0.3.37)
  10 +
1 11 GEM
2 12 remote: https://rubygems.org/
3 13 specs:
4   - actionmailer (3.2.21)
5   - actionpack (= 3.2.21)
  14 + actionmailer (4.0.4)
  15 + actionpack (= 4.0.4)
6 16 mail (~> 2.5.4)
7 17 actionmailer_inline_css (1.5.3)
8 18 actionmailer (>= 3.0.0)
9 19 nokogiri (>= 1.4.4)
10 20 premailer (>= 1.7.1)
11   - actionpack (3.2.21)
12   - activemodel (= 3.2.21)
13   - activesupport (= 3.2.21)
14   - builder (~> 3.0.0)
  21 + actionpack (4.0.4)
  22 + activesupport (= 4.0.4)
  23 + builder (~> 3.1.0)
15 24 erubis (~> 2.7.0)
16   - journey (~> 1.0.4)
17   - rack (~> 1.4.5)
18   - rack-cache (~> 1.2)
19   - rack-test (~> 0.6.1)
20   - sprockets (~> 2.2.1)
21   - activemodel (3.2.21)
22   - activesupport (= 3.2.21)
23   - builder (~> 3.0.0)
24   - activerecord (3.2.21)
25   - activemodel (= 3.2.21)
26   - activesupport (= 3.2.21)
27   - arel (~> 3.0.2)
28   - tzinfo (~> 0.3.29)
29   - activeresource (3.2.21)
30   - activemodel (= 3.2.21)
31   - activesupport (= 3.2.21)
32   - activesupport (3.2.21)
33   - i18n (~> 0.6, >= 0.6.4)
34   - multi_json (~> 1.0)
35   - addressable (2.3.6)
  25 + rack (~> 1.5.2)
  26 + rack-test (~> 0.6.2)
  27 + activemodel (4.0.4)
  28 + activesupport (= 4.0.4)
  29 + builder (~> 3.1.0)
  30 + activerecord (4.0.4)
  31 + activemodel (= 4.0.4)
  32 + activerecord-deprecated_finders (~> 1.0.2)
  33 + activesupport (= 4.0.4)
  34 + arel (~> 4.0.0)
  35 + activerecord-deprecated_finders (1.0.3)
  36 + activeresource (4.0.0)
  37 + activemodel (~> 4.0)
  38 + activesupport (~> 4.0)
  39 + rails-observers (~> 0.1.1)
  40 + activesupport (4.0.4)
  41 + i18n (~> 0.6, >= 0.6.9)
  42 + minitest (~> 4.2)
  43 + multi_json (~> 1.3)
  44 + thread_safe (~> 0.1)
  45 + tzinfo (~> 0.3.37)
  46 + addressable (2.3.5)
36 47 airbrake (3.1.14)
37 48 builder
38 49 json
39   - arel (3.0.3)
  50 + arel (4.0.2)
40 51 atomic (1.1.14)
41 52 bcrypt-ruby (3.1.2)
42 53 better_errors (1.0.1)
... ... @@ -51,7 +62,8 @@ GEM
51 62 multi_json (~> 1.3)
52 63 nokogiri (>= 1.5.2)
53 64 simple_oauth
54   - builder (3.0.4)
  65 + bson (2.2.1)
  66 + builder (3.1.4)
55 67 callsite (0.0.11)
56 68 campy (1.0.0)
57 69 capistrano (2.15.5)
... ... @@ -68,6 +80,8 @@ GEM
68 80 xpath (~> 2.0)
69 81 cliver (0.3.2)
70 82 coderay (1.0.9)
  83 + columnize (0.3.6)
  84 + connection_pool (1.2.0)
71 85 coveralls (0.7.0)
72 86 multi_json (~> 1.3)
73 87 rest-client
... ... @@ -164,7 +178,7 @@ GEM
164 178 jira-ruby (0.1.10)
165 179 activesupport
166 180 oauth
167   - journey (1.0.4)
  181 + railties
168 182 jquery-rails (2.1.4)
169 183 railties (>= 3.0, < 5.0)
170 184 thor (>= 0.14, < 2.0)
... ... @@ -191,12 +205,7 @@ GEM
191 205 railties
192 206 method_source (0.8.2)
193 207 mime-types (1.25.1)
194   - mini_portile (0.6.1)
195   - mongoid (3.1.5)
196   - activemodel (~> 3.2)
197   - moped (~> 1.4)
198   - origin (~> 1.0)
199   - tzinfo (~> 0.3.29)
  208 + minitest (4.7.5)
200 209 mongoid-rspec (1.9.0)
201 210 mongoid (>= 3.0.1)
202 211 rake
... ... @@ -206,8 +215,11 @@ GEM
206 215 bundler (>= 1.0.0)
207 216 rails (>= 3.2.0)
208 217 railties (>= 3.2.0)
209   - moped (1.5.1)
210   - multi_json (1.10.1)
  218 + moped (2.0.0.beta6)
  219 + bson (~> 2.2)
  220 + connection_pool (~> 1.2)
  221 + optionable (~> 0.2.0)
  222 + multi_json (1.9.2)
211 223 multi_xml (0.5.5)
212 224 multipart-post (1.2.0)
213 225 net-scp (1.1.2)
... ... @@ -239,7 +251,8 @@ GEM
239 251 omniauth-oauth2 (1.1.1)
240 252 oauth2 (~> 0.8.0)
241 253 omniauth (~> 1.0)
242   - origin (1.1.0)
  254 + optionable (0.2.0)
  255 + origin (2.1.0)
243 256 orm_adapter (0.4.0)
244 257 oruen_redmine_client (0.0.1)
245 258 activeresource (>= 2.3.0)
... ... @@ -274,37 +287,34 @@ GEM
274 287 rack (>= 1.1, < 2.0)
275 288 quiet_assets (1.0.2)
276 289 railties (>= 3.1, < 5.0)
277   - rack (1.4.5)
278   - rack-cache (1.2)
279   - rack (>= 0.4)
  290 + rack (1.5.2)
280 291 rack-contrib (1.1.0)
281 292 rack (>= 0.9.1)
282   - rack-ssl (1.3.4)
  293 + rack-ssl (1.4.0)
283 294 rack
284 295 rack-ssl-enforcer (0.2.6)
285 296 rack-test (0.6.2)
286 297 rack (>= 1.0)
287   - rails (3.2.21)
288   - actionmailer (= 3.2.21)
289   - actionpack (= 3.2.21)
290   - activerecord (= 3.2.21)
291   - activeresource (= 3.2.21)
292   - activesupport (= 3.2.21)
293   - bundler (~> 1.0)
  298 + rails (4.0.4)
  299 + actionmailer (= 4.0.4)
  300 + actionpack (= 4.0.4)
  301 + activerecord (= 4.0.4)
  302 + activesupport (= 4.0.4)
  303 + bundler (>= 1.3.0, < 2.0)
  304 + railties (= 4.0.4)
  305 + sprockets-rails (~> 2.0.0)
  306 + rails-observers (0.1.2)
  307 + activemodel (~> 4.0)
294 308 rails_autolink (1.1.4)
295 309 rails (> 3.1)
296   - railties (= 3.2.21)
297   - railties (3.2.21)
298   - actionpack (= 3.2.21)
299   - activesupport (= 3.2.21)
300   - rack-ssl (~> 1.3.2)
  310 + railties (4.0.4)
  311 + actionpack (= 4.0.4)
  312 + activesupport (= 4.0.4)
301 313 rake (>= 0.8.7)
302   - rdoc (~> 3.4)
303   - thor (>= 0.14.6, < 2.0)
  314 + thor (>= 0.18.1, < 2.0)
304 315 raindrops (0.12.0)
305   - rake (10.3.2)
306   - rdoc (3.12.2)
307   - json (~> 1.4)
  316 + rake (10.1.1)
  317 + rbx-require-relative (0.0.9)
308 318 ref (1.0.5)
309 319 request_store (1.0.6)
310 320 rest-client (1.6.8)
... ... @@ -341,15 +351,15 @@ GEM
341 351 simplecov-html (~> 0.7.1)
342 352 simplecov-html (0.7.1)
343 353 slop (3.4.6)
344   - sprockets (2.2.2)
  354 + sprockets (2.12.0)
345 355 hike (~> 1.2)
346 356 multi_json (~> 1.0)
347 357 rack (~> 1.0)
348 358 tilt (~> 1.1, != 1.3.0)
349   - strong_parameters (0.2.1)
350   - actionpack (~> 3.0)
351   - activemodel (~> 3.0)
352   - railties (~> 3.0)
  359 + sprockets-rails (2.0.1)
  360 + actionpack (>= 3.0)
  361 + activesupport (>= 3.0)
  362 + sprockets (~> 2.8)
353 363 term-ansicolor (1.2.2)
354 364 tins (~> 0.8)
355 365 therubyracer (0.12.1)
... ... @@ -364,10 +374,7 @@ GEM
364 374 treetop (1.4.15)
365 375 polyglot
366 376 polyglot (>= 0.3.1)
367   - turbo-sprockets-rails3 (0.3.10)
368   - railties (> 3.2.8, < 4.0.0)
369   - sprockets (>= 2.0.0)
370   - tzinfo (0.3.41)
  377 + tzinfo (0.3.39)
371 378 uglifier (2.2.1)
372 379 execjs (>= 0.3.0)
373 380 json (>= 1.8.0)
... ... @@ -392,9 +399,9 @@ PLATFORMS
392 399 ruby
393 400  
394 401 DEPENDENCIES
395   - actionmailer (~> 3.2.21)
  402 + actionmailer (~> 4.0.4)
396 403 actionmailer_inline_css
397   - actionpack (~> 3.2.21)
  404 + actionpack (~> 4.0.4)
398 405 airbrake
399 406 better_errors
400 407 binding_of_caller
... ... @@ -431,7 +438,7 @@ DEPENDENCIES
431 438 kaminari (>= 0.14.1)
432 439 launchy
433 440 meta_request
434   - mongoid
  441 + mongoid!
435 442 mongoid-rspec
436 443 mongoid_rails_migrations
437 444 omniauth-github
... ... @@ -443,14 +450,12 @@ DEPENDENCIES
443 450 rack-ssl
444 451 rack-ssl-enforcer
445 452 rails_autolink
446   - railties (~> 3.2.21)
  453 + railties (~> 4.0.4)
447 454 ri_cal
448 455 rspec-rails
449 456 rushover
450   - strong_parameters
451 457 therubyracer
452 458 timecop
453   - turbo-sprockets-rails3
454 459 uglifier (>= 1.0.3)
455 460 underscore-rails
456 461 unicorn
... ...