cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update to rails 4.2.8

Browse source
This commit is contained in:
Tom Hughes 2017-02-23 21:18:57 +00:00
parent afde3ecd9f
commit f8f7cc4628
4 changed files with 58 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Gemfile
View file

@ -1,7 +1,7 @@
source "https://rubygems.org"
# Require rails
gem "rails", "4.2.7.1"
gem "rails", "4.2.8"
# Require things which have moved to gems in ruby 1.9
gem "bigdecimal", "~> 1.1.0", :platforms => :ruby_19

101
Gemfile.lock
View file

@ -2,40 +2,39 @@ GEM
remote: https://rubygems.org/
specs:
SystemTimer (1.2.3)
actionmailer (4.2.7.1)
actionpack (= 4.2.7.1)
actionview (= 4.2.7.1)
activejob (= 4.2.7.1)
actionmailer (4.2.8)
actionpack (= 4.2.8)
actionview (= 4.2.8)
activejob (= 4.2.8)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 1.0, >= 1.0.5)
actionpack (4.2.7.1)
actionview (= 4.2.7.1)
activesupport (= 4.2.7.1)
actionpack (4.2.8)
actionview (= 4.2.8)
activesupport (= 4.2.8)
rack (~> 1.6)
rack-test (~> 0.6.2)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionpack-page_caching (1.1.0)
actionpack (>= 4.0.0, < 6)
actionview (4.2.7.1)
activesupport (= 4.2.7.1)
actionview (4.2.8)
activesupport (= 4.2.8)
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.7.1)
activesupport (= 4.2.7.1)
rails-html-sanitizer (~> 1.0, >= 1.0.3)
activejob (4.2.8)
activesupport (= 4.2.8)
globalid (>= 0.3.0)
activemodel (4.2.7.1)
activesupport (= 4.2.7.1)
activemodel (4.2.8)
activesupport (= 4.2.8)
builder (~> 3.1)
activerecord (4.2.7.1)
activemodel (= 4.2.7.1)
activesupport (= 4.2.7.1)
activerecord (4.2.8)
activemodel (= 4.2.8)
activesupport (= 4.2.8)
arel (~> 6.0)
activesupport (4.2.7.1)
activesupport (4.2.8)
i18n (~> 0.7)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
@ -43,11 +42,11 @@ GEM
public_suffix (~> 2.0, >= 2.0.2)
arel (6.0.4)
ast (2.3.0)
autoprefixer-rails (6.7.2)
autoprefixer-rails (6.7.5)
execjs
bigdecimal (1.1.0)
builder (3.2.3)
capybara (2.12.0)
capybara (2.12.1)
addressable
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
@ -92,18 +91,18 @@ GEM
railties (>= 3.0.0)
faraday (0.10.1)
multipart-post (>= 1.2, < 3)
fspath (3.0.1)
fspath (3.0.3)
geoip (1.6.3)
globalid (0.3.7)
activesupport (>= 4.1.0)
hashdiff (0.3.2)
hashie (3.4.6)
hashie (3.5.4)
htmlentities (4.3.4)
http_accept_language (2.0.5)
i18n (0.8.0)
i18n (0.8.1)
i18n-js (3.0.0.rc15)
i18n (~> 0.6, >= 0.6.6)
image_optim (0.24.1)
image_optim (0.24.2)
exifr (~> 1.2, >= 1.2.2)
fspath (~> 3.0)
image_size (~> 1.5)
@ -123,7 +122,7 @@ GEM
execjs (>= 1.4.0)
multi_json (~> 1.0)
therubyracer (~> 0.12.1)
json (1.8.6)
json (2.0.3)
jsonify (0.3.1)
multi_json (~> 1.0)
jsonify-rails (0.3.2)
@ -140,7 +139,7 @@ GEM
sprockets-rails (>= 2, < 4)
tilt
libv8 (3.16.14.17)
libxml-ruby (2.9.0)
libxml-ruby (3.0.0)
logstash-event (1.2.02)
logstasher (1.1.1)
activerecord (>= 4.0)
@ -176,13 +175,13 @@ GEM
multi_json (~> 1.3)
multi_xml (~> 0.5)
rack (>= 1.2, < 3)
omniauth (1.3.2)
hashie (>= 1.2, < 4)
rack (>= 1.0, < 3)
omniauth (1.6.1)
hashie (>= 3.4.6, < 3.6.0)
rack (>= 1.6.2, < 3)
omniauth-facebook (4.0.0)
omniauth-oauth2 (~> 1.2)
omniauth-github (1.2.0)
omniauth (~> 1.3.2)
omniauth-github (1.2.3)
omniauth (~> 1.5)
omniauth-oauth2 (>= 1.4.0, < 2.0)
omniauth-google-oauth2 (0.4.1)
jwt (~> 1.5.2)
@ -201,8 +200,8 @@ GEM
omniauth-openid (1.0.1)
omniauth (~> 1.0)
rack-openid (~> 1.3.1)
omniauth-windowslive (0.0.11)
multi_json (>= 1.0.3)
omniauth-windowslive (0.0.12)
multi_json (~> 1.12)
omniauth-oauth2 (~> 1.4)
paperclip (4.3.7)
activemodel (>= 3.2.0)
@ -210,7 +209,7 @@ GEM
cocaine (~> 0.5.5)
mime-types
mimemagic (= 0.3.0)
parser (2.3.3.1)
parser (2.4.0.0)
ast (~> 2.2)
pg (0.19.0)
poltergeist (1.13.0)
@ -218,8 +217,8 @@ GEM
cliver (~> 0.3.1)
websocket-driver (>= 0.2.0)
powerpack (0.1.1)
progress (3.3.0)
psych (2.2.2)
progress (3.3.1)
psych (2.2.3)
public_suffix (2.0.5)
r2 (0.2.6)
rack (1.6.5)
@ -230,16 +229,16 @@ GEM
rack-test (0.6.3)
rack (>= 1.0)
rack-uri_sanitizer (0.0.2)
rails (4.2.7.1)
actionmailer (= 4.2.7.1)
actionpack (= 4.2.7.1)
actionview (= 4.2.7.1)
activejob (= 4.2.7.1)
activemodel (= 4.2.7.1)
activerecord (= 4.2.7.1)
activesupport (= 4.2.7.1)
rails (4.2.8)
actionmailer (= 4.2.8)
actionpack (= 4.2.8)
actionview (= 4.2.8)
activejob (= 4.2.8)
activemodel (= 4.2.8)
activerecord (= 4.2.8)
activesupport (= 4.2.8)
bundler (>= 1.3.0, < 2.0)
railties (= 4.2.7.1)
railties (= 4.2.8)
sprockets-rails
rails-deprecated_sanitizer (1.0.3)
activesupport (>= 4.2.0.alpha)
@ -252,9 +251,9 @@ GEM
rails-i18n (4.0.9)
i18n (~> 0.7)
railties (~> 4.0)
railties (4.2.7.1)
actionpack (= 4.2.7.1)
activesupport (= 4.2.7.1)
railties (4.2.8)
actionpack (= 4.2.8)
activesupport (= 4.2.8)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rainbow (2.2.1)
@ -302,7 +301,7 @@ GEM
libv8 (~> 3.16.14.15)
ref
thor (0.19.4)
thread_safe (0.3.5)
thread_safe (0.3.6)
tilt (2.0.6)
timecop (0.8.1)
tins (1.13.2)
@ -369,7 +368,7 @@ DEPENDENCIES
r2
rack-cors
rack-uri_sanitizer
rails (= 4.2.7.1)
rails (= 4.2.8)
rails-i18n (~> 4.0.0)
redcarpet
rinku (>= 1.2.2)

