summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2015-04-19 15:49:38 -0400
committerRobert Speicher <rspeicher@gmail.com>2015-04-23 13:08:16 -0400
commitd086e76c2f75d0c0215c61c168832292c7f35641 (patch)
tree6e4ae2ff54b523c9542eeb8cf9a9fb4d43f7f00d
parentaf855b573f41b94485c26d04b9f2be8d37601050 (diff)
downloadgitlab-ce-d086e76c2f75d0c0215c61c168832292c7f35641.tar.gz
Update jquery-atwho-rails
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock4
2 files changed, 3 insertions, 3 deletions
diff --git a/Gemfile b/Gemfile
index 27883cf797a..460a0f93a96 100644
--- a/Gemfile
+++ b/Gemfile
@@ -188,7 +188,7 @@ gem 'turbolinks'
gem 'jquery-turbolinks'
gem 'select2-rails'
-gem 'jquery-atwho-rails', "~> 0.3.3"
+gem 'jquery-atwho-rails', '~> 1.0.0'
gem "jquery-rails"
gem "jquery-ui-rails"
gem "jquery-scrollto-rails"
diff --git a/Gemfile.lock b/Gemfile.lock
index c13dd67f14c..f0f8601a760 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -298,7 +298,7 @@ GEM
phantomjs (>= 1.9)
railties (>= 3.2.0)
sprockets-rails
- jquery-atwho-rails (0.3.3)
+ jquery-atwho-rails (1.0.1)
jquery-rails (3.1.0)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
@@ -720,7 +720,7 @@ DEPENDENCIES
httparty
jasmine (~> 2.2.0)
jasmine-rails
- jquery-atwho-rails (~> 0.3.3)
+ jquery-atwho-rails (~> 1.0.0)
jquery-rails
jquery-scrollto-rails
jquery-turbolinks