summaryrefslogtreecommitdiff
path: root/Gemfile
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
parentf76a3f3db767da92149545ea54115d5ff40d722e (diff)
downloadgitlab-ce-2313d42b37977afc884a2a2fc7e91180e0acbaf3.tar.gz
Bump jquery-rails version
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile22
1 files changed, 11 insertions, 11 deletions
diff --git a/Gemfile b/Gemfile
index 94e2129f3c6..0ab0a45cdb5 100644
--- a/Gemfile
+++ b/Gemfile
@@ -195,20 +195,20 @@ gem "uglifier"
gem 'turbolinks', '~> 2.5.0'
gem 'jquery-turbolinks'
-gem 'select2-rails'
+gem 'addressable'
+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-rails"
-gem "jquery-ui-rails"
-gem "jquery-scrollto-rails"
-gem "raphael-rails", "~> 2.1.2"
-gem 'bootstrap-sass', '~> 3.0'
-gem "font-awesome-rails", '~> 4.2'
-gem "gitlab_emoji", "~> 0.1"
-gem "gon", '~> 5.0.0'
+gem 'jquery-rails', '3.1.2'
+gem 'jquery-scrollto-rails'
+gem 'jquery-ui-rails'
gem 'nprogress-rails'
+gem 'raphael-rails', '~> 2.1.2'
gem 'request_store'
-gem "virtus"
-gem 'addressable'
+gem 'select2-rails'
+gem 'virtus'
group :development do
gem 'brakeman', require: false