summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2016-03-27 22:23:42 +0000
committerRobert Speicher <robert@gitlab.com>2016-03-27 22:23:42 +0000
commitccf50e81b7b977b2034e7455bb72835707d1657c (patch)
tree7a8d86a0d73c4d11b441db86576d18524894d283 /Gemfile.lock
parenta6a7a5ddd788cd6d549364176d26e1e15689d048 (diff)
parent2fe8da0b500b78d28dad399bc5552328929fadc4 (diff)
downloadgitlab-ce-ccf50e81b7b977b2034e7455bb72835707d1657c.tar.gz
Merge branch 'upgrade-web-console' into 'master'
Upgrade web-console to 2.3.0 Rails 5 compatibility release. [See the Changelog for more information](https://github.com/rails/web-console/releases/tag/v2.3.0). Working towards #14286. See merge request !3400
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock2
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index a7980c32dde..da27c62acbf 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -865,7 +865,7 @@ GEM
equalizer (~> 0.0, >= 0.0.9)
warden (1.2.4)
rack (>= 1.0)
- web-console (2.2.1)
+ web-console (2.3.0)
activemodel (>= 4.0)
binding_of_caller (>= 0.7.2)
railties (>= 4.0)