Update bundle
This commit is contained in:
Tom Hughes
parent
68a6fce1f9
commit
95eda2d381
4 changed files with 54 additions and 51 deletions
2
Gemfile
2
Gemfile
|
|
@ -46,7 +46,7 @@ gem "composite_primary_keys", "~> 8.1.0"
|
|||
gem "deadlock_retry", ">= 1.2.0"
|
||||
gem "dynamic_form"
|
||||
gem "http_accept_language", "~> 2.0.0"
|
||||
gem "i18n-js", ">= 3.0.0.rc10"
|
||||
gem "i18n-js", ">= 3.0.0"
|
||||
gem "oauth-plugin", ">= 0.5.1"
|
||||
gem "paperclip", "~> 4.0"
|
||||
gem "rack-cors"
|
||||
|
|
|
|||
89
Gemfile.lock
89
Gemfile.lock
|
|
@ -38,24 +38,24 @@ GEM
|
|||
minitest (~> 5.1)
|
||||
thread_safe (~> 0.3, >= 0.3.4)
|
||||
tzinfo (~> 1.1)
|
||||
addressable (2.5.0)
|
||||
addressable (2.5.1)
|
||||
public_suffix (~> 2.0, >= 2.0.2)
|
||||
arel (6.0.4)
|
||||
ast (2.3.0)
|
||||
autoprefixer-rails (6.7.7.1)
|
||||
autoprefixer-rails (7.1.1)
|
||||
execjs
|
||||
bigdecimal (1.1.0)
|
||||
builder (3.2.3)
|
||||
canonical-rails (0.1.2)
|
||||
rails (>= 4.1, < 5.1)
|
||||
capybara (2.13.0)
|
||||
canonical-rails (0.2.0)
|
||||
rails (>= 4.1, < 5.2)
|
||||
capybara (2.14.0)
|
||||
addressable
|
||||
mime-types (>= 1.16)
|
||||
nokogiri (>= 1.3.3)
|
||||
rack (>= 1.0.0)
|
||||
rack-test (>= 0.5.4)
|
||||
xpath (~> 2.0)
|
||||
climate_control (0.1.0)
|
||||
climate_control (0.2.0)
|
||||
cliver (0.3.2)
|
||||
cocaine (0.5.8)
|
||||
climate_control (>= 0.0.3, < 1.0)
|
||||
|
|
@ -67,14 +67,14 @@ GEM
|
|||
execjs
|
||||
coffee-script-source (1.12.2)
|
||||
colorize (0.8.1)
|
||||
composite_primary_keys (8.1.4)
|
||||
composite_primary_keys (8.1.6)
|
||||
activerecord (~> 4.2.0)
|
||||
concurrent-ruby (1.0.5)
|
||||
coveralls (0.8.19)
|
||||
coveralls (0.8.21)
|
||||
json (>= 1.8, < 3)
|
||||
simplecov (~> 0.12.0)
|
||||
simplecov (~> 0.14.1)
|
||||
term-ansicolor (~> 1.3)
|
||||
thor (~> 0.19.1)
|
||||
thor (~> 0.19.4)
|
||||
tins (~> 1.6)
|
||||
crack (0.4.3)
|
||||
safe_yaml (~> 1.0.0)
|
||||
|
|
@ -95,22 +95,22 @@ GEM
|
|||
multipart-post (>= 1.2, < 3)
|
||||
fspath (3.1.0)
|
||||
geoip (1.6.3)
|
||||
globalid (0.3.7)
|
||||
activesupport (>= 4.1.0)
|
||||
hashdiff (0.3.2)
|
||||
globalid (0.4.0)
|
||||
activesupport (>= 4.2.0)
|
||||
hashdiff (0.3.4)
|
||||
hashie (3.5.5)
|
||||
htmlentities (4.3.4)
|
||||
http_accept_language (2.0.5)
|
||||
i18n (0.8.1)
|
||||
i18n-js (3.0.0.rc16)
|
||||
i18n (0.8.4)
|
||||
i18n-js (3.0.0)
|
||||
i18n (~> 0.6, >= 0.6.6)
|
||||
image_optim (0.24.2)
|
||||
image_optim (0.24.3)
|
||||
exifr (~> 1.2, >= 1.2.2)
|
||||
fspath (~> 3.0)
|
||||
image_size (~> 1.5)
|
||||
in_threads (~> 1.3)
|
||||
progress (~> 3.0, >= 3.0.1)
|
||||
image_optim_rails (0.3.0)
|
||||
image_optim_rails (0.4.0)
|
||||
image_optim (~> 0.24.0)
|
||||
rails
|
||||
sprockets
|
||||
|
|
@ -124,7 +124,7 @@ GEM
|
|||
execjs (>= 1.4.0)
|
||||
multi_json (~> 1.0)
|
||||
therubyracer (~> 0.12.1)
|
||||
json (2.0.3)
|
||||
json (2.1.0)
|
||||
jsonify (0.3.1)
|
||||
multi_json (~> 1.0)
|
||||
jsonify-rails (0.3.2)
|
||||
|
|
@ -149,20 +149,20 @@ GEM
|
|||
request_store
|
||||
loofah (2.0.3)
|
||||
nokogiri (>= 1.5.9)
|
||||
mail (2.6.4)
|
||||
mail (2.6.5)
|
||||
mime-types (>= 1.16, < 4)
|
||||
mime-types (3.1)
|
||||
mime-types-data (~> 3.2015)
|
||||
mime-types-data (3.2016.0521)
|
||||
mimemagic (0.3.0)
|
||||
mini_portile2 (2.1.0)
|
||||
minitest (5.10.1)
|
||||
minitest (5.10.2)
|
||||
multi_json (1.12.1)
|
||||
multi_xml (0.6.0)
|
||||
multipart-post (2.0.0)
|
||||
nokogiri (1.7.1)
|
||||
nokogiri (1.7.2)
|
||||
mini_portile2 (~> 2.1.0)
|
||||
nokogumbo (1.4.9)
|
||||
nokogumbo (1.4.12)
|
||||
nokogiri
|
||||
oauth (0.4.7)
|
||||
oauth-plugin (0.5.1)
|
||||
|
|
@ -170,8 +170,8 @@ GEM
|
|||
oauth (~> 0.4.4)
|
||||
oauth2 (>= 0.5.0)
|
||||
rack
|
||||
oauth2 (1.3.0)
|
||||
faraday (>= 0.8, < 0.11)
|
||||
oauth2 (1.3.1)
|
||||
faraday (>= 0.8, < 0.12)
|
||||
jwt (~> 1.0)
|
||||
multi_json (~> 1.3)
|
||||
multi_xml (~> 0.5)
|
||||
|
|
@ -181,11 +181,11 @@ GEM
|
|||
rack (>= 1.6.2, < 3)
|
||||
omniauth-facebook (4.0.0)
|
||||
omniauth-oauth2 (~> 1.2)
|
||||
omniauth-github (1.2.3)
|
||||
omniauth-github (1.3.0)
|
||||
omniauth (~> 1.5)
|
||||
omniauth-oauth2 (>= 1.4.0, < 2.0)
|
||||
omniauth-google-oauth2 (0.4.1)
|
||||
jwt (~> 1.5.2)
|
||||
omniauth-google-oauth2 (0.5.0)
|
||||
jwt (~> 1.5)
|
||||
multi_json (~> 1.3)
|
||||
omniauth (>= 1.1.1)
|
||||
omniauth-oauth2 (>= 1.3.1)
|
||||
|
|
@ -210,10 +210,11 @@ GEM
|
|||
cocaine (~> 0.5.5)
|
||||
mime-types
|
||||
mimemagic (= 0.3.0)
|
||||
parallel (1.11.2)
|
||||
parser (2.4.0.0)
|
||||
ast (~> 2.2)
|
||||
pg (0.20.0)
|
||||
poltergeist (1.14.0)
|
||||
poltergeist (1.15.0)
|
||||
capybara (~> 2.1)
|
||||
cliver (~> 0.3.1)
|
||||
websocket-driver (>= 0.2.0)
|
||||
|
|
@ -222,7 +223,7 @@ GEM
|
|||
psych (2.2.4)
|
||||
public_suffix (2.0.5)
|
||||
r2 (0.2.6)
|
||||
rack (1.6.5)
|
||||
rack (1.6.8)
|
||||
rack-cors (0.4.1)
|
||||
rack-openid (1.3.1)
|
||||
rack (>= 1.1.0)
|
||||
|
|
@ -257,14 +258,16 @@ GEM
|
|||
activesupport (= 4.2.8)
|
||||
rake (>= 0.8.7)
|
||||
thor (>= 0.18.1, < 2.0)
|
||||
rainbow (2.2.1)
|
||||
rainbow (2.2.2)
|
||||
rake
|
||||
rake (12.0.0)
|
||||
redcarpet (3.4.0)
|
||||
ref (2.0.0)
|
||||
request_store (1.3.2)
|
||||
rinku (2.0.2)
|
||||
rotp (3.3.0)
|
||||
rubocop (0.47.1)
|
||||
rubocop (0.49.1)
|
||||
parallel (~> 1.10)
|
||||
parser (>= 2.3.3.1, < 3.0)
|
||||
powerpack (~> 0.1)
|
||||
rainbow (>= 1.99.1, < 3.0)
|
||||
|
|
@ -277,20 +280,20 @@ GEM
|
|||
crass (~> 1.0.2)
|
||||
nokogiri (>= 1.4.4)
|
||||
nokogumbo (~> 1.4.1)
|
||||
sass (3.4.23)
|
||||
sass (3.4.24)
|
||||
sass-rails (5.0.6)
|
||||
railties (>= 4.0.0, < 6)
|
||||
sass (~> 3.1)
|
||||
sprockets (>= 2.8, < 4.0)
|
||||
sprockets-rails (>= 2.0, < 4.0)
|
||||
tilt (>= 1.1, < 3)
|
||||
secure_headers (3.6.2)
|
||||
secure_headers (3.6.4)
|
||||
useragent
|
||||
simplecov (0.12.0)
|
||||
simplecov (0.14.1)
|
||||
docile (~> 1.1.0)
|
||||
json (>= 1.8, < 3)
|
||||
simplecov-html (~> 0.10.0)
|
||||
simplecov-html (0.10.0)
|
||||
simplecov-html (0.10.1)
|
||||
sprockets (3.7.1)
|
||||
concurrent-ruby (~> 1.0)
|
||||
rack (> 1, < 3)
|
||||
|
|
@ -298,7 +301,7 @@ GEM
|
|||
actionpack (>= 4.0)
|
||||
activesupport (>= 4.0)
|
||||
sprockets (>= 3.0.0)
|
||||
term-ansicolor (1.4.0)
|
||||
term-ansicolor (1.6.0)
|
||||
tins (~> 1.0)
|
||||
therubyracer (0.12.3)
|
||||
libv8 (~> 3.16.14.15)
|
||||
|
|
@ -307,24 +310,24 @@ GEM
|
|||
thread_safe (0.3.6)
|
||||
tilt (2.0.7)
|
||||
timecop (0.8.1)
|
||||
tins (1.13.2)
|
||||
tzinfo (1.2.2)
|
||||
tins (1.14.0)
|
||||
tzinfo (1.2.3)
|
||||
thread_safe (~> 0.1)
|
||||
uglifier (3.1.9)
|
||||
uglifier (3.2.0)
|
||||
execjs (>= 0.3.0, < 3)
|
||||
unicode-display_width (1.1.3)
|
||||
unicode-display_width (1.2.1)
|
||||
useragent (0.16.8)
|
||||
validates_email_format_of (1.6.3)
|
||||
i18n
|
||||
vendorer (0.1.16)
|
||||
webmock (2.3.2)
|
||||
webmock (3.0.1)
|
||||
addressable (>= 2.3.6)
|
||||
crack (>= 0.3.2)
|
||||
hashdiff
|
||||
websocket-driver (0.6.5)
|
||||
websocket-extensions (>= 0.1.0)
|
||||
websocket-extensions (0.1.2)
|
||||
xpath (2.0.0)
|
||||
xpath (2.1.0)
|
||||
nokogiri (~> 1.3)
|
||||
|
||||
PLATFORMS
|
||||
|
|
@ -347,7 +350,7 @@ DEPENDENCIES
|
|||
geoip
|
||||
htmlentities
|
||||
http_accept_language (~> 2.0.0)
|
||||
i18n-js (>= 3.0.0.rc10)
|
||||
i18n-js (>= 3.0.0)
|
||||
image_optim_rails
|
||||
jquery-rails
|
||||
jshint
|
||||
|
|
|
|||
|
|
@ -626,7 +626,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest
|
|||
assert_redirected_to auth_path(:provider => "github", :origin => "/user/new")
|
||||
follow_redirect!
|
||||
assert_response :redirect
|
||||
assert_redirected_to auth_success_path(:provider => "github", :origin => "/user/new")
|
||||
assert_redirected_to auth_success_path(:provider => "github")
|
||||
follow_redirect!
|
||||
assert_response :redirect
|
||||
assert_redirected_to "/user/terms"
|
||||
|
|
@ -657,7 +657,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest
|
|||
assert_redirected_to auth_path(:provider => "github", :origin => "/user/new")
|
||||
follow_redirect!
|
||||
assert_response :redirect
|
||||
assert_redirected_to auth_success_path(:provider => "github", :origin => "/user/new")
|
||||
assert_redirected_to auth_success_path(:provider => "github")
|
||||
follow_redirect!
|
||||
assert_response :redirect
|
||||
assert_redirected_to auth_failure_path(:strategy => "github", :message => "connection_failed", :origin => "/user/new")
|
||||
|
|
@ -687,7 +687,7 @@ class UserCreationTest < ActionDispatch::IntegrationTest
|
|||
assert_redirected_to auth_path(:provider => "github", :origin => "/user/new")
|
||||
follow_redirect!
|
||||
assert_response :redirect
|
||||
assert_redirected_to auth_success_path(:provider => "github", :origin => "/user/new")
|
||||
assert_redirected_to auth_success_path(:provider => "github")
|
||||
follow_redirect!
|
||||
assert_response :redirect
|
||||
assert_redirected_to "/user/terms"
|
||||
|
|
|
|||
|
|
@ -775,7 +775,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest
|
|||
assert_template "user/login"
|
||||
get auth_path(:provider => "github", :origin => "/login?referer=%2Fhistory", :referer => "/history")
|
||||
assert_response :redirect
|
||||
assert_redirected_to auth_success_path(:provider => "github", :origin => "/login?referer=%2Fhistory", :referer => "/history")
|
||||
assert_redirected_to auth_success_path(:provider => "github")
|
||||
follow_redirect!
|
||||
assert_response :redirect
|
||||
follow_redirect!
|
||||
|
|
@ -795,7 +795,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest
|
|||
assert_template "user/login"
|
||||
get auth_path(:provider => "github", :origin => "/login?referer=%2Fhistory", :referer => "/history")
|
||||
assert_response :redirect
|
||||
assert_redirected_to auth_success_path(:provider => "github", :origin => "/login?referer=%2Fhistory", :referer => "/history")
|
||||
assert_redirected_to auth_success_path(:provider => "github")
|
||||
follow_redirect!
|
||||
assert_response :redirect
|
||||
assert_redirected_to auth_failure_path(:strategy => "github", :message => "connection_failed", :origin => "/login?referer=%2Fhistory")
|
||||
|
|
@ -819,7 +819,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest
|
|||
assert_template "user/login"
|
||||
get auth_path(:provider => "github", :origin => "/login?referer=%2Fhistory", :referer => "/history")
|
||||
assert_response :redirect
|
||||
assert_redirected_to auth_success_path(:provider => "github", :origin => "/login?referer=%2Fhistory", :referer => "/history")
|
||||
assert_redirected_to auth_success_path(:provider => "github")
|
||||
follow_redirect!
|
||||
assert_response :redirect
|
||||
assert_redirected_to auth_failure_path(:strategy => "github", :message => "invalid_credentials", :origin => "/login?referer=%2Fhistory")
|
||||
|
|
@ -843,7 +843,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest
|
|||
assert_template "user/login"
|
||||
get auth_path(:provider => "github", :origin => "/login?referer=%2Fhistory", :referer => "/history")
|
||||
assert_response :redirect
|
||||
assert_redirected_to auth_success_path(:provider => "github", :origin => "/login?referer=%2Fhistory", :referer => "/history")
|
||||
assert_redirected_to auth_success_path(:provider => "github")
|
||||
follow_redirect!
|
||||
assert_response :redirect
|
||||
follow_redirect!
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue