Download as
Browse Code »

Commit ff156351cccf88e65ce434a784615cd5aac7ccd8

Authored by Arthur Neves
1 parent 1993b397
Exists in master and in 1 other branch production

Bump mongoid

Showing 2 changed files with 15 additions and 7 deletions   Show diff stats
Gemfile
  Diff comments   View file @ff15635
... ... @@ -6,6 +6,7 @@ gem 'actionmailer', RAILS_VERSION
6 6 gem 'actionpack', RAILS_VERSION
7 7 gem 'railties', RAILS_VERSION
8 8  
  9 +gem 'moped', github: 'mongoid/moped'
9 10 gem 'mongoid', github: 'mongoid/mongoid'
10 11  
11 12 gem 'mongoid_rails_migrations'
... ...
Gemfile.lock
  Diff comments   View file @ff15635
... ... @@ -8,6 +8,15 @@ GIT
8 8 origin (~> 2.1)
9 9 tzinfo (>= 0.3.37)
10 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 +
11 20 GEM
12 21 remote: https://rubygems.org/
13 22 specs:
... ... @@ -48,7 +57,7 @@ GEM
48 57 builder
49 58 json
50 59 arel (4.0.2)
51   - atomic (1.1.14)
  60 + atomic (1.1.16)
52 61 bcrypt-ruby (3.1.2)
53 62 better_errors (1.0.1)
54 63 coderay (>= 1.0.0)
... ... @@ -215,10 +224,6 @@ GEM
215 224 bundler (>= 1.0.0)
216 225 rails (>= 3.2.0)
217 226 railties (>= 3.2.0)
218   - moped (2.0.0.beta6)
219   - bson (~> 2.2)
220   - connection_pool (~> 1.2)
221   - optionable (~> 0.2.0)
222 227 multi_json (1.9.2)
223 228 multi_xml (0.5.5)
224 229 multipart-post (1.2.0)
... ... @@ -366,8 +371,8 @@ GEM
366 371 libv8 (~> 3.16.14.0)
367 372 ref
368 373 thor (0.19.1)
369   - thread_safe (0.1.3)
370   - atomic
  374 + thread_safe (0.3.1)
  375 + atomic (>= 1.1.7, < 2)
371 376 tilt (1.4.1)
372 377 timecop (0.6.3)
373 378 tins (0.12.0)
... ... @@ -441,6 +446,8 @@ DEPENDENCIES
441 446 mongoid!
442 447 mongoid-rspec
443 448 mongoid_rails_migrations
  449 + moped!
  450 + octokit (~> 2.0)
444 451 omniauth-github
445 452 pjax_rails
446 453 poltergeist
... ...