summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-10-27 13:59:01 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2015-10-27 13:59:01 +0000
commit940d68cc4c349b574166b010666a36cf25f485b7 (patch)
tree97f654a06257c3646753cc3fd16144d66c4ed440
parentd974803ccc3572eadde72fffca7244cd1b26a6c9 (diff)
parent63c74bb0eee81b96ce675d5875f2bbad04362353 (diff)
downloadgitlab-ce-940d68cc4c349b574166b010666a36cf25f485b7.tar.gz
Merge branch 'rs-update-jquery-atwho-rails' into 'master'
Bump jquery-atwho-rails to ~> 1.3.2 Closes #2858 See merge request !1687
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock4
2 files changed, 3 insertions, 3 deletions
diff --git a/Gemfile b/Gemfile
index 9254ce2ccfa..39ec04951c0 100644
--- a/Gemfile
+++ b/Gemfile
@@ -197,7 +197,7 @@ gem 'bootstrap-sass', '~> 3.0'
gem 'font-awesome-rails', '~> 4.2'
gem 'gitlab_emoji', '~> 0.1'
gem 'gon', '~> 5.0.0'
-gem 'jquery-atwho-rails', '~> 1.0.0'
+gem 'jquery-atwho-rails', '~> 1.3.2'
gem 'jquery-rails', '~> 3.1.3'
gem 'jquery-scrollto-rails', '~> 1.4.3'
gem 'jquery-ui-rails', '~> 4.2.1'
diff --git a/Gemfile.lock b/Gemfile.lock
index 53122898b07..340eb0fc301 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -354,7 +354,7 @@ GEM
ice_nine (0.11.1)
inflecto (0.0.2)
ipaddress (0.8.0)
- jquery-atwho-rails (1.0.1)
+ jquery-atwho-rails (1.3.2)
jquery-rails (3.1.3)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
@@ -840,7 +840,7 @@ DEPENDENCIES
hipchat (~> 1.5.0)
html-pipeline (~> 1.11.0)
httparty (~> 0.13.3)
- jquery-atwho-rails (~> 1.0.0)
+ jquery-atwho-rails (~> 1.3.2)
jquery-rails (~> 3.1.3)
jquery-scrollto-rails (~> 1.4.3)
jquery-turbolinks (~> 2.0.1)