Permalink
Browse files

Merge branch 'master' of github.com:alphagov/calendars

  • Loading branch information...
JordanHatch committed Jan 16, 2012
2 parents 142b5c5 + 9b0900d commit 4ed4433b376b9c6e0d95890f1a41e352c8de0437
Showing with 5 additions and 1 deletion.
  1. +1 −0 Gemfile
  2. +3 −0 Gemfile.lock
  3. +1 −1 config/routes.rb
View
@@ -2,6 +2,7 @@ source 'http://rubygems.org'
source 'https://gems.gemfury.com/vo6ZrmjBQu5szyywDszE/'
gem 'rails', '3.1.3'
+gem 'gds-warmup-controller'
group :router do
gem 'router-client', '2.0.3', :require => 'router/client'
View
@@ -71,6 +71,8 @@ GEM
gds-api-adapters (0.0.32)
null_logger
plek
+ gds-warmup-controller (0.0.2)
+ rails (>= 3.0.0)
gelf (1.1.3)
json
graylog2_exceptions (1.3.0)
@@ -180,6 +182,7 @@ DEPENDENCIES
exception_notification
factory_girl_rails
gds-api-adapters (~> 0.0.32)
+ gds-warmup-controller
gelf
graylog2_exceptions
jquery-rails
View
@@ -1,5 +1,5 @@
Calendars::Application.routes.draw do
-
+ match '/warmup', controller: "GdsWarmupController::Warmup", action: :index
match '/:scope', :to => 'calendar#index', :as => :calendars
match '/:scope/:division-:year', :to => 'calendar#show', :as => :calendar, :constraints => { :year => /[0-9]{4}/ }

0 comments on commit 4ed4433

Please sign in to comment.