diff options
| author | Sean McGivern <sean@gitlab.com> | 2018-11-19 10:02:21 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2018-11-19 10:02:21 +0000 |
| commit | 07d10976d2d46067b7ac05e36fb445781a1c6f37 (patch) | |
| tree | 6714d4e6edaff0bc47315f050e6998915df0b401 /Gemfile.lock | |
| parent | 7548c4d5af9198dd81adf751b41b15e9c8e5349c (diff) | |
| parent | 94d518f5d68b9bcead7564b6f8d42047cdf5d23b (diff) | |
| download | gitlab-ce-07d10976d2d46067b7ac05e36fb445781a1c6f37.tar.gz | |
Merge branch '54093-the-default_value_for-gem-doesn-t-handle-actioncontroller-parameters-correctly' into 'master'46166-add-constraints-that-prevent-ci_builds-from-being-associated-with-null-pipeline-project
Replace the `default_value_for` gem with the `gitlab-default_value_with` gem which handles `ActionController::Parameters` correctly
Closes #54093
See merge request gitlab-org/gitlab-ce!23114
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 6459cdff7a3..975243f31d5 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) @@ -972,7 +972,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) @@ -1008,6 +1007,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) |