diff options
author | Sean McGivern <sean@mcgivern.me.uk> | 2017-07-11 11:06:02 +0000 |
---|---|---|
committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-07-11 11:06:02 +0000 |
commit | c17b1d5f5651b6f73b8c999bb6a5376e31a7d30d (patch) | |
tree | 3a42c1c68ab4876943b2fadc3c32bfa423f51b89 /Gemfile | |
parent | 655219e24a3043c19582808e02b20dd4feddb449 (diff) | |
parent | 6d22e1e83816e7fdb0aefd29b69fccca96d28b9c (diff) | |
download | gitlab-ce-c17b1d5f5651b6f73b8c999bb6a5376e31a7d30d.tar.gz |
Merge branch 'revert-d7bbafd8' into 'master'
Revert "Merge branch '34902-bump-knapsack-to-1-14-0' into 'master'"
Closes #34942
See merge request !12783
Diffstat (limited to 'Gemfile')
-rw-r--r-- | Gemfile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -344,7 +344,7 @@ group :development, :test do gem 'benchmark-ips', '~> 2.3.0', require: false gem 'license_finder', '~> 2.1.0', require: false - gem 'knapsack', '~> 1.14.0' + gem 'knapsack', '~> 1.11.0' gem 'activerecord_sane_schema_dumper', '0.2' |