Skip to content
This repository has been archived by the owner on Oct 12, 2018. It is now read-only.

Commit

Permalink
Upgrade gds-sso for permissions support
Browse files Browse the repository at this point in the history
  • Loading branch information
jamiecobbett committed Jun 21, 2012
1 parent 6e2e819 commit 251d3fb
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 27 deletions.
4 changes: 2 additions & 2 deletions Gemfile
Expand Up @@ -35,13 +35,13 @@ gem "bson", "1.5.2"
if ENV['CONTENT_MODELS_DEV']
gem "govuk_content_models", :path => '../govuk_content_models'
else
gem "govuk_content_models", "~> 0.0.19"
gem "govuk_content_models", "~> 0.1.00"
end

if ENV['BUNDLE_DEV']
gem 'gds-sso', :path => '../gds-sso'
else
gem 'gds-sso', '~> 0.5'
gem 'gds-sso', '0.7.0'
end

group :assets do
Expand Down
47 changes: 22 additions & 25 deletions Gemfile.lock
Expand Up @@ -100,38 +100,36 @@ GEM
factory_girl (~> 2.4.0)
railties (>= 3.0.0)
fakeweb (1.3.0)
faraday (0.7.6)
addressable (~> 2.2)
faraday (0.8.1)
multipart-post (~> 1.1)
rack (~> 1.1)
ffi (1.0.11)
gds-api-adapters (0.0.49)
lrucache (~> 0.1.1)
null_logger
plek
gds-sso (0.5.4)
oa-core (~> 0.3.2)
oa-oauth (~> 0.3.2)
oauth2 (= 0.5.2)
rack (= 1.3.5)
gds-sso (0.7.0)
omniauth-gds (= 0.0.3)
rack-accept (~> 0.4.4)
rails (>= 3.0.0)
warden (= 1.0.6)
warden (~> 1.2)
gds-warmup-controller (0.0.2)
rails (>= 3.0.0)
gelf (1.3.2)
json
gherkin (2.7.3)
json (>= 1.4.6)
govuk_content_models (0.0.19)
govuk_content_models (0.1.0)
bson_ext
differ
gds-api-adapters
gds-sso (~> 0.5.0)
gds-sso (~> 0.7.0)
mongoid (~> 2.4.10)
omniauth-oauth2 (~> 1.0)
plek (~> 0.1.22)
state_machine
hashie (1.2.0)
hike (1.2.1)
httpauth (0.1)
i18n (0.6.0)
json (1.7.3)
launchy (2.0.5)
Expand Down Expand Up @@ -164,24 +162,23 @@ GEM
mongo (<= 1.6.2)
tzinfo (~> 0.3.22)
multi_json (1.0.4)
multi_xml (0.4.4)
multipart-post (1.1.5)
net-http-digest_auth (1.2)
net-http-persistent (1.9)
nokogiri (1.5.0)
null_logger (0.0.1)
oa-core (0.3.2)
oa-oauth (0.3.2)
faraday (~> 0.7.3)
multi_json (~> 1.0.0)
multi_xml (~> 0.4.0)
oa-core (= 0.3.2)
oauth (~> 0.4.0)
oauth2 (~> 0.5.0)
oauth (0.4.6)
oauth2 (0.5.2)
oauth2 (0.6.0)
faraday (~> 0.7)
httpauth (~> 0.1)
multi_json (~> 1.0)
omniauth (1.1.0)
hashie (~> 1.2)
rack
omniauth-gds (0.0.3)
omniauth-oauth2 (~> 1.0)
omniauth-oauth2 (1.0.2)
oauth2 (~> 0.6.0)
omniauth (~> 1.0)
plek (0.1.24)
builder
polyglot (0.3.3)
Expand Down Expand Up @@ -251,7 +248,7 @@ GEM
uglifier (1.2.2)
execjs (>= 0.3.0)
multi_json (>= 1.0.2)
warden (1.0.6)
warden (1.2.1)
rack (>= 1.0)
webrobots (0.0.12)
nokogiri (>= 1.4.4)
Expand Down Expand Up @@ -282,10 +279,10 @@ DEPENDENCIES
formtastic!
formtastic-bootstrap!
gds-api-adapters
gds-sso (~> 0.5)
gds-sso (= 0.7.0)
gds-warmup-controller
gelf
govuk_content_models (~> 0.0.19)
govuk_content_models (~> 0.1.00)
launchy
marples (~> 1.0)
minitest
Expand Down

0 comments on commit 251d3fb

Please sign in to comment.