6
test/integration/user_creation_test.rb
View file

@ -515,7 +515,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest
assert_redirected_to auth_path(:provider => "windowslive", :origin => "/user/new")
follow_redirect!
assert_response :redirect
assert_redirected_to auth_success_path(:provider => "windowslive", :origin => "/user/new")
assert_redirected_to auth_success_path(:provider => "windowslive")
follow_redirect!
assert_response :redirect
assert_redirected_to "/user/terms"
@ -546,7 +546,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest
assert_redirected_to auth_path(:provider => "windowslive", :origin => "/user/new")
follow_redirect!
assert_response :redirect
assert_redirected_to auth_success_path(:provider => "windowslive", :origin => "/user/new")
assert_redirected_to auth_success_path(:provider => "windowslive")
follow_redirect!
assert_response :redirect
assert_redirected_to auth_failure_path(:strategy => "windowslive", :message => "connection_failed", :origin => "/user/new")
@ -576,7 +576,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest
assert_redirected_to auth_path(:provider => "windowslive", :origin => "/user/new")
follow_redirect!
assert_response :redirect
assert_redirected_to auth_success_path(:provider => "windowslive", :origin => "/user/new")
assert_redirected_to auth_success_path(:provider => "windowslive")
follow_redirect!
assert_response :redirect
assert_redirected_to "/user/terms"

8
test/integration/user_login_test.rb
View file

@ -660,7 +660,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest
assert_template "user/login"
get auth_path(:provider => "windowslive", :origin => "/login?referer=%2Fhistory", :referer => "/history")
assert_response :redirect
assert_redirected_to auth_success_path(:provider => "windowslive", :origin => "/login?referer=%2Fhistory", :referer => "/history")
assert_redirected_to auth_success_path(:provider => "windowslive")
follow_redirect!
assert_response :redirect
follow_redirect!
@ -680,7 +680,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest
assert_template "user/login"
get auth_path(:provider => "windowslive", :origin => "/login?referer=%2Fhistory", :referer => "/history")
assert_response :redirect
assert_redirected_to auth_success_path(:provider => "windowslive", :origin => "/login?referer=%2Fhistory", :referer => "/history")
assert_redirected_to auth_success_path(:provider => "windowslive")
follow_redirect!
assert_response :redirect
assert_redirected_to auth_failure_path(:strategy => "windowslive", :message => "connection_failed", :origin => "/login?referer=%2Fhistory")
@ -704,7 +704,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest
assert_template "user/login"
get auth_path(:provider => "windowslive", :origin => "/login?referer=%2Fhistory", :referer => "/history")
assert_response :redirect
assert_redirected_to auth_success_path(:provider => "windowslive", :origin => "/login?referer=%2Fhistory", :referer => "/history")
assert_redirected_to auth_success_path(:provider => "windowslive")
follow_redirect!
assert_response :redirect
assert_redirected_to auth_failure_path(:strategy => "windowslive", :message => "invalid_credentials", :origin => "/login?referer=%2Fhistory")
@ -728,7 +728,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest
assert_template "user/login"
get auth_path(:provider => "windowslive", :origin => "/login?referer=%2Fhistory", :referer => "/history")
assert_response :redirect
assert_redirected_to auth_success_path(:provider => "windowslive", :origin => "/login?referer=%2Fhistory", :referer => "/history")
assert_redirected_to auth_success_path(:provider => "windowslive")
follow_redirect!
assert_response :redirect
follow_redirect!