diff --git a/Appraisals b/Appraisals index 478e1d85..fe01ec6c 100644 --- a/Appraisals +++ b/Appraisals @@ -21,15 +21,23 @@ appraise "rails40" do end appraise "rails41" do - gem "rails", "~> 4.1.11" + gem "rails", "~> 4.1.16" end appraise "rails42" do - gem "rails", "~> 4.2.5" + gem "mime-types", "< 3", :require => false + gem "rails", "~> 4.2.9" +end + +appraise "rails50" do + gem "rails", "~> 5.0.5" +end + +appraise "rails51" do + gem "rails", "~> 5.1.2" end appraise "railsNG" do - gem 'rails', "5.0.0.beta1" - #gem 'rails', :github => 'rails/rails', :branch => 'master' - #gem 'arel', :github => 'rails/arel', :branch => 'master' + gem 'rails', :github => 'rails/rails', :branch => 'master' + gem 'arel', :github => 'rails/arel', :branch => 'master' end diff --git a/gemfiles/rails23.gemfile b/gemfiles/rails23.gemfile index 5a2f084a..f238fadd 100644 --- a/gemfiles/rails23.gemfile +++ b/gemfiles/rails23.gemfile @@ -4,5 +4,6 @@ source "https://rubygems.org" gem "rake", "~> 10.4.2", :group=>:test, :require=>nil gem "rspec", "~> 2.14.1", :group=>:test +gem "jruby-openssl", "~> 0.9.20", :group=>:test gem "rails", "~> 2.3.18" diff --git a/gemfiles/rails23.gemfile.lock b/gemfiles/rails23.gemfile.lock index 20a91a1d..90f66c6b 100644 --- a/gemfiles/rails23.gemfile.lock +++ b/gemfiles/rails23.gemfile.lock @@ -12,6 +12,7 @@ GEM activesupport (= 2.3.18) activesupport (2.3.18) diff-lcs (1.2.5) + jruby-openssl (0.9.21-java) rack (1.1.6) rails (2.3.18) actionmailer (= 2.3.18) @@ -34,6 +35,10 @@ PLATFORMS java DEPENDENCIES + jruby-openssl (~> 0.9.20) rails (~> 2.3.18) rake (~> 10.4.2) rspec (~> 2.14.1) + +BUNDLED WITH + 1.14.6 diff --git a/gemfiles/rails30.gemfile b/gemfiles/rails30.gemfile index f729b9f1..ecf30f7e 100644 --- a/gemfiles/rails30.gemfile +++ b/gemfiles/rails30.gemfile @@ -4,5 +4,6 @@ source "https://rubygems.org" gem "rake", "~> 10.4.2", :group=>:test, :require=>nil gem "rspec", "~> 2.14.1", :group=>:test +gem "jruby-openssl", "~> 0.9.20", :group=>:test gem "rails", "~> 3.0.20" diff --git a/gemfiles/rails30.gemfile.lock b/gemfiles/rails30.gemfile.lock index 1de9aaef..cd1bd60b 100644 --- a/gemfiles/rails30.gemfile.lock +++ b/gemfiles/rails30.gemfile.lock @@ -34,6 +34,7 @@ GEM erubis (2.6.6) abstract (>= 1.0.0) i18n (0.5.4) + jruby-openssl (0.9.21-java) json (1.8.1-java) mail (2.2.20) activesupport (>= 2.3.6) @@ -75,29 +76,6 @@ GEM thor (0.14.6) treetop (1.4.15) polyglot - polyglot - polyglot - polyglot - polyglot - polyglot - polyglot - polyglot - polyglot - polyglot - polyglot - polyglot - polyglot (>= 0.3.1) - polyglot (>= 0.3.1) - polyglot (>= 0.3.1) - polyglot (>= 0.3.1) - polyglot (>= 0.3.1) - polyglot (>= 0.3.1) - polyglot (>= 0.3.1) - polyglot (>= 0.3.1) - polyglot (>= 0.3.1) - polyglot (>= 0.3.1) - polyglot (>= 0.3.1) - polyglot (>= 0.3.1) polyglot (>= 0.3.1) tzinfo (0.3.40) @@ -105,6 +83,10 @@ PLATFORMS java DEPENDENCIES + jruby-openssl (~> 0.9.20) rails (~> 3.0.20) rake (~> 10.4.2) rspec (~> 2.14.1) + +BUNDLED WITH + 1.14.6 diff --git a/gemfiles/rails31.gemfile b/gemfiles/rails31.gemfile index b9221a47..08a6e69a 100644 --- a/gemfiles/rails31.gemfile +++ b/gemfiles/rails31.gemfile @@ -4,6 +4,7 @@ source "https://rubygems.org" gem "rake", "~> 10.4.2", :group=>:test, :require=>nil gem "rspec", "~> 2.14.1", :group=>:test +gem "jruby-openssl", "~> 0.9.20", :group=>:test gem "i18n", "< 0.7" gem "rails", "~> 3.1.12" diff --git a/gemfiles/rails31.gemfile.lock b/gemfiles/rails31.gemfile.lock index 63296653..d2ba1cb6 100644 --- a/gemfiles/rails31.gemfile.lock +++ b/gemfiles/rails31.gemfile.lock @@ -35,6 +35,7 @@ GEM erubis (2.7.0) hike (1.2.3) i18n (0.6.11) + jruby-openssl (0.9.21-java) json (1.8.2-java) mail (2.4.4) i18n (>= 0.4.0) @@ -94,6 +95,10 @@ PLATFORMS DEPENDENCIES i18n (< 0.7) + jruby-openssl (~> 0.9.20) rails (~> 3.1.12) rake (~> 10.4.2) rspec (~> 2.14.1) + +BUNDLED WITH + 1.14.6 diff --git a/gemfiles/rails32.gemfile b/gemfiles/rails32.gemfile index 73935172..34a0b91a 100644 --- a/gemfiles/rails32.gemfile +++ b/gemfiles/rails32.gemfile @@ -4,6 +4,7 @@ source "https://rubygems.org" gem "rake", "~> 10.4.2", :group=>:test, :require=>nil gem "rspec", "~> 2.14.1", :group=>:test +gem "jruby-openssl", "~> 0.9.20", :group=>:test gem "i18n", "< 0.7" gem "rails", "~> 3.2.21" diff --git a/gemfiles/rails32.gemfile.lock b/gemfiles/rails32.gemfile.lock index fabc4f7b..fefa5ee8 100644 --- a/gemfiles/rails32.gemfile.lock +++ b/gemfiles/rails32.gemfile.lock @@ -35,6 +35,7 @@ GEM hike (1.2.3) i18n (0.6.11) journey (1.0.4) + jruby-openssl (0.9.21-java) json (1.8.3-java) mail (2.5.4) mime-types (~> 1.16) @@ -92,9 +93,10 @@ PLATFORMS DEPENDENCIES i18n (< 0.7) + jruby-openssl (~> 0.9.20) rails (~> 3.2.21) rake (~> 10.4.2) rspec (~> 2.14.1) BUNDLED WITH - 1.10.2 + 1.14.6 diff --git a/gemfiles/rails40.gemfile b/gemfiles/rails40.gemfile index 9d52f5b7..debd7a5d 100644 --- a/gemfiles/rails40.gemfile +++ b/gemfiles/rails40.gemfile @@ -4,5 +4,6 @@ source "https://rubygems.org" gem "rake", "~> 10.4.2", :group=>:test, :require=>nil gem "rspec", "~> 2.14.1", :group=>:test +gem "jruby-openssl", "~> 0.9.20", :group=>:test gem "rails", "~> 4.0.13" diff --git a/gemfiles/rails40.gemfile.lock b/gemfiles/rails40.gemfile.lock index 2f16a6d9..5d3715d8 100644 --- a/gemfiles/rails40.gemfile.lock +++ b/gemfiles/rails40.gemfile.lock @@ -30,6 +30,7 @@ GEM diff-lcs (1.2.5) erubis (2.7.0) i18n (0.7.0) + jruby-openssl (0.9.21-java) mail (2.6.3) mime-types (>= 1.16, < 3) mime-types (2.6.1) @@ -74,9 +75,10 @@ PLATFORMS java DEPENDENCIES + jruby-openssl (~> 0.9.20) rails (~> 4.0.13) rake (~> 10.4.2) rspec (~> 2.14.1) BUNDLED WITH - 1.10.2 + 1.14.6 diff --git a/gemfiles/rails41.gemfile b/gemfiles/rails41.gemfile index 9ff8a718..28928149 100644 --- a/gemfiles/rails41.gemfile +++ b/gemfiles/rails41.gemfile @@ -4,5 +4,6 @@ source "https://rubygems.org" gem "rake", "~> 10.4.2", :group=>:test, :require=>nil gem "rspec", "~> 2.14.1", :group=>:test -gem "rails", "~> 4.1.11" +gem "jruby-openssl", "~> 0.9.20", :group=>:test +gem "rails", "~> 4.1.16" diff --git a/gemfiles/rails41.gemfile.lock b/gemfiles/rails41.gemfile.lock index 6500f714..e223b9be 100644 --- a/gemfiles/rails41.gemfile.lock +++ b/gemfiles/rails41.gemfile.lock @@ -1,58 +1,60 @@ GEM remote: https://rubygems.org/ specs: - actionmailer (4.1.12) - actionpack (= 4.1.12) - actionview (= 4.1.12) + actionmailer (4.1.16) + actionpack (= 4.1.16) + actionview (= 4.1.16) mail (~> 2.5, >= 2.5.4) - actionpack (4.1.12) - actionview (= 4.1.12) - activesupport (= 4.1.12) + actionpack (4.1.16) + actionview (= 4.1.16) + activesupport (= 4.1.16) rack (~> 1.5.2) rack-test (~> 0.6.2) - actionview (4.1.12) - activesupport (= 4.1.12) + actionview (4.1.16) + activesupport (= 4.1.16) builder (~> 3.1) erubis (~> 2.7.0) - activemodel (4.1.12) - activesupport (= 4.1.12) + activemodel (4.1.16) + activesupport (= 4.1.16) builder (~> 3.1) - activerecord (4.1.12) - activemodel (= 4.1.12) - activesupport (= 4.1.12) + activerecord (4.1.16) + activemodel (= 4.1.16) + activesupport (= 4.1.16) arel (~> 5.0.0) - activesupport (4.1.12) + activesupport (4.1.16) i18n (~> 0.6, >= 0.6.9) json (~> 1.7, >= 1.7.7) minitest (~> 5.1) thread_safe (~> 0.1) tzinfo (~> 1.1) arel (5.0.1.20140414130214) - builder (3.2.2) + builder (3.2.3) + concurrent-ruby (1.0.5-java) diff-lcs (1.2.5) erubis (2.7.0) i18n (0.7.0) - json (1.8.3-java) - mail (2.6.3) - mime-types (>= 1.16, < 3) - mime-types (2.6.1) - minitest (5.7.0) + jruby-openssl (0.9.21-java) + json (1.8.6-java) + mail (2.6.6) + mime-types (>= 1.16, < 4) + mime-types (2.6.2) + minitest (5.10.3) rack (1.5.5) rack-test (0.6.3) rack (>= 1.0) - rails (4.1.12) - actionmailer (= 4.1.12) - actionpack (= 4.1.12) - actionview (= 4.1.12) - activemodel (= 4.1.12) - activerecord (= 4.1.12) - activesupport (= 4.1.12) + rails (4.1.16) + actionmailer (= 4.1.16) + actionpack (= 4.1.16) + actionview (= 4.1.16) + activemodel (= 4.1.16) + activerecord (= 4.1.16) + activesupport (= 4.1.16) bundler (>= 1.3.0, < 2.0) - railties (= 4.1.12) + railties (= 4.1.16) sprockets-rails (~> 2.0) - railties (4.1.12) - actionpack (= 4.1.12) - activesupport (= 4.1.12) + railties (4.1.16) + actionpack (= 4.1.16) + activesupport (= 4.1.16) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rake (10.4.2) @@ -64,24 +66,26 @@ GEM rspec-expectations (2.14.5) diff-lcs (>= 1.1.3, < 2.0) rspec-mocks (2.14.6) - sprockets (3.2.0) - rack (~> 1.0) - sprockets-rails (2.3.2) + sprockets (3.7.1) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + sprockets-rails (2.3.3) actionpack (>= 3.0) activesupport (>= 3.0) sprockets (>= 2.8, < 4.0) - thor (0.19.1) - thread_safe (0.3.5-java) - tzinfo (1.2.2) + thor (0.19.4) + thread_safe (0.3.6-java) + tzinfo (1.2.3) thread_safe (~> 0.1) PLATFORMS java DEPENDENCIES - rails (~> 4.1.11) + jruby-openssl (~> 0.9.20) + rails (~> 4.1.16) rake (~> 10.4.2) rspec (~> 2.14.1) BUNDLED WITH - 1.10.6 + 1.14.6 diff --git a/gemfiles/rails42.gemfile b/gemfiles/rails42.gemfile index 59f51d4f..de51d434 100644 --- a/gemfiles/rails42.gemfile +++ b/gemfiles/rails42.gemfile @@ -4,5 +4,7 @@ source "https://rubygems.org" gem "rake", "~> 10.4.2", :group=>:test, :require=>nil gem "rspec", "~> 2.14.1", :group=>:test -gem "rails", "~> 4.2.5" +gem "jruby-openssl", "~> 0.9.20", :group=>:test +gem "mime-types", "< 3", :require=>false +gem "rails", "~> 4.2.9" diff --git a/gemfiles/rails42.gemfile.lock b/gemfiles/rails42.gemfile.lock index 5c442a4f..c7cc62ad 100644 --- a/gemfiles/rails42.gemfile.lock +++ b/gemfiles/rails42.gemfile.lock @@ -1,82 +1,81 @@ GEM remote: https://rubygems.org/ specs: - actionmailer (4.2.5) - actionpack (= 4.2.5) - actionview (= 4.2.5) - activejob (= 4.2.5) + actionmailer (4.2.9) + actionpack (= 4.2.9) + actionview (= 4.2.9) + activejob (= 4.2.9) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 1.0, >= 1.0.5) - actionpack (4.2.5) - actionview (= 4.2.5) - activesupport (= 4.2.5) + actionpack (4.2.9) + actionview (= 4.2.9) + activesupport (= 4.2.9) rack (~> 1.6) rack-test (~> 0.6.2) rails-dom-testing (~> 1.0, >= 1.0.5) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (4.2.5) - activesupport (= 4.2.5) + actionview (4.2.9) + activesupport (= 4.2.9) builder (~> 3.1) erubis (~> 2.7.0) rails-dom-testing (~> 1.0, >= 1.0.5) - rails-html-sanitizer (~> 1.0, >= 1.0.2) - activejob (4.2.5) - activesupport (= 4.2.5) + rails-html-sanitizer (~> 1.0, >= 1.0.3) + activejob (4.2.9) + activesupport (= 4.2.9) globalid (>= 0.3.0) - activemodel (4.2.5) - activesupport (= 4.2.5) + activemodel (4.2.9) + activesupport (= 4.2.9) builder (~> 3.1) - activerecord (4.2.5) - activemodel (= 4.2.5) - activesupport (= 4.2.5) + activerecord (4.2.9) + activemodel (= 4.2.9) + activesupport (= 4.2.9) arel (~> 6.0) - activesupport (4.2.5) + activesupport (4.2.9) i18n (~> 0.7) - json (~> 1.7, >= 1.7.7) minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) - arel (6.0.3) - builder (3.2.2) - concurrent-ruby (1.0.0-java) + arel (6.0.4) + builder (3.2.3) + concurrent-ruby (1.0.5-java) diff-lcs (1.2.5) erubis (2.7.0) - globalid (0.3.6) - activesupport (>= 4.1.0) - i18n (0.7.0) - json (1.8.3-java) + globalid (0.4.0) + activesupport (>= 4.2.0) + i18n (0.8.6) + jruby-openssl (0.9.21-java) loofah (2.0.3) nokogiri (>= 1.5.9) - mail (2.6.3) - mime-types (>= 1.16, < 3) + mail (2.6.6) + mime-types (>= 1.16, < 4) mime-types (2.99) - minitest (5.8.3) - nokogiri (1.6.7.2-java) - rack (1.6.4) + minitest (5.10.3) + nokogiri (1.8.0-java) + rack (1.6.8) rack-test (0.6.3) rack (>= 1.0) - rails (4.2.5) - actionmailer (= 4.2.5) - actionpack (= 4.2.5) - actionview (= 4.2.5) - activejob (= 4.2.5) - activemodel (= 4.2.5) - activerecord (= 4.2.5) - activesupport (= 4.2.5) + rails (4.2.9) + actionmailer (= 4.2.9) + actionpack (= 4.2.9) + actionview (= 4.2.9) + activejob (= 4.2.9) + activemodel (= 4.2.9) + activerecord (= 4.2.9) + activesupport (= 4.2.9) bundler (>= 1.3.0, < 2.0) - railties (= 4.2.5) + railties (= 4.2.9) sprockets-rails rails-deprecated_sanitizer (1.0.3) activesupport (>= 4.2.0.alpha) - rails-dom-testing (1.0.7) + rails-dom-testing (1.0.8) activesupport (>= 4.2.0.beta, < 5.0) - nokogiri (~> 1.6.0) + nokogiri (~> 1.6) rails-deprecated_sanitizer (>= 1.0.1) - rails-html-sanitizer (1.0.2) + rails-html-sanitizer (1.0.3) loofah (~> 2.0) - railties (4.2.5) - actionpack (= 4.2.5) - activesupport (= 4.2.5) + railties (4.2.9) + actionpack (= 4.2.9) + activesupport (= 4.2.9) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) rake (10.4.2) @@ -88,25 +87,27 @@ GEM rspec-expectations (2.14.5) diff-lcs (>= 1.1.3, < 2.0) rspec-mocks (2.14.6) - sprockets (3.5.2) + sprockets (3.7.1) concurrent-ruby (~> 1.0) rack (> 1, < 3) - sprockets-rails (3.0.0) + sprockets-rails (3.2.0) actionpack (>= 4.0) activesupport (>= 4.0) sprockets (>= 3.0.0) - thor (0.19.1) - thread_safe (0.3.5-java) - tzinfo (1.2.2) + thor (0.19.4) + thread_safe (0.3.6-java) + tzinfo (1.2.3) thread_safe (~> 0.1) PLATFORMS java DEPENDENCIES - rails (~> 4.2.5) + jruby-openssl (~> 0.9.20) + mime-types (< 3) + rails (~> 4.2.9) rake (~> 10.4.2) rspec (~> 2.14.1) BUNDLED WITH - 1.10.6 + 1.14.6