Permalink
Browse files

Merge branch 'master' into whitehall_support

  • Loading branch information...
2 parents 9b3d32a + b7b4766 commit 16c0cc8f5353447976669f8ebf1a96ad5d69c15f @jamiecobbett jamiecobbett committed Feb 25, 2013
Showing with 6 additions and 7 deletions.
  1. +2 −2 Gemfile
  2. +3 −4 Gemfile.lock
  3. +1 −1 app/helpers/artefacts_helper.rb
View
@@ -1,9 +1,9 @@
source 'http://rubygems.org'
-source 'https://gems.gemfury.com/vo6ZrmjBQu5szyywDszE/'
+source 'https://BnrJb6FZyzspBboNJzYZ@gem.fury.io/govuk/'
gem 'gds-warmup-controller', '0.1.0'
-gem 'plek', '1.1.0'
+gem 'plek', '1.3.1'
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'
View
@@ -30,7 +30,7 @@ PATH
GEM
remote: http://rubygems.org/
- remote: https://gems.gemfury.com/vo6ZrmjBQu5szyywDszE/
+ remote: https://BnrJb6FZyzspBboNJzYZ@gem.fury.io/govuk/
specs:
PriorityQueue (0.1.2)
actionmailer (3.2.11)
@@ -218,8 +218,7 @@ GEM
omniauth-oauth2 (1.1.1)
oauth2 (~> 0.8.0)
omniauth (~> 1.0)
- plek (1.1.0)
- builder
+ plek (1.3.1)
polyglot (0.3.3)
rack (1.4.3)
rack-accept (0.4.5)
@@ -345,7 +344,7 @@ DEPENDENCIES
mongoid_rails_migrations (= 1.0.0)
nokogiri
null_logger
- plek (= 1.1.0)
+ plek (= 1.3.1)
rails (= 3.2.11)
router-client (= 3.1.0)
rummageable (~> 0.3.0)
@@ -4,7 +4,7 @@ def need_url(artefact)
end
def published_url(artefact)
- ENV['GOVUK_WEBSITE_ROOT'] + "/#{artefact.slug}"
+ Plek.current.website_root + "/#{artefact.slug}"
end
def human_timestamp(timestamp)

0 comments on commit 16c0cc8

Please sign in to comment.