Commit 2313d42b authored by Robert Speicher's avatar Robert Speicher

Bump jquery-rails version

parent f76a3f3d
...@@ -195,20 +195,20 @@ gem "uglifier" ...@@ -195,20 +195,20 @@ gem "uglifier"
gem 'turbolinks', '~> 2.5.0' gem 'turbolinks', '~> 2.5.0'
gem 'jquery-turbolinks' gem 'jquery-turbolinks'
gem 'select2-rails' gem 'addressable'
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 'bootstrap-sass', '~> 3.0'
gem "font-awesome-rails", '~> 4.2' gem 'font-awesome-rails', '~> 4.2'
gem "gitlab_emoji", "~> 0.1" gem 'gitlab_emoji', '~> 0.1'
gem "gon", '~> 5.0.0' gem 'gon', '~> 5.0.0'
gem 'jquery-atwho-rails', '~> 1.0.0'
gem 'jquery-rails', '3.1.2'
gem 'jquery-scrollto-rails'
gem 'jquery-ui-rails'
gem 'nprogress-rails' gem 'nprogress-rails'
gem 'raphael-rails', '~> 2.1.2'
gem 'request_store' gem 'request_store'
gem "virtus" gem 'select2-rails'
gem 'addressable' gem 'virtus'
group :development do group :development do
gem 'brakeman', require: false gem 'brakeman', require: false
......
...@@ -301,7 +301,7 @@ GEM ...@@ -301,7 +301,7 @@ GEM
ice_cube (0.11.1) ice_cube (0.11.1)
ice_nine (0.10.0) ice_nine (0.10.0)
jquery-atwho-rails (1.0.1) jquery-atwho-rails (1.0.1)
jquery-rails (3.1.0) jquery-rails (3.1.2)
railties (>= 3.0, < 5.0) railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0) thor (>= 0.14, < 2.0)
jquery-scrollto-rails (1.4.3) jquery-scrollto-rails (1.4.3)
...@@ -746,7 +746,7 @@ DEPENDENCIES ...@@ -746,7 +746,7 @@ DEPENDENCIES
html-pipeline (~> 1.11.0) html-pipeline (~> 1.11.0)
httparty httparty
jquery-atwho-rails (~> 1.0.0) jquery-atwho-rails (~> 1.0.0)
jquery-rails jquery-rails (= 3.1.2)
jquery-scrollto-rails jquery-scrollto-rails
jquery-turbolinks jquery-turbolinks
jquery-ui-rails jquery-ui-rails
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment