Skip to content

Commit

Permalink
upgrade to rails4
Browse files Browse the repository at this point in the history
  • Loading branch information
vast committed Sep 12, 2013
1 parent 14abab2 commit 911c619
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion api_taster.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Gem::Specification.new do |s|
s.files = `git ls-files`.split($\)
s.test_files = Dir["spec/**/*"]

s.add_dependency 'rails', '~> 3.2.0'
s.add_dependency 'rails', '~> 4.0.0'
s.add_dependency 'jquery-rails'
s.add_dependency 'sass-rails'
s.add_dependency 'bootstrap-sass', '~> 2.1'
Expand Down
5 changes: 2 additions & 3 deletions spec/dummy/config/environments/development.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@
# since you don't have to restart the web server when you make code changes.
config.cache_classes = false

# Log error messages when you accidentally call methods on nil.
config.whiny_nils = true

# Show full error reports and disable caching
config.consider_all_requests_local = true
config.action_controller.perform_caching = false
Expand All @@ -34,4 +31,6 @@

# Expands the lines which load the assets
config.assets.debug = true

config.eager_load = false
end
2 changes: 2 additions & 0 deletions spec/dummy/config/environments/production.rb
Original file line number Diff line number Diff line change
Expand Up @@ -64,4 +64,6 @@
# Log the query plan for queries taking more than this (works
# with SQLite, MySQL, and PostgreSQL)
# config.active_record.auto_explain_threshold_in_seconds = 0.5

config.eager_load = true
end
5 changes: 2 additions & 3 deletions spec/dummy/config/environments/test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,6 @@
config.serve_static_assets = true
config.static_cache_control = "public, max-age=3600"

# Log error messages when you accidentally call methods on nil
config.whiny_nils = true

# Show full error reports and disable caching
config.consider_all_requests_local = true
config.action_controller.perform_caching = false
Expand All @@ -34,4 +31,6 @@

# Print deprecation notices to the stderr
config.active_support.deprecation = :stderr

config.eager_load = false
end
2 changes: 1 addition & 1 deletion spec/mapper_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ module ApiTaster
before(:all) do
Rails.application.routes.draw do
resources :dummy_users do
member { map_method :patch, :update }
member { map_method :patch, [:update] }
end
end

Expand Down

0 comments on commit 911c619

Please sign in to comment.