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

Bump jquery-rails and rails-assets-jquery

Browse source
This commit is contained in:
Steffen van Bergerem 2016-01-31 20:31:36 +01:00 committed by Jonne Haß
parent ce8e8716b9
commit 809763f653
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Gemfile
View file

@ -85,13 +85,13 @@ gem "entypo-rails", "2.2.3"
gem "backbone-on-rails", "1.2.0.0"
gem "handlebars_assets", "0.23.0"
gem "jquery-rails", "4.0.5"
gem "jquery-rails", "4.1.0"
gem "jquery-ui-rails", "5.0.5"
gem "js_image_paths", "0.0.2"
gem "js-routes", "1.2.0"
source "https://rails-assets.org" do
gem "rails-assets-jquery", "1.11.2" # Should be kept in sync with jquery-rails
gem "rails-assets-jquery", "1.12.0" # Should be kept in sync with jquery-rails
gem "rails-assets-markdown-it", "5.1.0"
gem "rails-assets-markdown-it-hashtag", "0.4.0"

8
Gemfile.lock
View file

@ -398,7 +398,7 @@ GEM
rake
jasmine-core (2.4.1)
jasmine-jquery-rails (2.0.3)
jquery-rails (4.0.5)
jquery-rails (4.1.0)
rails-dom-testing (~> 1.0)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
@ -553,7 +553,7 @@ GEM
rails-assets-jasmine (~> 2)
rails-assets-jeresig--jquery.hotkeys (0.2.0)
rails-assets-jquery (>= 1.4.2)
rails-assets-jquery (1.11.2)
rails-assets-jquery (1.12.0)
rails-assets-jquery-colorbox (1.6.3)
rails-assets-jquery (>= 1.3.2)
rails-assets-jquery-fullscreen-plugin (0.5.0)
@ -816,7 +816,7 @@ DEPENDENCIES
i18n-inflector-rails (= 1.0.7)
jasmine (= 2.4.0)
jasmine-jquery-rails (= 2.0.3)
jquery-rails (= 4.0.5)
jquery-rails (= 4.1.0)
jquery-ui-rails (= 5.0.5)
js-routes (= 1.2.0)
js_image_paths (= 0.0.2)
@ -853,7 +853,7 @@ DEPENDENCIES
rails-assets-jakobmattsson--jquery-elastic (= 1.6.11)!
rails-assets-jasmine-ajax (= 3.2.0)!
rails-assets-jeresig--jquery.hotkeys (= 0.2.0)!
rails-assets-jquery (= 1.11.2)!
rails-assets-jquery (= 1.12.0)!
rails-assets-jquery-placeholder (= 2.3.1)!
rails-assets-jquery-textchange (= 0.2.3)!
rails-assets-markdown-it (= 5.1.0)!