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.lock | |
| 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.lock')
| -rw-r--r-- | Gemfile.lock | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index e21a1b85457..defcfe8e3a8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -146,8 +146,6 @@ GEM html-pipeline declarative (0.0.10) declarative-option (0.1.0) - default_value_for (3.0.5) - activerecord (>= 3.2.0, < 5.2) descendants_tracker (0.0.4) thread_safe (~> 0.3, >= 0.3.1) device_detector (1.0.0) @@ -277,6 +275,8 @@ GEM gitaly-proto (0.123.0) grpc (~> 1.0) github-markup (1.7.0) + gitlab-default_value_for (3.1.1) + activerecord (>= 3.2.0, < 6.0) gitlab-markup (1.6.5) gitlab-sidekiq-fetcher (0.3.0) sidekiq (~> 5) @@ -971,7 +971,6 @@ DEPENDENCIES creole (~> 0.5.0) database_cleaner (~> 1.5.0) deckar01-task_list (= 2.0.0) - default_value_for (~> 3.0.5) device_detector devise (~> 4.4) devise-two-factor (~> 3.0.0) @@ -1007,6 +1006,7 @@ DEPENDENCIES gettext_i18n_rails_js (~> 1.3) gitaly-proto (~> 0.123.0) github-markup (~> 1.7.0) + gitlab-default_value_for (~> 3.1.1) gitlab-markup (~> 1.6.5) gitlab-sidekiq-fetcher gitlab-styles (~> 2.4) |