diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-11-15 13:32:17 +0100 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-11-15 16:44:22 +0100 |
| commit | 47dd7d0bbed879625f6ff19960ff390956e7c331 (patch) | |
| tree | a42e4db2061828d8cc41c8e6d877a43943930ea0 /Gemfile | |
| parent | 84db49ea0c6d18a12efa7268e06d9611ca267fd7 (diff) | |
| download | gitlab-ce-47dd7d0bbed879625f6ff19960ff390956e7c331.tar.gz | |
Use gitlab-default_value_with Rails 5
This forks live at https://github.com/gitlabhq/default_value_for/tree/69-fix-action_controller-parameters-handling
and fixes an issue where default_value_for wouldn't handle
`ActionController::Parameters` correctly with Rails 5.
This fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/54093.
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 13 |
1 files changed, 8 insertions, 5 deletions
@@ -4,10 +4,9 @@ def rails5? end gem_versions = {} -gem_versions['activerecord_sane_schema_dumper'] = rails5? ? '1.0' : '0.2' -gem_versions['default_value_for'] = rails5? ? '~> 3.0.5' : '~> 3.0.0' -gem_versions['rails'] = rails5? ? '5.0.7' : '4.2.10' -gem_versions['rails-i18n'] = rails5? ? '~> 5.1' : '~> 4.0.9' +gem_versions['activerecord_sane_schema_dumper'] = rails5? ? '1.0' : '0.2' +gem_versions['rails'] = rails5? ? '5.0.7' : '4.2.10' +gem_versions['rails-i18n'] = rails5? ? '~> 5.1' : '~> 4.0.9' # --- The end of special code for migrating to Rails 5.0 --- source 'https://rubygems.org' @@ -21,7 +20,11 @@ gem 'responders', '~> 2.0' gem 'sprockets', '~> 3.7.0' # Default values for AR models -gem 'default_value_for', gem_versions['default_value_for'] +if rails5? + gem 'gitlab-default_value_for', '~> 3.1.1', require: 'default_value_for' +else + gem 'default_value_for', '~> 3.0.0' +end # Supported DBs gem 'mysql2', '~> 0.4.10', group: :mysql |