nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

bump jquery-rails

Browse source
This commit is contained in:
Jonne Haß 2014-09-05 23:51:33 +02:00
parent 9870069c56
commit ef501f755c
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Gemfile
View file

@ -78,7 +78,7 @@ gem 'entypo-rails', '2.2.2'
gem 'backbone-on-rails', '1.1.1' gem 'backbone-on-rails', '1.1.1'
gem 'handlebars_assets', '0.17.1' gem 'handlebars_assets', '0.17.1'
gem 'jquery-rails', '3.1.1' gem 'jquery-rails', '3.1.2'
gem 'rails-assets-jquery', '1.11.1' # Should be kept in sync with jquery-rails gem 'rails-assets-jquery', '1.11.1' # Should be kept in sync with jquery-rails
gem 'js_image_paths', '0.0.1' gem 'js_image_paths', '0.0.1'

4
Gemfile.lock
View file

@ -233,7 +233,7 @@ GEM
rake rake
jasmine-core (2.0.2) jasmine-core (2.0.2)
jasmine-jquery-rails (2.0.3) jasmine-jquery-rails (2.0.3)
jquery-rails (3.1.1) 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-ui-rails (4.2.1) jquery-ui-rails (4.2.1)
@ -537,7 +537,7 @@ DEPENDENCIES
i18n-inflector-rails (= 1.0.7) i18n-inflector-rails (= 1.0.7)
jasmine (= 2.0.2) jasmine (= 2.0.2)
jasmine-jquery-rails (= 2.0.3) jasmine-jquery-rails (= 2.0.3)
jquery-rails (= 3.1.1) jquery-rails (= 3.1.2)
js_image_paths (= 0.0.1) js_image_paths (= 0.0.1)
json (= 1.8.1) json (= 1.8.1)
markerb (= 1.0.2) markerb (= 1.0.2)