Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use fork of mongoid_rails_migrations to fix build #822

Merged
merged 1 commit into from
Mar 7, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ gem "govuk_admin_template", "~> 4.0" # higher versions require rails 4
gem "kaminari", "0.16.1"
gem "logstasher", "0.4.8"
gem "mongoid", "2.5.2"
gem "mongoid_rails_migrations", "1.0.0"
gem "mongoid_rails_migrations", git: "https://github.com/alphagov/mongoid_rails_migrations", branch: "avoid-calling-bundler-require-in-library-code"
gem "multi_json", "1.10.0"
gem "plek", "1.12.0"
gem "quiet_assets", "1.0.3"
Expand Down
20 changes: 13 additions & 7 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
GIT
remote: https://github.com/alphagov/mongoid_rails_migrations
revision: 4db234408a335d336a45f840e0f72c585031859b
branch: avoid-calling-bundler-require-in-library-code
specs:
mongoid_rails_migrations (1.0.0)
activesupport (>= 3.2.0)
bundler (>= 1.0.0)
rails (>= 3.2.0)
railties (>= 3.2.0)

GEM
remote: https://rubygems.org/
specs:
Expand Down Expand Up @@ -185,11 +196,6 @@ GEM
activemodel (~> 3.1)
mongo (~> 1.7)
tzinfo (~> 0.3.22)
mongoid_rails_migrations (1.0.0)
activesupport (>= 3.2.0)
bundler (>= 1.0.0)
rails (>= 3.2.0)
railties (>= 3.2.0)
multi_json (1.10.0)
multi_test (0.1.2)
multi_xml (0.6.0)
Expand Down Expand Up @@ -401,7 +407,7 @@ DEPENDENCIES
launchy
logstasher (= 0.4.8)
mongoid (= 2.5.2)
mongoid_rails_migrations (= 1.0.0)
mongoid_rails_migrations!
multi_json (= 1.10.0)
phantomjs (>= 1.9.7.1)
plek (= 1.12.0)
Expand All @@ -427,4 +433,4 @@ DEPENDENCIES
webmock

BUNDLED WITH
1.10.6
1.14.5