Skip to content

Commit

Permalink
Merge pull request rails#5 from lest/patch-2
Browse files Browse the repository at this point in the history
remove rails development dependency and dummy app from test suite; change version requirements
  • Loading branch information
josevalim committed Mar 20, 2012
2 parents 7d5ccae + 76e0628 commit a66521e
Show file tree
Hide file tree
Showing 37 changed files with 28 additions and 813 deletions.
51 changes: 3 additions & 48 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,12 @@ PATH
remote: .
specs:
strong_parameters (0.1.0)
actionpack (~> 3.2.0)
activemodel (~> 3.2.0)
actionpack (>= 3.2.0)
activemodel (>= 3.2.0)

GEM
remote: http://rubygems.org/
specs:
actionmailer (3.2.2)
actionpack (= 3.2.2)
mail (~> 2.4.0)
actionpack (3.2.2)
activemodel (= 3.2.2)
activesupport (= 3.2.2)
Expand All @@ -24,72 +21,30 @@ GEM
activemodel (3.2.2)
activesupport (= 3.2.2)
builder (~> 3.0.0)
activerecord (3.2.2)
activemodel (= 3.2.2)
activesupport (= 3.2.2)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
activeresource (3.2.2)
activemodel (= 3.2.2)
activesupport (= 3.2.2)
activesupport (3.2.2)
i18n (~> 0.6)
multi_json (~> 1.0)
arel (3.0.2)
builder (3.0.0)
erubis (2.7.0)
hike (1.2.1)
i18n (0.6.0)
journey (1.0.3)
json (1.6.5)
mail (2.4.4)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
mime-types (1.17.2)
multi_json (1.1.0)
polyglot (0.3.3)
rack (1.4.1)
rack-cache (1.2)
rack (>= 0.4)
rack-ssl (1.3.2)
rack
rack-test (0.6.1)
rack (>= 1.0)
rails (3.2.2)
actionmailer (= 3.2.2)
actionpack (= 3.2.2)
activerecord (= 3.2.2)
activeresource (= 3.2.2)
activesupport (= 3.2.2)
bundler (~> 1.0)
railties (= 3.2.2)
railties (3.2.2)
actionpack (= 3.2.2)
activesupport (= 3.2.2)
rack-ssl (~> 1.3.2)
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (~> 0.14.6)
rake (0.9.2.2)
rdoc (3.12)
json (~> 1.4)
sprockets (2.1.2)
hike (~> 1.2)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
sqlite3 (1.3.5)
thor (0.14.6)
tilt (1.3.3)
treetop (1.4.10)
polyglot
polyglot (>= 0.3.1)
tzinfo (0.3.32)

PLATFORMS
ruby

DEPENDENCIES
rails (~> 3.2.0)
sqlite3
rake
strong_parameters!
2 changes: 2 additions & 0 deletions lib/action_controller/parameters.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
require 'active_support/concern'
require 'active_support/core_ext/hash/indifferent_access'
require 'action_controller'

module ActionController
class ParameterMissing < IndexError
Expand Down
7 changes: 3 additions & 4 deletions strong_parameters.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,8 @@ Gem::Specification.new do |s|
s.files = Dir["{app,config,db,lib}/**/*"] + ["MIT-LICENSE", "Rakefile", "README.rdoc"]
s.test_files = Dir["test/**/*"]

s.add_dependency "actionpack", "~> 3.2.0"
s.add_dependency "activemodel", "~> 3.2.0"
s.add_dependency "actionpack", ">= 3.2.0"
s.add_dependency "activemodel", ">= 3.2.0"

s.add_development_dependency "rails", "~> 3.2.0"
s.add_development_dependency "sqlite3"
s.add_development_dependency "rake"
end
261 changes: 0 additions & 261 deletions test/dummy/README.rdoc

This file was deleted.

7 changes: 0 additions & 7 deletions test/dummy/Rakefile

This file was deleted.

15 changes: 0 additions & 15 deletions test/dummy/app/assets/javascripts/application.js

This file was deleted.

Loading

0 comments on commit a66521e

Please sign in to comment.