Permalink
Browse files

Merge pull request #129 from alphagov/use-latest-gds-sso

UX fix for remote signout
  • Loading branch information...
2 parents d81da90 + b2bbb90 commit 4b7cdf4b0b05aaf3c5c04f7f918e2e099150dc7a @benilovj benilovj committed Jan 28, 2014
Showing with 17 additions and 15 deletions.
  1. +1 −1 Gemfile
  2. +16 −14 Gemfile.lock
View
@@ -13,7 +13,7 @@ gem 'mysql2', '0.3.14'
gem 'aws-ses', require: 'aws/ses'
gem "exception_notification", '3.0.1'
-gem 'gds-sso', '9.1.0'
+gem 'gds-sso', '9.2.0'
gem 'cancan', '1.6.9'
gem 'jquery-rails'
gem 'jquery-ui-rails', '2.0.2'
View
@@ -88,7 +88,7 @@ GEM
null_logger
plek
rest-client (~> 1.6.3)
- gds-sso (9.1.0)
+ gds-sso (9.2.0)
omniauth-gds (>= 3.0.0)
rack-accept (~> 0.4.4)
rails (>= 3.0.0)
@@ -101,7 +101,6 @@ GEM
hashie (2.0.3)
hike (1.2.3)
http_parser.rb (0.5.3)
- httpauth (0.2.0)
i18n (0.6.9)
inflection (1.0.0)
journey (1.0.4)
@@ -114,7 +113,7 @@ GEM
jquery-rails
railties (>= 3.1.0)
json (1.8.1)
- jwt (0.1.8)
+ jwt (0.1.11)
multi_json (>= 1.5)
kgio (2.7.4)
less (2.2.2)
@@ -142,24 +141,27 @@ GEM
metaclass (~> 0.0.1)
multi_json (1.8.2)
multi_test (0.0.2)
+ multi_xml (0.5.5)
multipart-post (1.2.0)
mysql2 (0.3.14)
nokogiri (1.5.5)
null_logger (0.0.1)
- oauth2 (0.8.1)
- faraday (~> 0.8)
- httpauth (~> 0.1)
- jwt (~> 0.1.4)
- multi_json (~> 1.0)
+ oauth2 (0.9.3)
+ faraday (>= 0.8, < 0.10)
+ jwt (~> 0.1.8)
+ multi_json (~> 1.3)
+ multi_xml (~> 0.5)
rack (~> 1.2)
- omniauth (1.1.4)
+ omniauth (1.2.1)
hashie (>= 1.2, < 3)
- rack
+ rack (~> 1.0)
omniauth-gds (3.0.0)
omniauth-oauth2 (~> 1.0)
- omniauth-oauth2 (1.1.1)
- oauth2 (~> 0.8.0)
- omniauth (~> 1.0)
+ omniauth-oauth2 (1.1.2)
+ faraday (>= 0.8, < 0.10)
+ multi_json (~> 1.3)
+ oauth2 (~> 0.9.3)
+ omniauth (~> 1.2)
plek (1.1.0)
builder
poltergeist (0.7.0)
@@ -296,7 +298,7 @@ DEPENDENCIES
exception_notification (= 3.0.1)
formtastic-bootstrap (= 2.1.1)
gds-api-adapters (= 8.3.0)
- gds-sso (= 9.1.0)
+ gds-sso (= 9.2.0)
gds_zendesk (= 1.0.1)
jquery-rails
jquery-tablesorter (= 1.8.1)

0 comments on commit 4b7cdf4

Please sign in to comment.