Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | Merge pull request #13844 from Alamoz/config_grammar | Godfrey Chan | 2014-01-25 | 2 | -2/+2 | |
|\ \ \ \ | | | | | | | | | | | thread -> threaded [ci skip] | |||||
| * | | | | Correct grammar from '... allowing both thread web servers ...' to '... ↵ | Adrien Lamothe | 2014-01-25 | 2 | -2/+2 | |
|/ / / / | | | | | | | | | | | | | allowing both threaded web servers ...'. | |||||
* | | | | Merge pull request #13841 from robin850/patch-15 | Guillermo Iguaran | 2014-01-25 | 1 | -0/+6 | |
|\ \ \ \ | |/ / / |/| | | | Add a missing changelog entry for #13825 [ci skip] | |||||
| * | | | Add a missing changelog entry for #13825 [ci skip] | Robin Dupret | 2014-01-25 | 1 | -0/+6 | |
|/ / / | ||||||
* | | | Add additional tests for #13824 | Andrew White | 2014-01-25 | 1 | -0/+26 | |
| | | | ||||||
* | | | Transform dashes to underscores in resource route names | Byron Bischoff | 2014-01-25 | 2 | -7/+17 | |
| | | | | | | | | | | | | Fixes #13824 | |||||
* | | | Merge pull request #13772 from chancancode/fix_has_secure_password_for_good | Godfrey Chan | 2014-01-24 | 4 | -81/+132 | |
|\ \ \ | | | | | | | | | Refactored validations rules for has_secure_password | |||||
| * | | | Some minor fixes | Godfrey Chan | 2014-01-24 | 2 | -3/+2 | |
| | | | | ||||||
| * | | | Removed old tests | Godfrey Chan | 2014-01-24 | 3 | -250/+121 | |
| | | | | ||||||
| * | | | Got all the new tests passing | Godfrey Chan | 2014-01-24 | 1 | -10/+8 | |
| | | | | ||||||
| * | | | Restored the ability to clear the password with user.password= nil (see the ↵ | Godfrey Chan | 2014-01-24 | 1 | -1/+3 | |
| | | | | | | | | | | | | | | | | docs) | |||||
| * | | | Rewrote the tests for has_secure_password | Godfrey Chan | 2014-01-24 | 3 | -2/+183 | |
| | | | | ||||||
* | | | | Merge pull request #13835 from frodsan/remove_unused_argument | Guillermo Iguaran | 2014-01-24 | 1 | -1/+1 | |
|\ \ \ \ | |/ / / |/| | | | Remove unused argument. | |||||
| * | | | Remove unused argument. | Francesco Rodriguez | 2014-01-24 | 1 | -1/+1 | |
|/ / / | ||||||
* | | | Merge pull request #13785 from kuldeepaggarwal/fix-find_with_multiple_ids | Yves Senn | 2014-01-24 | 2 | -9/+26 | |
|\ \ \ | | | | | | | | | Fix `ActiveRecord::RecordNotFound` error message with custom primary key | |||||
| * | | | Fix `ActiveRecord::RecordNotFound` error message with custom primary key | Kuldeep Aggarwal | 2014-01-25 | 2 | -9/+26 | |
| | | | | ||||||
* | | | | Merge pull request #13829 from qsymmachus/improve_validates_with_example | Rafael Mendonça França | 2014-01-24 | 1 | -8/+8 | |
|\ \ \ \ | | | | | | | | | | | Reordered classes in AR Validation #validates_with example [ci skip] | |||||
| * | | | | Reordered classes in AR Validation #validates_with example [ci skip] | John Olmsted & Strand McCutchen | 2014-01-24 | 1 | -8/+8 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | Person called GoodnessValidator before it was defined. This change will compile the example correctly. | |||||
* | | | | | Add a test-case for GH #13825 | Guillermo Iguaran | 2014-01-24 | 1 | -2/+8 | |
|/ / / / | ||||||
* | | | | Merge pull request #13828 from bronzle/apploader-should-check-for-file | Guillermo Iguaran | 2014-01-24 | 1 | -1/+1 | |
|\ \ \ \ | | | | | | | | | | | app_rails_loader.rb should check if bin/rails is a File before calling F... | |||||
| * | | | | app_rails_loader.rb should check if bin/rails is a File before calling ↵ | Byron Bischoff | 2014-01-24 | 1 | -1/+1 | |
|/ / / / | | | | | | | | | | | | | File.read(exe); closes #13825 | |||||
* | | | | Merge pull request #13811 from mdesantis/issue-13810 | Yves Senn | 2014-01-24 | 3 | -3/+30 | |
|\ \ \ \ | | | | | | | | | | | Fixes #13810 `rake routes` error when mount `Rails::Engine` with empty routes | |||||
| * | | | | Fix `rake routes` error when `Rails::Engine` with empty routes is mounted; ↵ | Maurizio De Santis | 2014-01-24 | 3 | -3/+30 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixes rails/rails#13810 Squash | |||||
* | | | | | Merge pull request #13821 from vipulnsward/remove-assignment-in-test | Yves Senn | 2014-01-23 | 1 | -1/+0 | |
|\ \ \ \ \ | | | | | | | | | | | | | Remove unused assignment to fix warnings in enum test. | |||||
| * | | | | | Remove unused assignment to fix warnings in enum test. | Vipul A M | 2014-01-24 | 1 | -1/+0 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #13819 from arthurnn/one_require_test | Guillermo Iguaran | 2014-01-23 | 2 | -10/+8 | |
|\ \ \ \ \ | | | | | | | | | | | | | unify param.require tests | |||||
| * | | | | | unify param.require tests | Arthur Neves | 2014-01-23 | 2 | -10/+8 | |
| | | | | | | ||||||
* | | | | | | Merge pull request #13818 from arthurnn/small_test_case | Guillermo Iguaran | 2014-01-23 | 1 | -0/+7 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | test boolean and number json param parsing | |||||
| * | | | | | test boolean and number json param parsing | Arthur Neves | 2014-01-23 | 1 | -0/+7 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #13795 from bobbus/errors-has-key | Godfrey Chan | 2014-01-23 | 2 | -2/+7 | |
|\ \ \ \ \ | |/ / / / |/| | | | | Fix ActiveModel::Errors#has_key? returning nil | |||||
| * | | | | Update ActiveModel::Errors.has_key? test | Adrien Coquio | 2014-01-22 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | Fix ActiveModel::Errors#has_key? return value | Adrien Coquio | 2014-01-22 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | Add failing test for ActiveModel::Errors#has_key? method | Adrien Coquio | 2014-01-22 | 1 | -0/+5 | |
| | | | | | | | | | | | | | | | | | | | | From the doc, this method should return false and not nil if there is no errors for this key | |||||
* | | | | | Merge pull request #13799 from kbrock/better_dirty | Jeremy Kemper | 2014-01-22 | 7 | -18/+49 | |
|\ \ \ \ \ | |_|/ / / |/| | | | | Better ActiveRecord hierarchy for Dirty and others | |||||
| * | | | | Move changed_attributes into dirty.rb | Keenan Brock | 2014-01-22 | 6 | -16/+47 | |
| | | | | | | | | | | | | | | | Move serialization dirty into serialization.rb | |||||
| * | | | | put core at the beginning so other classes can modify the behavior | Keenan Brock | 2014-01-22 | 2 | -2/+2 | |
| | | | | | ||||||
* | | | | | Merge pull request #13791 from kei-s/remove_duplicate_merge | Carlos Antonio da Silva | 2014-01-22 | 1 | -1/+0 | |
|\ \ \ \ \ | | | | | | | | | | | | | Remove duplicate merge | |||||
| * | | | | | Remove duplicate merge | kei | 2014-01-22 | 1 | -1/+0 | |
| | |/ / / | |/| | | | ||||||
* | | | | | Improve the CHANGELOG entry [ci skip] | Rafael Mendonça França | 2014-01-22 | 1 | -2/+14 | |
| | | | | | ||||||
* | | | | | Make CollectionProxy#reset return self | Rafael Mendonça França | 2014-01-22 | 1 | -1/+2 | |
| | | | | | ||||||
* | | | | | Merge pull request #13790 from kschlarman/collection_association_reset_fix | Rafael Mendonça França | 2014-01-22 | 3 | -0/+36 | |
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | Calling reset on a collection association should unload the assocation | |||||
| * | | | | Calling reset on a collection association should unload the assocation | Kelsey Schlarman | 2014-01-21 | 3 | -0/+36 | |
| | | | | | | | | | | | | | | | | | | | | Need to define #reset on CollectionProxy. | |||||
* | | | | | Merge pull request #13728 from semenyukdmitriy/master | Yves Senn | 2014-01-22 | 2 | -2/+2 | |
|\ \ \ \ \ | |/ / / / |/| | | | | Added missing `file` delivery method to the Configuration Guide | |||||
| * | | | | [ci skip] Added missing `file` delivery method | Semenyuk Dmitriy | 2014-01-22 | 2 | -2/+2 | |
| | | | | | ||||||
* | | | | | Merge pull request #13786 from terracatta/master | Rafael Mendonça França | 2014-01-21 | 9 | -85/+168 | |
|\ \ \ \ \ | | | | | | | | | | | | | Ensure AR #second, #third, etc. finders work through associations | |||||
| * | | | | | Ensure AR #second, #third, etc. finders work through associations | Jason Meller | 2014-01-21 | 9 | -85/+168 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit fixes two regressions introduced in cafe31a078 where newly created finder methods #second, #third, #forth, and #fifth caused a NoMethodError error on reload associations and where we were pulling the wrong element out of cached associations. Examples: some_book.authors.reload.second # Before # => NoMethodError: undefined method 'first' for nil:NilClass # After # => #<Author id: 2, name: "Sally Second", ...> some_book.first.authors.first some_book.first.authors.second # Before # => #<Author id: 1, name: "Freddy First", ...> # => #<Author id: 1, name: "Freddy First", ...> # After # => #<Author id: 1, name: "Freddy First", ...> # => #<Author id: 2, name: "Sally Second", ...> Fixes #13783. | |||||
* | | | | | | Fix typo | Rafael Mendonça França | 2014-01-21 | 1 | -1/+1 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #13776 from rails/dirty-enum | Rafael Mendonça França | 2014-01-21 | 6 | -4/+128 | |
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | Implement the Dirty API with the Enum feature correctly. Conflicts: activerecord/CHANGELOG.md | |||||
| * | | | | Use string as keys | Rafael Mendonça França | 2014-01-21 | 1 | -2/+2 | |
| | | | | | ||||||
| * | | | | Store the enum values in the DEFINED_ENUM constant | Rafael Mendonça França | 2014-01-21 | 1 | -8/+8 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | This will make simpler to compare if the values changed in the save_changed_attribute method. |