Commit 9b005f40 authored by Nick Thomas's avatar Nick Thomas

Merge branch 'update-default_value_for-to-3-2-0' into 'master'

Update the 'default_value_for' gem to 3.2.0

Closes default_value_for#1

See merge request gitlab-org/gitlab-ce!30173
parents e20e9831 ee7f6041
...@@ -11,7 +11,7 @@ gem 'responders', '~> 2.0' ...@@ -11,7 +11,7 @@ gem 'responders', '~> 2.0'
gem 'sprockets', '~> 3.7.0' gem 'sprockets', '~> 3.7.0'
# Default values for AR models # Default values for AR models
gem 'gitlab-default_value_for', '~> 3.1.1', require: 'default_value_for' gem 'default_value_for', '~> 3.2.0'
# Supported DBs # Supported DBs
gem 'mysql2', '~> 0.4.10', group: :mysql gem 'mysql2', '~> 0.4.10', group: :mysql
......
...@@ -163,6 +163,8 @@ GEM ...@@ -163,6 +163,8 @@ GEM
html-pipeline html-pipeline
declarative (0.0.10) declarative (0.0.10)
declarative-option (0.1.0) declarative-option (0.1.0)
default_value_for (3.2.0)
activerecord (>= 3.2.0, < 6.0)
derailed_benchmarks (1.3.5) derailed_benchmarks (1.3.5)
benchmark-ips (~> 2) benchmark-ips (~> 2)
get_process_mem (~> 0) get_process_mem (~> 0)
...@@ -304,8 +306,6 @@ GEM ...@@ -304,8 +306,6 @@ GEM
gitaly-proto (1.32.0) gitaly-proto (1.32.0)
grpc (~> 1.0) grpc (~> 1.0)
github-markup (1.7.0) github-markup (1.7.0)
gitlab-default_value_for (3.1.1)
activerecord (>= 3.2.0, < 6.0)
gitlab-labkit (0.3.0) gitlab-labkit (0.3.0)
actionpack (~> 5) actionpack (~> 5)
activesupport (~> 5) activesupport (~> 5)
...@@ -1056,6 +1056,7 @@ DEPENDENCIES ...@@ -1056,6 +1056,7 @@ DEPENDENCIES
creole (~> 0.5.0) creole (~> 0.5.0)
database_cleaner (~> 1.7.0) database_cleaner (~> 1.7.0)
deckar01-task_list (= 2.2.0) deckar01-task_list (= 2.2.0)
default_value_for (~> 3.2.0)
derailed_benchmarks derailed_benchmarks
device_detector device_detector
devise (~> 4.6) devise (~> 4.6)
...@@ -1093,7 +1094,6 @@ DEPENDENCIES ...@@ -1093,7 +1094,6 @@ DEPENDENCIES
gettext_i18n_rails_js (~> 1.3) gettext_i18n_rails_js (~> 1.3)
gitaly-proto (~> 1.32.0) gitaly-proto (~> 1.32.0)
github-markup (~> 1.7.0) github-markup (~> 1.7.0)
gitlab-default_value_for (~> 3.1.1)
gitlab-labkit (~> 0.3.0) gitlab-labkit (~> 0.3.0)
gitlab-markup (~> 1.7.0) gitlab-markup (~> 1.7.0)
gitlab-sidekiq-fetcher (~> 0.4.0) gitlab-sidekiq-fetcher (~> 0.4.0)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment