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

Merge pull request #5802 from jhass/rails42

Browse source 
bump to rails 4.2.1
This commit is contained in:
Jonne Haß 2015-03-20 01:52:19 +01:00
commit 0226cb9542
2 changed files with 36 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Gemfile
View file

@ -1,7 +1,7 @@
source "https://rubygems.org" source "https://rubygems.org"
source "https://rails-assets.org" source "https://rails-assets.org"
gem "rails", "4.2.0" gem "rails", "4.2.1"
# Legacy Rails features, remove me! # Legacy Rails features, remove me!

70
Gemfile.lock
View file

@ -3,16 +3,16 @@ GEM
remote: https://rails-assets.org/ remote: https://rails-assets.org/
specs: specs:
CFPropertyList (2.3.0) CFPropertyList (2.3.0)
actionmailer (4.2.0) actionmailer (4.2.1)
actionpack (= 4.2.0) actionpack (= 4.2.1)
actionview (= 4.2.0) actionview (= 4.2.1)
activejob (= 4.2.0) activejob (= 4.2.1)
mail (~> 2.5, >= 2.5.4) mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 1.0, >= 1.0.5) rails-dom-testing (~> 1.0, >= 1.0.5)
actionpack (4.2.0) actionpack (4.2.1)
actionview (= 4.2.0) actionview (= 4.2.1)
activesupport (= 4.2.0) activesupport (= 4.2.1)
rack (~> 1.6.0) rack (~> 1.6)
rack-test (~> 0.6.2) rack-test (~> 0.6.2)
rails-dom-testing (~> 1.0, >= 1.0.5) rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.1) rails-html-sanitizer (~> 1.0, >= 1.0.1)
@ -20,23 +20,23 @@ GEM
actionpack (>= 4.0.0, < 5.0) actionpack (>= 4.0.0, < 5.0)
actionpack-page_caching (1.0.2) actionpack-page_caching (1.0.2)
actionpack (>= 4.0.0, < 5) actionpack (>= 4.0.0, < 5)
actionview (4.2.0) actionview (4.2.1)
activesupport (= 4.2.0) activesupport (= 4.2.1)
builder (~> 3.1) builder (~> 3.1)
erubis (~> 2.7.0) erubis (~> 2.7.0)
rails-dom-testing (~> 1.0, >= 1.0.5) rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.1) rails-html-sanitizer (~> 1.0, >= 1.0.1)
active_model_serializers (0.9.3) active_model_serializers (0.9.3)
activemodel (>= 3.2) activemodel (>= 3.2)
activejob (4.2.0) activejob (4.2.1)
activesupport (= 4.2.0) activesupport (= 4.2.1)
globalid (>= 0.3.0) globalid (>= 0.3.0)
activemodel (4.2.0) activemodel (4.2.1)
activesupport (= 4.2.0) activesupport (= 4.2.1)
builder (~> 3.1) builder (~> 3.1)
activerecord (4.2.0) activerecord (4.2.1)
activemodel (= 4.2.0) activemodel (= 4.2.1)
activesupport (= 4.2.0) activesupport (= 4.2.1)
arel (~> 6.0) arel (~> 6.0)
activerecord-import (0.7.0) activerecord-import (0.7.0)
activerecord (>= 3.0) activerecord (>= 3.0)
@ -44,7 +44,7 @@ GEM
activemodel (~> 4.0) activemodel (~> 4.0)
activesupport (~> 4.0) activesupport (~> 4.0)
rails-observers (~> 0.1.1) rails-observers (~> 0.1.1)
activesupport (4.2.0) activesupport (4.2.1)
i18n (~> 0.7) i18n (~> 0.7)
json (~> 1.7, >= 1.7.7) json (~> 1.7, >= 1.7.7)
minitest (~> 5.1) minitest (~> 5.1)
@ -401,7 +401,7 @@ GEM
mobile-fu (1.3.1) mobile-fu (1.3.1)
rack-mobile-detect rack-mobile-detect
rails rails
multi_json (1.10.1) multi_json (1.11.0)
multi_test (0.1.2) multi_test (0.1.2)
multi_xml (0.5.5) multi_xml (0.5.5)
multipart-post (2.0.0) multipart-post (2.0.0)
@ -478,16 +478,16 @@ GEM
rack rack
rack-test (0.6.3) rack-test (0.6.3)
rack (>= 1.0) rack (>= 1.0)
rails (4.2.0) rails (4.2.1)
actionmailer (= 4.2.0) actionmailer (= 4.2.1)
actionpack (= 4.2.0) actionpack (= 4.2.1)
actionview (= 4.2.0) actionview (= 4.2.1)
activejob (= 4.2.0) activejob (= 4.2.1)
activemodel (= 4.2.0) activemodel (= 4.2.1)
activerecord (= 4.2.0) activerecord (= 4.2.1)
activesupport (= 4.2.0) activesupport (= 4.2.1)
bundler (>= 1.3.0, < 2.0) bundler (>= 1.3.0, < 2.0)
railties (= 4.2.0) railties (= 4.2.1)
sprockets-rails sprockets-rails
rails-assets-diaspora_jsxc (0.1.1) rails-assets-diaspora_jsxc (0.1.1)
rails-assets-jquery (~> 1.11.1) rails-assets-jquery (~> 1.11.1)
@ -525,11 +525,11 @@ GEM
rails-assets-punycode (1.3.2) rails-assets-punycode (1.3.2)
rails-deprecated_sanitizer (1.0.3) rails-deprecated_sanitizer (1.0.3)
activesupport (>= 4.2.0.alpha) activesupport (>= 4.2.0.alpha)
rails-dom-testing (1.0.5) rails-dom-testing (1.0.6)
activesupport (>= 4.2.0.beta, < 5.0) activesupport (>= 4.2.0.beta, < 5.0)
nokogiri (~> 1.6.0) nokogiri (~> 1.6.0)
rails-deprecated_sanitizer (>= 1.0.1) rails-deprecated_sanitizer (>= 1.0.1)
rails-html-sanitizer (1.0.1) rails-html-sanitizer (1.0.2)
loofah (~> 2.0) loofah (~> 2.0)
rails-i18n (4.0.4) rails-i18n (4.0.4)
i18n (~> 0.6) i18n (~> 0.6)
@ -553,9 +553,9 @@ GEM
remotipart (~> 1.0) remotipart (~> 1.0)
safe_yaml (~> 1.0) safe_yaml (~> 1.0)
sass-rails (>= 4.0, < 6) sass-rails (>= 4.0, < 6)
railties (4.2.0) railties (4.2.1)
actionpack (= 4.2.0) actionpack (= 4.2.1)
activesupport (= 4.2.0) activesupport (= 4.2.1)
rake (>= 0.8.7) rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0) thor (>= 0.18.1, < 2.0)
rainbow (2.0.0) rainbow (2.0.0)
@ -658,7 +658,7 @@ GEM
test_after_commit (0.4.0) test_after_commit (0.4.0)
activerecord (>= 3.2) activerecord (>= 3.2)
thor (0.19.1) thor (0.19.1)
thread_safe (0.3.4) thread_safe (0.3.5)
tilt (1.4.1) tilt (1.4.1)
timecop (0.7.3) timecop (0.7.3)
timers (4.0.1) timers (4.0.1)
@ -770,7 +770,7 @@ DEPENDENCIES
rack-protection (= 1.5.3) rack-protection (= 1.5.3)
rack-rewrite (= 1.5.1) rack-rewrite (= 1.5.1)
rack-ssl (= 1.4.1) rack-ssl (= 1.4.1)
rails (= 4.2.0) rails (= 4.2.1)
rails-assets-diaspora_jsxc (~> 0.1.1) rails-assets-diaspora_jsxc (~> 0.1.1)
rails-assets-jasmine-ajax (= 3.0.0) rails-assets-jasmine-ajax (= 3.0.0)
rails-assets-jeresig--jquery.hotkeys (= 0.2.0) rails-assets-jeresig--jquery.hotkeys (= 0.2.0)