summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2016-07-27 17:26:31 +0000
committerRobert Speicher <robert@gitlab.com>2016-07-27 17:26:31 +0000
commitd7e3ecf448996f48ed298e16824373ab3d69438a (patch)
tree3b302cd6269c0f1e5eb6a02a9713afec8805a85e
parent373145fbd4f19ee39267626587005520de78ac48 (diff)
parent172a5a8ab6e67e273156ee2aaa6dd178ffac3f01 (diff)
downloadgitlab-ce-d7e3ecf448996f48ed298e16824373ab3d69438a.tar.gz
Merge branch 'cs-upgrade-default-value-for' into 'master'
Upgrade default_value_for from 3.0.1 to 3.0.2. Includes support for Rails 5. Working toward #14286. Changelog: https://github.com/FooBarWidget/default_value_for/compare/release-3.0.1...release-3.0.2 See merge request !5441
-rw-r--r--Gemfile.lock4
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 6fc6219bb67..0011cb9b4b8 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -156,8 +156,8 @@ GEM
database_cleaner (1.5.3)
debug_inspector (0.0.2)
debugger-ruby_core_source (1.3.8)
- default_value_for (3.0.1)
- activerecord (>= 3.2.0, < 5.0)
+ default_value_for (3.0.2)
+ activerecord (>= 3.2.0, < 5.1)
descendants_tracker (0.0.4)
thread_safe (~> 0.3, >= 0.3.1)
devise (4.1.1)