Skip to content

Commit

Permalink
Upgrade to Mongoid 5
Browse files Browse the repository at this point in the history
  • Loading branch information
stefan-kolb committed Oct 2, 2015
1 parent 324fa2b commit 085e39c
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 16 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ source 'https://rubygems.org'
ruby '2.2.2'

gem 'sinatra'
gem 'mongoid', '~> 4.0'
gem 'mongoid', '~> 5.0'
gem 'iso_country_codes'
gem 'rest-client'
gem 'versionomy'
Expand Down
18 changes: 7 additions & 11 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ GEM
builder (3.2.2)
coercible (1.0.0)
descendants_tracker (~> 0.0.1)
connection_pool (2.2.0)
database_cleaner (1.4.1)
descendants_tracker (0.0.4)
thread_safe (~> 0.3, >= 0.3.1)
Expand Down Expand Up @@ -55,21 +54,18 @@ GEM
json (1.8.3)
kgio (2.10.0)
mime-types (2.6.2)
minitest (5.8.0)
mongoid (4.0.2)
minitest (5.8.1)
mongo (2.1.1)
bson (~> 3.0)
mongoid (5.0.0)
activemodel (~> 4.0)
moped (~> 2.0.0)
mongo (~> 2.1)
origin (~> 2.1)
tzinfo (>= 0.3.37)
moped (2.0.7)
bson (~> 3.0)
connection_pool (~> 2.0)
optionable (~> 0.2.0)
multi_json (1.11.2)
multi_xml (0.5.5)
netrc (0.10.3)
newrelic_rpm (3.13.1.300)
optionable (0.2.0)
newrelic_rpm (3.13.2.302)
origin (2.1.1)
parser (2.2.2.6)
ast (>= 1.1, < 3.0)
Expand Down Expand Up @@ -141,7 +137,7 @@ DEPENDENCIES
grape-entity
iso_country_codes
minitest
mongoid (~> 4.0)
mongoid (~> 5.0)
newrelic_rpm
rack-test
rake
Expand Down
8 changes: 4 additions & 4 deletions config/mongoid.yml
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
development:
sessions:
clients:
default:
database: paas
hosts:
- 127.0.0.1:27017
- 127.0.0.1:27017

test:
sessions:
clients:
default:
database: paas_test
hosts:
- 127.0.0.1:27017

production:
sessions:
clients:
default:
uri: <%= ENV['MONGO_URL'] %>

0 comments on commit 085e39c

Please sign in to comment.