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

bump rails

Browse source 
closes #6140
This commit is contained in:
Jonne Haß 2015-06-26 16:26:33 +02:00 committed by Dennis Schubert
parent 6c2e93c01d
commit 070e785714
2 changed files with 36 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Gemfile
View file

@ -1,6 +1,6 @@
source "https://rubygems.org" source "https://rubygems.org"
gem "rails", "4.2.2" gem "rails", "4.2.3"
# Legacy Rails features, remove me! # Legacy Rails features, remove me!

69
Gemfile.lock
View file

@ -3,44 +3,44 @@ GEM
remote: https://rails-assets.org/ remote: https://rails-assets.org/
specs: specs:
CFPropertyList (2.3.1) CFPropertyList (2.3.1)
actionmailer (4.2.2) actionmailer (4.2.3)
actionpack (= 4.2.2) actionpack (= 4.2.3)
actionview (= 4.2.2) actionview (= 4.2.3)
activejob (= 4.2.2) activejob (= 4.2.3)
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.2) actionpack (4.2.3)
actionview (= 4.2.2) actionview (= 4.2.3)
activesupport (= 4.2.2) activesupport (= 4.2.3)
rack (~> 1.6) 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.2)
actionpack-action_caching (1.1.1) actionpack-action_caching (1.1.1)
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.2) actionview (4.2.3)
activesupport (= 4.2.2) activesupport (= 4.2.3)
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.2)
active_model_serializers (0.9.3) active_model_serializers (0.9.3)
activemodel (>= 3.2) activemodel (>= 3.2)
activejob (4.2.2) activejob (4.2.3)
activesupport (= 4.2.2) activesupport (= 4.2.3)
globalid (>= 0.3.0) globalid (>= 0.3.0)
activemodel (4.2.2) activemodel (4.2.3)
activesupport (= 4.2.2) activesupport (= 4.2.3)
builder (~> 3.1) builder (~> 3.1)
activerecord (4.2.2) activerecord (4.2.3)
activemodel (= 4.2.2) activemodel (= 4.2.3)
activesupport (= 4.2.2) activesupport (= 4.2.3)
arel (~> 6.0) arel (~> 6.0)
activerecord-import (0.8.0) activerecord-import (0.8.0)
activerecord (>= 3.0) activerecord (>= 3.0)
activesupport (4.2.2) activesupport (4.2.3)
i18n (~> 0.7) i18n (~> 0.7)
json (~> 1.7, >= 1.7.7) json (~> 1.7, >= 1.7.7)
minitest (~> 5.1) minitest (~> 5.1)
@ -503,16 +503,16 @@ GEM
rack rack
rack-test (0.6.3) rack-test (0.6.3)
rack (>= 1.0) rack (>= 1.0)
rails (4.2.2) rails (4.2.3)
actionmailer (= 4.2.2) actionmailer (= 4.2.3)
actionpack (= 4.2.2) actionpack (= 4.2.3)
actionview (= 4.2.2) actionview (= 4.2.3)
activejob (= 4.2.2) activejob (= 4.2.3)
activemodel (= 4.2.2) activemodel (= 4.2.3)
activerecord (= 4.2.2) activerecord (= 4.2.3)
activesupport (= 4.2.2) activesupport (= 4.2.3)
bundler (>= 1.3.0, < 2.0) bundler (>= 1.3.0, < 2.0)
railties (= 4.2.2) railties (= 4.2.3)
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)
@ -580,9 +580,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.2) railties (4.2.3)
actionpack (= 4.2.2) actionpack (= 4.2.3)
activesupport (= 4.2.2) activesupport (= 4.2.3)
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)
@ -686,7 +686,7 @@ GEM
multi_json (~> 1.0) multi_json (~> 1.0)
rack (~> 1.0) rack (~> 1.0)
tilt (~> 1.1, != 1.3.0) tilt (~> 1.1, != 1.3.0)
sprockets-rails (2.3.1) sprockets-rails (2.3.2)
actionpack (>= 3.0) actionpack (>= 3.0)
activesupport (>= 3.0) activesupport (>= 3.0)
sprockets (>= 2.8, < 4.0) sprockets (>= 2.8, < 4.0)
@ -816,7 +816,8 @@ 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.2) rails (= 4.2.3)
rails-assets-autosize (= 3.0.6)!
rails-assets-diaspora_jsxc (~> 0.1.1)! rails-assets-diaspora_jsxc (~> 0.1.1)!
rails-assets-highlightjs (= 8.5.0)! rails-assets-highlightjs (= 8.5.0)!
rails-assets-jakobmattsson--jquery-elastic (= 1.6.11)! rails-assets-jakobmattsson--jquery-elastic (= 1.6.11)!
@ -874,4 +875,4 @@ DEPENDENCIES
will_paginate (= 3.0.7) will_paginate (= 3.0.7)
BUNDLED WITH BUNDLED WITH
1.10.4 1.10.5