summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRiyad Preukschas <riyad@informatik.uni-bremen.de>2012-12-06 15:42:08 +0100
committerRiyad Preukschas <riyad@informatik.uni-bremen.de>2012-12-06 15:42:08 +0100
commitc338321695470eccf1b2f96348b9e57b894a5c2a (patch)
tree4156e40f6ff4018cd88787c824f29f1e84f8a771
parent9b9650989905b33e74aa7441a97e4242fae4b277 (diff)
downloadgitlab-ce-c338321695470eccf1b2f96348b9e57b894a5c2a.tar.gz
Update jquery-atwho-rails gem
Fixes #1860
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock4
2 files changed, 3 insertions, 3 deletions
diff --git a/Gemfile b/Gemfile
index c899c510414..fcda1353907 100644
--- a/Gemfile
+++ b/Gemfile
@@ -100,7 +100,7 @@ group :assets do
gem "therubyracer"
gem 'chosen-rails', "0.9.8"
- gem 'jquery-atwho-rails', "0.1.6"
+ gem 'jquery-atwho-rails', "0.1.7"
gem "jquery-rails", "2.1.3"
gem "jquery-ui-rails", "2.0.2"
gem "modernizr", "2.6.2"
diff --git a/Gemfile.lock b/Gemfile.lock
index b4eced37182..7afacfce9cd 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -227,7 +227,7 @@ GEM
httpauth (0.2.0)
i18n (0.6.1)
journey (1.0.4)
- jquery-atwho-rails (0.1.6)
+ jquery-atwho-rails (0.1.7)
jquery-rails (2.1.3)
railties (>= 3.1.0, < 5.0)
thor (~> 0.14)
@@ -481,7 +481,7 @@ DEPENDENCIES
guard-spinach
haml-rails (~> 0.3.5)
httparty
- jquery-atwho-rails (= 0.1.6)
+ jquery-atwho-rails (= 0.1.7)
jquery-rails (= 2.1.3)
jquery-ui-rails (= 2.0.2)
kaminari (~> 0.14.1)