Skip to content

Commit

Permalink
Merge pull request #45 from alphagov/use_plek_1.1
Browse files Browse the repository at this point in the history
bumping plek to 1.1.0
  • Loading branch information
annashipman committed Jan 28, 2013
2 parents 9f9673d + 6c823da commit ab0d507
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Expand Up @@ -16,7 +16,7 @@ gem 'exception_notification', '~> 2.4.1', require: 'exception_notifier'
gem 'gds-sso', '3.0.0' gem 'gds-sso', '3.0.0'
gem 'jquery-rails' gem 'jquery-rails'
gem 'jquery-ui-rails', '2.0.2' gem 'jquery-ui-rails', '2.0.2'
gem 'plek', '1.0.0' gem 'plek', '1.1.0'
gem 'formtastic-bootstrap', '2.0.0' gem 'formtastic-bootstrap', '2.0.0'
gem 'validates_timeliness', '3.0.14' gem 'validates_timeliness', '3.0.14'
if ENV['GDS_ZENDESK_DEV'] if ENV['GDS_ZENDESK_DEV']
Expand Down
4 changes: 2 additions & 2 deletions Gemfile.lock
Expand Up @@ -145,7 +145,7 @@ GEM
omniauth-oauth2 (1.1.1) omniauth-oauth2 (1.1.1)
oauth2 (~> 0.8.0) oauth2 (~> 0.8.0)
omniauth (~> 1.0) omniauth (~> 1.0)
plek (1.0.0) plek (1.1.0)
builder builder
poltergeist (0.7.0) poltergeist (0.7.0)
capybara (~> 1.1) capybara (~> 1.1)
Expand Down Expand Up @@ -255,7 +255,7 @@ DEPENDENCIES
jquery-ui-rails (= 2.0.2) jquery-ui-rails (= 2.0.2)
less-rails-bootstrap (= 2.1.1) less-rails-bootstrap (= 2.1.1)
mocha (= 0.12.6) mocha (= 0.12.6)
plek (= 1.0.0) plek (= 1.1.0)
poltergeist (= 0.7.0) poltergeist (= 0.7.0)
rails (= 3.2.11) rails (= 3.2.11)
sass-rails (~> 3.2.3) sass-rails (~> 3.2.3)
Expand Down

0 comments on commit ab0d507

Please sign in to comment.