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
1 source 'https://rubygems.org' 1 source 'https://rubygems.org'
2 2
3 -RAILS_VERSION = '~> 3.2.21' 3 +RAILS_VERSION = '~> 4.0.4'
4 4
5 gem 'actionmailer', RAILS_VERSION 5 gem 'actionmailer', RAILS_VERSION
6 gem 'actionpack', RAILS_VERSION 6 gem 'actionpack', RAILS_VERSION
7 gem 'railties', RAILS_VERSION 7 gem 'railties', RAILS_VERSION
8 8
9 -gem 'mongoid' 9 +gem 'mongoid', github: 'mongoid/mongoid'
10 10
11 gem 'mongoid_rails_migrations' 11 gem 'mongoid_rails_migrations'
12 gem 'devise' 12 gem 'devise'
@@ -16,7 +16,6 @@ gem 'rack-ssl', :require => 'rack/ssl' # force SSL @@ -16,7 +16,6 @@ gem 'rack-ssl', :require => 'rack/ssl' # force SSL
16 16
17 gem 'useragent' 17 gem 'useragent'
18 gem 'decent_exposure' 18 gem 'decent_exposure'
19 -gem 'strong_parameters'  
20 gem 'actionmailer_inline_css' 19 gem 'actionmailer_inline_css'
21 gem 'kaminari', '>= 0.14.1' 20 gem 'kaminari', '>= 0.14.1'
22 gem 'rack-ssl-enforcer', :require => false 21 gem 'rack-ssl-enforcer', :require => false
@@ -113,5 +112,4 @@ group :assets do @@ -113,5 +112,4 @@ group :assets do
113 gem 'jquery-rails', '~> 2.1.4' 112 gem 'jquery-rails', '~> 2.1.4'
114 gem 'pjax_rails' 113 gem 'pjax_rails'
115 gem 'underscore-rails' 114 gem 'underscore-rails'
116 - gem 'turbo-sprockets-rails3'  
117 end 115 end
  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 GEM 11 GEM
2 remote: https://rubygems.org/ 12 remote: https://rubygems.org/
3 specs: 13 specs:
4 - actionmailer (3.2.21)  
5 - actionpack (= 3.2.21) 14 + actionmailer (4.0.4)
  15 + actionpack (= 4.0.4)
6 mail (~> 2.5.4) 16 mail (~> 2.5.4)
7 actionmailer_inline_css (1.5.3) 17 actionmailer_inline_css (1.5.3)
8 actionmailer (>= 3.0.0) 18 actionmailer (>= 3.0.0)
9 nokogiri (>= 1.4.4) 19 nokogiri (>= 1.4.4)
10 premailer (>= 1.7.1) 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 erubis (~> 2.7.0) 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 airbrake (3.1.14) 47 airbrake (3.1.14)
37 builder 48 builder
38 json 49 json
39 - arel (3.0.3) 50 + arel (4.0.2)
40 atomic (1.1.14) 51 atomic (1.1.14)
41 bcrypt-ruby (3.1.2) 52 bcrypt-ruby (3.1.2)
42 better_errors (1.0.1) 53 better_errors (1.0.1)
@@ -51,7 +62,8 @@ GEM @@ -51,7 +62,8 @@ GEM
51 multi_json (~> 1.3) 62 multi_json (~> 1.3)
52 nokogiri (>= 1.5.2) 63 nokogiri (>= 1.5.2)
53 simple_oauth 64 simple_oauth
54 - builder (3.0.4) 65 + bson (2.2.1)
  66 + builder (3.1.4)
55 callsite (0.0.11) 67 callsite (0.0.11)
56 campy (1.0.0) 68 campy (1.0.0)
57 capistrano (2.15.5) 69 capistrano (2.15.5)
@@ -68,6 +80,8 @@ GEM @@ -68,6 +80,8 @@ GEM
68 xpath (~> 2.0) 80 xpath (~> 2.0)
69 cliver (0.3.2) 81 cliver (0.3.2)
70 coderay (1.0.9) 82 coderay (1.0.9)
  83 + columnize (0.3.6)
  84 + connection_pool (1.2.0)
71 coveralls (0.7.0) 85 coveralls (0.7.0)
72 multi_json (~> 1.3) 86 multi_json (~> 1.3)
73 rest-client 87 rest-client
@@ -164,7 +178,7 @@ GEM @@ -164,7 +178,7 @@ GEM
164 jira-ruby (0.1.10) 178 jira-ruby (0.1.10)
165 activesupport 179 activesupport
166 oauth 180 oauth
167 - journey (1.0.4) 181 + railties
168 jquery-rails (2.1.4) 182 jquery-rails (2.1.4)
169 railties (>= 3.0, < 5.0) 183 railties (>= 3.0, < 5.0)
170 thor (>= 0.14, < 2.0) 184 thor (>= 0.14, < 2.0)
@@ -191,12 +205,7 @@ GEM @@ -191,12 +205,7 @@ GEM
191 railties 205 railties
192 method_source (0.8.2) 206 method_source (0.8.2)
193 mime-types (1.25.1) 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 mongoid-rspec (1.9.0) 209 mongoid-rspec (1.9.0)
201 mongoid (>= 3.0.1) 210 mongoid (>= 3.0.1)
202 rake 211 rake
@@ -206,8 +215,11 @@ GEM @@ -206,8 +215,11 @@ GEM
206 bundler (>= 1.0.0) 215 bundler (>= 1.0.0)
207 rails (>= 3.2.0) 216 rails (>= 3.2.0)
208 railties (>= 3.2.0) 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 multi_xml (0.5.5) 223 multi_xml (0.5.5)
212 multipart-post (1.2.0) 224 multipart-post (1.2.0)
213 net-scp (1.1.2) 225 net-scp (1.1.2)
@@ -239,7 +251,8 @@ GEM @@ -239,7 +251,8 @@ GEM
239 omniauth-oauth2 (1.1.1) 251 omniauth-oauth2 (1.1.1)
240 oauth2 (~> 0.8.0) 252 oauth2 (~> 0.8.0)
241 omniauth (~> 1.0) 253 omniauth (~> 1.0)
242 - origin (1.1.0) 254 + optionable (0.2.0)
  255 + origin (2.1.0)
