Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'licence-format'

  • Loading branch information...
commit 66152592b0a135f1e9ebb3029c51e2a5aac741c1 2 parents 9a424bd + 0f5f8af
@alext alext authored
Showing with 7 additions and 3 deletions.
  1. +5 −1 Gemfile
  2. +2 −2 Gemfile.lock
View
6 Gemfile
@@ -33,7 +33,11 @@ gem "mongo", "1.5.2"
gem "bson_ext", "1.5.2"
gem "bson", "1.5.2"
-gem "govuk_content_models", "0.0.5"
+if ENV['CONTENT_MODELS_DEV']
+ gem "govuk_content_models", :path => '../govuk_content_models'
+else
+ gem "govuk_content_models", "~> 0.0.7"
+end
if ENV['BUNDLE_DEV']
gem 'gds-sso', :path => '../gds-sso'
View
4 Gemfile.lock
@@ -129,7 +129,7 @@ GEM
json
gherkin (2.7.3)
json (>= 1.4.6)
- govuk_content_models (0.0.5)
+ govuk_content_models (0.0.7)
bson_ext
differ
gds-api-adapters
@@ -291,7 +291,7 @@ DEPENDENCIES
gds-sso (~> 0.5)
gds-warmup-controller
gelf
- govuk_content_models (= 0.0.5)
+ govuk_content_models (~> 0.0.7)
launchy
marples (~> 1.0)
minitest
Please sign in to comment.
Something went wrong with that request. Please try again.