Merge pull request #55 from alphagov/bump_plek

Bump plek to 1.1.0
alphagov · Feb 14, 2013 · 8c42415 · 8c42415
2 parents 0c76b37 + ae26393
commit 8c42415
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/Gemfile b/Gemfile
@@ -3,7 +3,7 @@ source 'https://gems.gemfury.com/vo6ZrmjBQu5szyywDszE/'
 
 gem 'gds-warmup-controller', '0.1.0'
 
-gem 'plek', '1.0.0'
+gem 'plek', '1.1.0'
 gem 'formtastic', git: 'https://github.com/justinfrench/formtastic.git', branch: '2.1-stable'
 gem 'formtastic-bootstrap', git: 'https://github.com/cgunther/formtastic-bootstrap.git', branch: 'bootstrap-2'
 gem 'ansi'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -216,7 +216,7 @@ GEM
     omniauth-oauth2 (1.1.1)
       oauth2 (~> 0.8.0)
       omniauth (~> 1.0)
-    plek (1.0.0)
+    plek (1.1.0)
       builder
     polyglot (0.3.3)
     rack (1.4.3)
@@ -343,7 +343,7 @@ DEPENDENCIES
   mongoid_rails_migrations (= 1.0.0)
   nokogiri
   null_logger
-  plek (= 1.0.0)
+  plek (= 1.1.0)
   rails (= 3.2.11)
   router-client (= 3.1.0)
   rummageable (~> 0.3.0)

diff --git a/Rakefile b/Rakefile
@@ -3,7 +3,6 @@
 # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
 
 ENV["COVERAGE"] = "true"
-ENV["GOVUK_APP_DOMAIN"] = ENV.fetch("GOVUK_APP_DOMAIN", "dev.gov.uk")
 ENV["GOVUK_WEBSITE_ROOT"] = ENV.fetch("GOVUK_WEBSITE_ROOT", "http://www.dev.gov.uk")
 require File.expand_path('../config/application', __FILE__)