243 orm_adapter (0.4.0) 256 orm_adapter (0.4.0)
244 oruen_redmine_client (0.0.1) 257 oruen_redmine_client (0.0.1)
245 activeresource (>= 2.3.0) 258 activeresource (>= 2.3.0)
@@ -274,37 +287,34 @@ GEM @@ -274,37 +287,34 @@ GEM
274 rack (>= 1.1, < 2.0) 287 rack (>= 1.1, < 2.0)
275 quiet_assets (1.0.2) 288 quiet_assets (1.0.2)
276 railties (>= 3.1, < 5.0) 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 rack-contrib (1.1.0) 291 rack-contrib (1.1.0)
281 rack (>= 0.9.1) 292 rack (>= 0.9.1)
282 - rack-ssl (1.3.4) 293 + rack-ssl (1.4.0)
283 rack 294 rack
284 rack-ssl-enforcer (0.2.6) 295 rack-ssl-enforcer (0.2.6)
285 rack-test (0.6.2) 296 rack-test (0.6.2)
286 rack (>= 1.0) 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 rails_autolink (1.1.4) 308 rails_autolink (1.1.4)
295 rails (> 3.1) 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 rake (>= 0.8.7) 313 rake (>= 0.8.7)
302 - rdoc (~> 3.4)  
303 - thor (>= 0.14.6, < 2.0) 314 + thor (>= 0.18.1, < 2.0)
304 raindrops (0.12.0) 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 ref (1.0.5) 318 ref (1.0.5)
309 request_store (1.0.6) 319 request_store (1.0.6)
310 rest-client (1.6.8) 320 rest-client (1.6.8)
@@ -341,15 +351,15 @@ GEM @@ -341,15 +351,15 @@ GEM
341 simplecov-html (~> 0.7.1) 351 simplecov-html (~> 0.7.1)
342 simplecov-html (0.7.1) 352 simplecov-html (0.7.1)
343 slop (3.4.6) 353 slop (3.4.6)
344 - sprockets (2.2.2) 354 + sprockets (2.12.0)
345 hike (~> 1.2) 355 hike (~> 1.2)
346 multi_json (~> 1.0) 356 multi_json (~> 1.0)
347 rack (~> 1.0) 357 rack (~> 1.0)
348 tilt (~> 1.1, != 1.3.0) 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 term-ansicolor (1.2.2) 363 term-ansicolor (1.2.2)
354 tins (~> 0.8) 364 tins (~> 0.8)
355 therubyracer (0.12.1) 365 therubyracer (0.12.1)
@@ -364,10 +374,7 @@ GEM @@ -364,10 +374,7 @@ GEM
364 treetop (1.4.15) 374 treetop (1.4.15)
365 polyglot 375 polyglot
366 polyglot (>= 0.3.1) 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 uglifier (2.2.1) 378 uglifier (2.2.1)
372 execjs (>= 0.3.0) 379 execjs (>= 0.3.0)
373 json (>= 1.8.0) 380 json (>= 1.8.0)
@@ -392,9 +399,9 @@ PLATFORMS @@ -392,9 +399,9 @@ PLATFORMS
392 ruby 399 ruby
393 400
394 DEPENDENCIES 401 DEPENDENCIES
395 - actionmailer (~> 3.2.21) 402 + actionmailer (~> 4.0.4)
396 actionmailer_inline_css 403 actionmailer_inline_css
397 - actionpack (~> 3.2.21) 404 + actionpack (~> 4.0.4)
398 airbrake 405 airbrake
399 better_errors 406 better_errors
400 binding_of_caller 407 binding_of_caller
@@ -431,7 +438,7 @@ DEPENDENCIES @@ -431,7 +438,7 @@ DEPENDENCIES
431 kaminari (>= 0.14.1) 438 kaminari (>= 0.14.1)
432 launchy 439 launchy
433 meta_request 440 meta_request
434 - mongoid 441 + mongoid!
435 mongoid-rspec 442 mongoid-rspec
436 mongoid_rails_migrations 443 mongoid_rails_migrations
437 omniauth-github 444 omniauth-github
@@ -443,14 +450,12 @@ DEPENDENCIES @@ -443,14 +450,12 @@ DEPENDENCIES
443 rack-ssl 450 rack-ssl
444 rack-ssl-enforcer 451 rack-ssl-enforcer
445 rails_autolink 452 rails_autolink
446 - railties (~> 3.2.21) 453 + railties (~> 4.0.4)
447 ri_cal 454 ri_cal
448 rspec-rails 455 rspec-rails
449 rushover 456 rushover
450 - strong_parameters  
451 therubyracer 457 therubyracer
452 timecop 458 timecop
453 - turbo-sprockets-rails3  
454 uglifier (>= 1.0.3) 459 uglifier (>= 1.0.3)
455 underscore-rails 460 underscore-rails
456 unicorn 461 unicorn