Skip to content

Commit

Permalink
Update gemfile to point at rubyconfig/config#180 branch. Remove monke…
Browse files Browse the repository at this point in the history
…ypatch
  • Loading branch information
tdonohue committed Oct 20, 2017
1 parent e2783a5 commit 2b98718
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 33 deletions.
5 changes: 4 additions & 1 deletion Gemfile
Expand Up @@ -83,7 +83,10 @@ gem 'devise-i18n'
gem 'devise_invitable', '~> 1.6'

gem 'apartment'
gem 'config', '~> 1.2', '>= 1.2.1'
# Until 'config' fixes issues with parsing boolean environment variables,
# we have to use a patched branch. See https://github.com/railsconfig/config/pull/180
gem 'config', github: 'mjgiarlo/config', branch: 'parse_boolean_env_values'
# gem 'config', '~> 1.2', '>= 1.2.1'
gem 'is_it_working'
gem 'rolify'

Expand Down
19 changes: 13 additions & 6 deletions Gemfile.lock
@@ -1,3 +1,13 @@
GIT
remote: git://github.com/mjgiarlo/config.git
revision: d89ed7c5cb01c3b9968566156a0041c0d5f6997f
branch: parse_boolean_env_values
specs:
config (1.5.0)
activesupport (>= 3.0)
deep_merge (~> 1.1.1)
dry-validation (~> 0.10.4)

GIT
remote: https://github.com/samvera/hyrax.git
revision: 521cf92b7172cf84d2413cf5cc1afd94be1f634d
Expand Down Expand Up @@ -209,9 +219,6 @@ GEM
concurrent-ruby (1.0.5)
concurrent-ruby-ext (1.0.5)
concurrent-ruby (= 1.0.5)
config (1.4.0)
activesupport (>= 3.0)
deep_merge (~> 1.1.1)
connection_pool (2.2.1)
coveralls (0.8.21)
json (>= 1.8, < 3)
Expand Down Expand Up @@ -271,13 +278,13 @@ GEM
dry-equalizer (~> 0.2)
dry-logic (~> 0.4, >= 0.4.2)
inflecto (~> 0.0.0, >= 0.0.2)
dry-validation (0.11.1)
dry-validation (0.10.7)
concurrent-ruby (~> 1.0)
dry-configurable (~> 0.1, >= 0.1.3)
dry-core (~> 0.2, >= 0.2.1)
dry-equalizer (~> 0.2)
dry-logic (~> 0.4, >= 0.4.0)
dry-types (~> 0.12.0)
dry-types (~> 0.9, >= 0.9.0)
easy_translate (0.5.0)
json
thread
Expand Down Expand Up @@ -901,7 +908,7 @@ DEPENDENCIES
capybara
carrierwave-aws
coffee-rails (~> 4.2)
config (~> 1.2, >= 1.2.1)
config!
coveralls
database_cleaner
devise
Expand Down
26 changes: 0 additions & 26 deletions config/initializers/config_monkeypatch.rb

This file was deleted.

0 comments on commit 2b98718

Please sign in to comment.