Download as
Browse Code »

Commit c96727bd7d7decde102cbbb5b337eb387f26e4e2

Authored by Arthur Neves
1 parent 64321c96
Exists in master and in 1 other branch production

Bump mongoid and rails

Showing 2 changed files with 59 additions and 71 deletions   Show diff stats
Gemfile
  Diff comments   View file @c96727b
1 1 source 'https://rubygems.org'
2 2  
3   -RAILS_VERSION = '~> 4.0.4'
  3 +RAILS_VERSION = '~> 4.0.12'
4 4  
5 5 gem 'actionmailer', RAILS_VERSION
6 6 gem 'actionpack', RAILS_VERSION
7 7 gem 'railties', RAILS_VERSION
8 8  
9   -gem 'moped', github: 'mongoid/moped'
10   -gem 'mongoid', github: 'mongoid/mongoid'
  9 +gem 'moped', '~> 2.0.2'
  10 +gem 'mongoid', '~> 4.0.0'
11 11  
12 12 gem 'mongoid_rails_migrations'
13 13 gem 'devise'
... ...
Gemfile.lock
  Diff comments   View file @c96727b
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   -
11   -GIT
12   - remote: git://github.com/mongoid/moped.git
13   - revision: e238b4a757d64d980e3137c5b57a37a1729733a9
14   - specs:
15   - moped (2.0.0.beta6)
16   - bson (~> 2.2)
17   - connection_pool (~> 1.2)
18   - optionable (~> 0.2.0)
19   -
20 1 GEM
21 2 remote: https://rubygems.org/
22 3 specs:
23   - actionmailer (4.0.4)
24   - actionpack (= 4.0.4)
25   - mail (~> 2.5.4)
  4 + actionmailer (4.0.12)
  5 + actionpack (= 4.0.12)
  6 + mail (~> 2.5, >= 2.5.4)
26 7 actionmailer_inline_css (1.5.3)
27 8 actionmailer (>= 3.0.0)
28 9 nokogiri (>= 1.4.4)
29 10 premailer (>= 1.7.1)
30   - actionpack (4.0.4)
31   - activesupport (= 4.0.4)
  11 + actionpack (4.0.12)
  12 + activesupport (= 4.0.12)
32 13 builder (~> 3.1.0)
33 14 erubis (~> 2.7.0)
34 15 rack (~> 1.5.2)
35 16 rack-test (~> 0.6.2)
36   - activemodel (4.0.4)
37   - activesupport (= 4.0.4)
  17 + activemodel (4.0.12)
  18 + activesupport (= 4.0.12)
38 19 builder (~> 3.1.0)
39   - activerecord (4.0.4)
40   - activemodel (= 4.0.4)
  20 + activerecord (4.0.12)
  21 + activemodel (= 4.0.12)
41 22 activerecord-deprecated_finders (~> 1.0.2)
42   - activesupport (= 4.0.4)
  23 + activesupport (= 4.0.12)
43 24 arel (~> 4.0.0)
44 25 activerecord-deprecated_finders (1.0.3)
45 26 activeresource (4.0.0)
46 27 activemodel (~> 4.0)
47 28 activesupport (~> 4.0)
48 29 rails-observers (~> 0.1.1)
49   - activesupport (4.0.4)
  30 + activesupport (4.0.12)
50 31 i18n (~> 0.6, >= 0.6.9)
51 32 minitest (~> 4.2)
52 33 multi_json (~> 1.3)
... ... @@ -57,7 +38,6 @@ GEM
57 38 builder
58 39 json
59 40 arel (4.0.2)
60   - atomic (1.1.16)
61 41 bcrypt-ruby (3.1.2)
62 42 better_errors (1.0.1)
63 43 coderay (>= 1.0.0)
... ... @@ -71,7 +51,7 @@ GEM
71 51 multi_json (~> 1.3)
72 52 nokogiri (>= 1.5.2)
73 53 simple_oauth
74   - bson (2.2.1)
  54 + bson (2.3.0)
75 55 builder (3.1.4)
76 56 callsite (0.0.11)
77 57 campy (1.0.0)
... ... @@ -89,8 +69,7 @@ GEM
89 69 xpath (~> 2.0)
90 70 cliver (0.3.2)
91 71 coderay (1.0.9)
92   - columnize (0.3.6)
93   - connection_pool (1.2.0)
  72 + connection_pool (2.1.0)
94 73 coveralls (0.7.0)
95 74 multi_json (~> 1.3)
96 75 rest-client
... ... @@ -205,16 +184,21 @@ GEM
205 184 lighthouse-api (2.0)
206 185 activeresource (>= 3.0.0)
207 186 activesupport (>= 3.0.0)
208   - mail (2.5.4)
209   - mime-types (~> 1.16)
210   - treetop (~> 1.4.8)
  187 + mail (2.6.3)
  188 + mime-types (>= 1.16, < 3)
211 189 meta_request (0.2.8)
212 190 callsite
213 191 rack-contrib
214 192 railties
215 193 method_source (0.8.2)
216 194 mime-types (1.25.1)
  195 + mini_portile (0.6.1)
217 196 minitest (4.7.5)
  197 + mongoid (4.0.0)
  198 + activemodel (~> 4.0)
  199 + moped (~> 2.0.0)
  200 + origin (~> 2.1)
  201 + tzinfo (>= 0.3.37)
218 202 mongoid-rspec (1.9.0)
219 203 mongoid (>= 3.0.1)
220 204 rake
... ... @@ -224,7 +208,11 @@ GEM
224 208 bundler (>= 1.0.0)
225 209 rails (>= 3.2.0)
226 210 railties (>= 3.2.0)
227   - multi_json (1.9.2)
  211 + moped (2.0.2)
  212 + bson (~> 2.2)
  213 + connection_pool (~> 2.0)
  214 + optionable (~> 0.2.0)
  215 + multi_json (1.10.1)
