summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2015-05-23 00:33:46 -0400
committerRobert Speicher <rspeicher@gmail.com>2015-06-02 20:32:07 -0400
commit2313d42b37977afc884a2a2fc7e91180e0acbaf3 (patch)
tree0cfebb1fa6944da0375ca044e17cbf5fbb47a17e /Gemfile.lock
parentf76a3f3db767da92149545ea54115d5ff40d722e (diff)
downloadgitlab-ce-2313d42b37977afc884a2a2fc7e91180e0acbaf3.tar.gz
Bump jquery-rails version
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock4
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 80ae41dc8fc..c9b8fc1f554 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -301,7 +301,7 @@ GEM
ice_cube (0.11.1)
ice_nine (0.10.0)
jquery-atwho-rails (1.0.1)
- jquery-rails (3.1.0)
+ jquery-rails (3.1.2)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
jquery-scrollto-rails (1.4.3)
@@ -746,7 +746,7 @@ DEPENDENCIES
html-pipeline (~> 1.11.0)
httparty
jquery-atwho-rails (~> 1.0.0)
- jquery-rails
+ jquery-rails (= 3.1.2)
jquery-scrollto-rails
jquery-turbolinks
jquery-ui-rails