Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix failing AS isolated tests | Joshua Peek | 2009-09-05 | 4 | -3/+14 |
| | |||||
* | Turn warnings on for AS isolated tests | Joshua Peek | 2009-09-05 | 1 | -1/+1 |
| | |||||
* | Fix a messed up merge commit | Michael Koziarski | 2009-09-04 | 1 | -4/+0 |
| | |||||
* | Clean tag attributes before passing through the escape_once logic. | Michael Koziarski | 2009-09-04 | 1 | -1/+1 |
| | | | | Addresses CVE-2009-3009 | ||||
* | Add verify and clean methods to ActiveSupport::Multibyte. | Michael Koziarski | 2009-09-04 | 4 | -18/+239 |
| | | | | | | | | | | | | When accepting character input from outside of your application you can't blindly trust that all strings are properly encoded. With these methods you can check incoming strings and clean them up if necessary. Signed-off-by: Michael Koziarski <michael@koziarski.com> Conflicts: activesupport/lib/active_support/multibyte.rb | ||||
* | Fix timing attack vulnerability in ActiveSupport::MessageVerifier. | Coda Hale | 2009-09-04 | 1 | -3/+16 |
| | | | | | | Use a constant-time comparison algorithm to compare the candidate HMAC with the calculated HMAC to prevent leaking information about the calculated HMAC. Signed-off-by: Michael Koziarski <michael@koziarski.com> | ||||
* | CookieStore should not be derived from Hash - reverting [#2268 state:resolved] | Jay Pignata | 2009-09-03 | 1 | -1/+1 |
| | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
* | Test for previous commit (we wrote it first, I swear) | Yehuda Katz + Carl Lerche | 2009-09-03 | 1 | -0/+18 |
| | |||||
* | Replace :formats => ["*/*"] with the default formats set | Yehuda Katz + Carl Lerche | 2009-09-03 | 1 | -0/+2 |
| | |||||
* | Refactor ActionController to use find_template and template_exists? | Yehuda Katz + Carl Lerche | 2009-09-03 | 5 | -10/+14 |
| | |||||
* | Don't raise exceptions for missing javascript_include_tag or ↵ | Sam Pohlenz | 2009-09-03 | 2 | -6/+64 |
| | | | | | | stylesheet_link_tag sources unless the :cache or :concat options are given. [#2738 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
* | Remove a useless method in the fixture template class | Yehuda Katz + Carl Lerche | 2009-09-03 | 1 | -4/+0 |
| | |||||
* | Refactor ActionView::Resolver | Yehuda Katz + Carl Lerche | 2009-09-03 | 8 | -134/+116 |
| | |||||
* | Extract finding the template in AC to it's own method | Yehuda Katz + Carl Lerche | 2009-09-03 | 1 | -3/+5 |
| | |||||
* | If session_options[:id] is requested when using CookieStore, unmarshal the ↵ | Jay Pignata | 2009-09-03 | 2 | -5/+16 |
| | | | | | | session to access it [#2268 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
* | Vendor the latest version of the bundler | Carl Lerche | 2009-09-03 | 30 | -811/+1389 |
| | |||||
* | Add ActiveModel's ./pkg and ./doc to .gitignore | Carl Lerche | 2009-09-03 | 1 | -0/+2 |
| | |||||
* | Revert "Assert primary key does not exist in habtm when the association is ↵ | Jeremy Kemper | 2009-09-02 | 5 | -15/+44 |
| | | | | | | | | | | defined, instead of doing that everytime a record is inserted." Test failures on PostgreSQL. [#3128 state:open] This reverts commit da636809daca9c338200811d3590e446f57c8e81. | ||||
* | Kill AMo observing wrap_with_notifications since ARes was only using it | Joshua Peek | 2009-09-02 | 2 | -18/+12 |
| | |||||
* | Don't try to log protected attribute removal if there's no logger defined ↵ | Jeffrey Hardy | 2009-09-02 | 1 | -1/+3 |
| | | | | | | [#3135 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
* | Remove ClassInheritableAttributes test case, already covered by ↵ | Jeffrey Hardy | 2009-09-02 | 1 | -32/+0 |
| | | | | | | ActiveSupport [#3114 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
* | Make Sam Ruby's test suite happy | Yehuda Katz | 2009-09-01 | 1 | -0/+4 |
| | |||||
* | Fix the */* with Net::HTTP bug [#3100 state:resolved] | Yehuda Katz + Carl Lerche | 2009-09-01 | 3 | -26/+16 |
| | |||||
* | Add required dependencies on activemodel | Carl Lerche | 2009-09-01 | 10 | -11/+23 |
| | |||||
* | Merge branch 'master' of git@github.com:rails/rails | Carl Lerche | 2009-09-01 | 161 | -6362/+992 |
|\ | |||||
| * | Assert primary key does not exist in habtm when the association is defined, ↵ | José Valim | 2009-09-01 | 5 | -45/+16 |
| | | | | | | | | | | | | | | | | instead of doing that everytime a record is inserted. [#3128 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | ActionPack test helpers need to activate rack gem | Joshua Peek | 2009-09-01 | 3 | -3/+11 |
| | | |||||
| * | Railties test helpers need to activate rack gem | Joshua Peek | 2009-09-01 | 3 | -1/+10 |
| | | |||||
| * | Rails::Info doesn't require version for unwanted frameworks | Geoff Buesing | 2009-09-01 | 1 | -2/+4 |
| | | | | | | | | | | | | [#3124 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | Activate rack-test gem before it's required. This shouldn't be necessary, ↵ | Bryan Helmkamp | 2009-08-31 | 1 | -0/+2 |
| | | | | | | | | but should fix the build for now | ||||
| * | rack-test 0.4.2 has rack 1.1.pre goodies, we'll use it instead | Joshua Peek | 2009-08-31 | 5 | -311/+13 |
| | | |||||
| * | Temp rack-test gem needs proper gem source | Joshua Peek | 2009-08-31 | 1 | -0/+1 |
| | | |||||
| * | Initializer middleware helper needs to require actioncontroller | Joshua Peek | 2009-08-31 | 1 | -0/+1 |
| | | |||||
| * | Add rake gemspec and gemspecs to the repo | Yehuda Katz | 2009-08-31 | 15 | -3/+293 |
| | | |||||
| * | License, version, and gemspec for ActiveModel. Ship it! | Joshua Peek | 2009-08-31 | 4 | -3/+74 |
| | | |||||
| * | To make CI happy, use my edge rack-test gem (just for now) | Joshua Peek | 2009-08-31 | 1 | -0/+2 |
| | | |||||
| * | Restore rack gem dependency | Joshua Peek | 2009-08-31 | 1 | -1/+2 |
| | | |||||
| * | Back off rack 1.1-pre and bundle in the new testing goodies | Joshua Peek | 2009-08-31 | 55 | -5422/+300 |
| | | |||||
| * | action_dispatch and action_view are just more autoloads, so its okay to ↵ | Joshua Peek | 2009-08-31 | 1 | -3/+2 |
| | | | | | | | | require them | ||||
| * | Switch over to rack-test gem | Joshua Peek | 2009-08-31 | 9 | -642/+4 |
| | | |||||
| * | SessionHash#update and SessionHash#delete are missing a call to load! [#3056 ↵ | Joshua Peek | 2009-08-31 | 1 | -0/+2 |
| | | | | | | | | state:resolved] | ||||
| * | added proc and symbol support to validates_numericality_of [#3049 ↵ | Kane | 2009-08-31 | 2 | -1/+38 |
| | | | | | | | | | | | | state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
| * | Merge commit 'jose/generators' | Yehuda Katz | 2009-08-31 | 3 | -3/+4 |
| |\ | |||||
| | * | Change div.attribute to div.field and add some _form to tests. | José Valim | 2009-08-30 | 3 | -3/+4 |
| | | | |||||
| * | | Duplicating the options hash in Date#advance to prevent modification of the ↵ | Jay Pignata | 2009-08-31 | 2 | -0/+7 |
| | | | | | | | | | | | | | | | | | | original [#1133 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
| * | | I added this feature so that a Map of changed fields could be retrieved | Josh Sharpe | 2009-08-31 | 3 | -2/+101 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | after a model had been saved. This is useful in the after_save callback when you need to know what fields changed. At present there is no way to do this other than have code in the before_save callback that takes a copy of the changes Map, which I thought was a bit messy. Example. person = Person.find_by_name('bob') person.name = 'robert' person.changes # => {'name' => ['bob, 'robert']} person.save person.changes # => {} person.previous_changes # => {'name' => ['bob, 'robert']} person.reload person.previous_changes # => {} Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
| * | | Changing plugin loader to use blocks instead of Symbol#to_proc to ensure ↵ | Jay Pignata | 2009-08-30 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | tests run without activesupport [#3118 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | | I18n support for plugins | Antonio Tapiador del Dujo | 2009-08-30 | 6 | -0/+32 |
| |/ | | | | | | | | | | | | | | | | | | | Rails will now automatically add locale files found in any engine's locale directory to the I18n.load_path (i.e. files that match the glob pattern "config/locales/**/*.{rb,yml}" relative to engine directories). [#2325 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | Ensure scaffold works properly even if plural name is given. [#3062] | José Valim | 2009-08-30 | 8 | -81/+137 |
| | | |||||
| * | Remove inline css. [#593 status:resolved] | José Valim | 2009-08-30 | 2 | -1/+5 |
| | |