228 216 multi_xml (0.5.5)
229 217 multipart-post (1.2.0)
230 218 net-scp (1.1.2)
... ... @@ -257,7 +245,7 @@ GEM
257 245 oauth2 (~> 0.8.0)
258 246 omniauth (~> 1.0)
259 247 optionable (0.2.0)
260   - origin (2.1.0)
  248 + origin (2.1.1)
261 249 orm_adapter (0.4.0)
262 250 oruen_redmine_client (0.0.1)
263 251 activeresource (>= 2.3.0)
... ... @@ -278,7 +266,6 @@ GEM
278 266 cliver (~> 0.3.1)
279 267 multi_json (~> 1.0)
280 268 websocket-driver (>= 0.2.0)
281   - polyglot (0.3.5)
282 269 premailer (1.7.3)
283 270 css_parser (>= 1.1.9)
284 271 htmlentities (>= 4.0.0)
... ... @@ -300,26 +287,32 @@ GEM
300 287 rack-ssl-enforcer (0.2.6)
301 288 rack-test (0.6.2)
302 289 rack (>= 1.0)
303   - rails (4.0.4)
304   - actionmailer (= 4.0.4)
305   - actionpack (= 4.0.4)
306   - activerecord (= 4.0.4)
307   - activesupport (= 4.0.4)
  290 + rails (4.0.12)
  291 + actionmailer (= 4.0.12)
  292 + actionpack (= 4.0.12)
  293 + activerecord (= 4.0.12)
  294 + activesupport (= 4.0.12)
308 295 bundler (>= 1.3.0, < 2.0)
309   - railties (= 4.0.4)
310   - sprockets-rails (~> 2.0.0)
  296 + railties (= 4.0.12)
  297 + sprockets-rails (~> 2.0)
311 298 rails-observers (0.1.2)
312 299 activemodel (~> 4.0)
313   - rails_autolink (1.1.4)
  300 + rails_12factor (0.0.3)
  301 + rails_serve_static_assets
  302 + rails_stdout_logging
  303 + rails_autolink (1.1.6)
314 304 rails (> 3.1)
315   - railties (4.0.4)
316   - actionpack (= 4.0.4)
317   - activesupport (= 4.0.4)
  305 + rails_serve_static_assets (0.0.2)
  306 + rails_stdout_logging (0.0.3)
  307 + railties (4.0.12)
  308 + actionpack (= 4.0.12)
  309 + activesupport (= 4.0.12)
318 310 rake (>= 0.8.7)
319 311 thor (>= 0.18.1, < 2.0)
320 312 raindrops (0.12.0)
321   - rake (10.1.1)
322   - rbx-require-relative (0.0.9)
  313 + rake (10.4.2)
  314 + rdoc (4.1.2)
  315 + json (~> 1.4)
323 316 ref (1.0.5)
324 317 request_store (1.0.6)
325 318 rest-client (1.6.8)
... ... @@ -356,30 +349,26 @@ GEM
356 349 simplecov-html (~> 0.7.1)
357 350 simplecov-html (0.7.1)
358 351 slop (3.4.6)
359   - sprockets (2.12.0)
  352 + sprockets (2.12.3)
360 353 hike (~> 1.2)
361 354 multi_json (~> 1.0)
362 355 rack (~> 1.0)
363 356 tilt (~> 1.1, != 1.3.0)
364   - sprockets-rails (2.0.1)
  357 + sprockets-rails (2.2.2)
365 358 actionpack (>= 3.0)
366 359 activesupport (>= 3.0)
367   - sprockets (~> 2.8)
  360 + sprockets (>= 2.8, < 4.0)
368 361 term-ansicolor (1.2.2)
369 362 tins (~> 0.8)
370 363 therubyracer (0.12.1)
371 364 libv8 (~> 3.16.14.0)
372 365 ref
373 366 thor (0.19.1)
374   - thread_safe (0.3.1)
375   - atomic (>= 1.1.7, < 2)
  367 + thread_safe (0.3.4)
376 368 tilt (1.4.1)
377 369 timecop (0.6.3)
378 370 tins (0.12.0)
379   - treetop (1.4.15)
380   - polyglot
381   - polyglot (>= 0.3.1)
382   - tzinfo (0.3.39)
  371 + tzinfo (0.3.42)
383 372 uglifier (2.2.1)
384 373 execjs (>= 0.3.0)
385 374 json (>= 1.8.0)
... ... @@ -404,9 +393,9 @@ PLATFORMS
404 393 ruby
405 394  
406 395 DEPENDENCIES
407   - actionmailer (~> 4.0.4)
  396 + actionmailer (~> 4.0.12)
408 397 actionmailer_inline_css
409   - actionpack (~> 4.0.4)
  398 + actionpack (~> 4.0.12)
410 399 airbrake
411 400 better_errors
412 401 binding_of_caller
... ... @@ -443,11 +432,10 @@ DEPENDENCIES
443 432 kaminari (>= 0.14.1)
444 433 launchy
445 434 meta_request
446   - mongoid!
  435 + mongoid (~> 4.0.0)
447 436 mongoid-rspec
448 437 mongoid_rails_migrations
449   - moped!
450   - octokit (~> 2.0)
  438 + moped (~> 2.0.2)
451 439 omniauth-github
452 440 pjax_rails
453 441 poltergeist
... ... @@ -457,7 +445,7 @@ DEPENDENCIES
457 445 rack-ssl
458 446 rack-ssl-enforcer
459 447 rails_autolink
460   - railties (~> 4.0.4)
  448 + railties (~> 4.0.12)
461 449 ri_cal
462 450 rspec-rails
463 451 rushover
... ...