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

Merge pull request #6347 from jhass/bump_rails

Browse source 
Bump Rails to 4.2.4
This commit is contained in:
Dennis Schubert 2015-08-25 04:15:53 +02:00
commit e0ad53e465
2 changed files with 34 additions and 34 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.3" gem "rails", "4.2.4"
# Legacy Rails features, remove me! # Legacy Rails features, remove me!
# responders (class level) # responders (class level)

66
Gemfile.lock
View file

@ -3,40 +3,40 @@ GEM
remote: https://rails-assets.org/ remote: https://rails-assets.org/
specs: specs:
CFPropertyList (2.3.1) CFPropertyList (2.3.1)
actionmailer (4.2.3) actionmailer (4.2.4)
actionpack (= 4.2.3) actionpack (= 4.2.4)
actionview (= 4.2.3) actionview (= 4.2.4)
activejob (= 4.2.3) activejob (= 4.2.4)
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.3) actionpack (4.2.4)
actionview (= 4.2.3) actionview (= 4.2.4)
activesupport (= 4.2.3) activesupport (= 4.2.4)
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.2) rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (4.2.3) actionview (4.2.4)
activesupport (= 4.2.3) activesupport (= 4.2.4)
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.2) 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.3) activejob (4.2.4)
activesupport (= 4.2.3) activesupport (= 4.2.4)
globalid (>= 0.3.0) globalid (>= 0.3.0)
activemodel (4.2.3) activemodel (4.2.4)
activesupport (= 4.2.3) activesupport (= 4.2.4)
builder (~> 3.1) builder (~> 3.1)
activerecord (4.2.3) activerecord (4.2.4)
activemodel (= 4.2.3) activemodel (= 4.2.4)
activesupport (= 4.2.3) activesupport (= 4.2.4)
arel (~> 6.0) arel (~> 6.0)
activerecord-import (0.10.0) activerecord-import (0.10.0)
activerecord (>= 3.0) activerecord (>= 3.0)
activesupport (4.2.3) activesupport (4.2.4)
i18n (~> 0.7) i18n (~> 0.7)
json (~> 1.7, >= 1.7.7) json (~> 1.7, >= 1.7.7)
minitest (~> 5.1) minitest (~> 5.1)
@ -314,7 +314,7 @@ GEM
gitlab (3.4.0) gitlab (3.4.0)
httparty httparty
terminal-table terminal-table
globalid (0.3.5) globalid (0.3.6)
activesupport (>= 4.1.0) activesupport (>= 4.1.0)
gon (6.0.1) gon (6.0.1)
actionpack (>= 3.0) actionpack (>= 3.0)
@ -418,7 +418,7 @@ GEM
multi_json (~> 1.10) multi_json (~> 1.10)
logging-rails (0.5.0) logging-rails (0.5.0)
logging (>= 1.8) logging (>= 1.8)
loofah (2.0.2) loofah (2.0.3)
nokogiri (>= 1.5.9) nokogiri (>= 1.5.9)
lumberjack (1.0.9) lumberjack (1.0.9)
macaddr (1.7.1) macaddr (1.7.1)
@ -534,16 +534,16 @@ GEM
rack rack
rack-test (0.6.3) rack-test (0.6.3)
rack (>= 1.0) rack (>= 1.0)
rails (4.2.3) rails (4.2.4)
actionmailer (= 4.2.3) actionmailer (= 4.2.4)
actionpack (= 4.2.3) actionpack (= 4.2.4)
actionview (= 4.2.3) actionview (= 4.2.4)
activejob (= 4.2.3) activejob (= 4.2.4)
activemodel (= 4.2.3) activemodel (= 4.2.4)
activerecord (= 4.2.3) activerecord (= 4.2.4)
activesupport (= 4.2.3) activesupport (= 4.2.4)
bundler (>= 1.3.0, < 2.0) bundler (>= 1.3.0, < 2.0)
railties (= 4.2.3) railties (= 4.2.4)
sprockets-rails sprockets-rails
rails-assets-autosize (3.0.8) rails-assets-autosize (3.0.8)
rails-assets-colorbox (1.6.3) rails-assets-colorbox (1.6.3)
@ -586,7 +586,7 @@ GEM
rails-assets-jquery (>= 1.7) rails-assets-jquery (>= 1.7)
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.6) rails-dom-testing (1.0.7)
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)
@ -612,9 +612,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.3) railties (4.2.4)
actionpack (= 4.2.3) actionpack (= 4.2.4)
activesupport (= 4.2.3) activesupport (= 4.2.4)
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)
@ -861,7 +861,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.3) rails (= 4.2.4)
rails-assets-autosize (= 3.0.8)! rails-assets-autosize (= 3.0.8)!
rails-assets-diaspora_jsxc (~> 0.1.4.develop)! rails-assets-diaspora_jsxc (~> 0.1.4.develop)!
rails-assets-highlightjs (= 8.6.0)! rails-assets-highlightjs (= 8.6.0)!