From 7b73f3f82b3fc747d2a5e7dd9972fd3d734264e0 Mon Sep 17 00:00:00 2001 From: paresharma Date: Wed, 21 Jan 2015 10:10:33 +0100 Subject: [PATCH 1/2] updated routes for Rails 4.2 support --- lib/themes_for_rails/routes.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/themes_for_rails/routes.rb b/lib/themes_for_rails/routes.rb index d52301b..3db555f 100644 --- a/lib/themes_for_rails/routes.rb +++ b/lib/themes_for_rails/routes.rb @@ -6,11 +6,11 @@ def themes_for_rails theme_dir = ThemesForRails.config.themes_routes_dir constraints = { :theme => /[\w\.]*/ } - match "#{theme_dir}/:theme/stylesheets/*asset" => 'themes_for_rails/assets#stylesheets', + get "#{theme_dir}/:theme/stylesheets/*asset" => 'themes_for_rails/assets#stylesheets', :as => :base_theme_stylesheet, :constraints => constraints - match "#{theme_dir}/:theme/javascripts/*asset" => 'themes_for_rails/assets#javascripts', + get "#{theme_dir}/:theme/javascripts/*asset" => 'themes_for_rails/assets#javascripts', :as => :base_theme_javascript, :constraints => constraints - match "#{theme_dir}/:theme/images/*asset" => 'themes_for_rails/assets#images', + get "#{theme_dir}/:theme/images/*asset" => 'themes_for_rails/assets#images', :as => :base_theme_image, :constraints => constraints end From ebe5c707ba3557567fc8a8d39c0d5afcec2a9f79 Mon Sep 17 00:00:00 2001 From: Ryan Mitchell Date: Mon, 22 Jun 2015 20:15:08 -0400 Subject: [PATCH 2/2] Remove duplicate dependency on Rails to prevent RubyGems error. See https://github.com/rubygems/rubygems/blob/master/lib/rubygems/specification.rb#L2795 --- themes_for_rails.gemspec | 1 - 1 file changed, 1 deletion(-) diff --git a/themes_for_rails.gemspec b/themes_for_rails.gemspec index d1d21c0..1649f86 100644 --- a/themes_for_rails.gemspec +++ b/themes_for_rails.gemspec @@ -21,5 +21,4 @@ Gem::Specification.new do |gem| gem.add_development_dependency "test-unit" gem.add_development_dependency "contest" gem.add_development_dependency "mocha" - gem.add_development_dependency('rails', ["= 3.0.11"]) end