diff options
Diffstat (limited to 'config')
| -rw-r--r-- | config/environment.rb | 4 | ||||
| -rw-r--r-- | config/general.yml-example | 1 | ||||
| -rw-r--r-- | config/memcached.yml-test | 2 | ||||
| -rw-r--r-- | config/routes.rb | 1 |
4 files changed, 3 insertions, 5 deletions
diff --git a/config/environment.rb b/config/environment.rb index 2b51ecb6d..268a44e65 100644 --- a/config/environment.rb +++ b/config/environment.rb @@ -18,7 +18,7 @@ end # ENV['RAILS_ENV'] ||= 'production' # Specifies gem version of Rails to use when vendor/rails is not present -RAILS_GEM_VERSION = '2.3.16' unless defined? RAILS_GEM_VERSION +RAILS_GEM_VERSION = '2.3.17' unless defined? RAILS_GEM_VERSION # Bootstrap the Rails environment, frameworks, and default configuration require File.join(File.dirname(__FILE__), 'boot') @@ -43,7 +43,7 @@ require File.join(File.dirname(__FILE__), '../lib/old_rubygems_patch') require 'configuration' # Application version -ALAVETELI_VERSION = '0.6.9' +ALAVETELI_VERSION = '0.7' Rails::Initializer.run do |config| # Load intial mySociety config diff --git a/config/general.yml-example b/config/general.yml-example index c92c54f91..6bf54f400 100644 --- a/config/general.yml-example +++ b/config/general.yml-example @@ -53,7 +53,6 @@ FRONTPAGE_PUBLICBODY_EXAMPLES: 'tgq' # script). Earlier in the list means the templates have a higher # priority. THEME_URLS: - - 'git://github.com/mysociety/adminbootstraptheme.git' - 'git://github.com/mysociety/alavetelitheme.git' # When rails-post-deploy installs the themes it will try this branch first diff --git a/config/memcached.yml-test b/config/memcached.yml-test deleted file mode 100644 index 18d959876..000000000 --- a/config/memcached.yml-test +++ /dev/null @@ -1,2 +0,0 @@ -test: - disabled: true
\ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index c55cf5cfa..e95405c1e 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -185,6 +185,7 @@ ActionController::Routing::Routes.draw do |map| admin.admin_timeline '/admin/timeline', :action => 'timeline' admin.admin_debug '/admin/debug', :action => 'debug' admin.admin_stats '/admin/stats', :action => 'stats' + admin.admin_js '/admin/javascripts/admin.js', :action => 'admin_js' end map.with_options :controller => 'admin_request' do |admin| |