aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | Merge pull request #13844 from Alamoz/config_grammarGodfrey Chan2014-01-252-2/+2
|\ \ \ \ | | | | | | | | | | thread -> threaded [ci skip]
| * | | | Correct grammar from '... allowing both thread web servers ...' to '... ↵Adrien Lamothe2014-01-252-2/+2
|/ / / / | | | | | | | | | | | | allowing both threaded web servers ...'.
* | | | Merge pull request #13841 from robin850/patch-15Guillermo Iguaran2014-01-251-0/+6
|\ \ \ \ | |/ / / |/| | | Add a missing changelog entry for #13825 [ci skip]
| * | | Add a missing changelog entry for #13825 [ci skip]Robin Dupret2014-01-251-0/+6
|/ / /
* | | Add additional tests for #13824Andrew White2014-01-251-0/+26
| | |
* | | Transform dashes to underscores in resource route namesByron Bischoff2014-01-252-7/+17
| | | | | | | | | | | | Fixes #13824
* | | Merge pull request #13772 from chancancode/fix_has_secure_password_for_goodGodfrey Chan2014-01-244-81/+132
|\ \ \ | | | | | | | | Refactored validations rules for has_secure_password
| * | | Some minor fixesGodfrey Chan2014-01-242-3/+2
| | | |
| * | | Removed old testsGodfrey Chan2014-01-243-250/+121
| | | |
| * | | Got all the new tests passingGodfrey Chan2014-01-241-10/+8
| | | |
| * | | Restored the ability to clear the password with user.password= nil (see the ↵Godfrey Chan2014-01-241-1/+3
| | | | | | | | | | | | | | | | docs)
| * | | Rewrote the tests for has_secure_passwordGodfrey Chan2014-01-243-2/+183
| | | |
* | | | Merge pull request #13835 from frodsan/remove_unused_argumentGuillermo Iguaran2014-01-241-1/+1
|\ \ \ \ | |/ / / |/| | | Remove unused argument.
| * | | Remove unused argument.Francesco Rodriguez2014-01-241-1/+1
|/ / /
* | | Merge pull request #13785 from kuldeepaggarwal/fix-find_with_multiple_idsYves Senn2014-01-242-9/+26
|\ \ \ | | | | | | | | Fix `ActiveRecord::RecordNotFound` error message with custom primary key
| * | | Fix `ActiveRecord::RecordNotFound` error message with custom primary keyKuldeep Aggarwal2014-01-252-9/+26
| | | |
* | | | Merge pull request #13829 from qsymmachus/improve_validates_with_exampleRafael Mendonça França2014-01-241-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 McCutchen2014-01-241-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | Person called GoodnessValidator before it was defined. This change will compile the example correctly.
* | | | | Add a test-case for GH #13825Guillermo Iguaran2014-01-241-2/+8
|/ / / /
* | | | Merge pull request #13828 from bronzle/apploader-should-check-for-fileGuillermo Iguaran2014-01-241-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 Bischoff2014-01-241-1/+1
|/ / / / | | | | | | | | | | | | File.read(exe); closes #13825
* | | | Merge pull request #13811 from mdesantis/issue-13810Yves Senn2014-01-243-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 Santis2014-01-243-3/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixes rails/rails#13810 Squash
* | | | | Merge pull request #13821 from vipulnsward/remove-assignment-in-testYves Senn2014-01-231-1/+0
|\ \ \ \ \ | | | | | | | | | | | | Remove unused assignment to fix warnings in enum test.
| * | | | | Remove unused assignment to fix warnings in enum test.Vipul A M2014-01-241-1/+0
|/ / / / /
* | | | | Merge pull request #13819 from arthurnn/one_require_testGuillermo Iguaran2014-01-232-10/+8
|\ \ \ \ \ | | | | | | | | | | | | unify param.require tests
| * | | | | unify param.require testsArthur Neves2014-01-232-10/+8
| | | | | |
* | | | | | Merge pull request #13818 from arthurnn/small_test_caseGuillermo Iguaran2014-01-231-0/+7
|\ \ \ \ \ \ | |/ / / / / |/| | | | | test boolean and number json param parsing
| * | | | | test boolean and number json param parsingArthur Neves2014-01-231-0/+7
|/ / / / /
* | | | | Merge pull request #13795 from bobbus/errors-has-keyGodfrey Chan2014-01-232-2/+7
|\ \ \ \ \ | |/ / / / |/| | | | Fix ActiveModel::Errors#has_key? returning nil
| * | | | Update ActiveModel::Errors.has_key? testAdrien Coquio2014-01-221-1/+1
| | | | |
| * | | | Fix ActiveModel::Errors#has_key? return valueAdrien Coquio2014-01-221-1/+1
| | | | |
| * | | | Add failing test for ActiveModel::Errors#has_key? methodAdrien Coquio2014-01-221-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_dirtyJeremy Kemper2014-01-227-18/+49
|\ \ \ \ \ | |_|/ / / |/| | | | Better ActiveRecord hierarchy for Dirty and others
| * | | | Move changed_attributes into dirty.rbKeenan Brock2014-01-226-16/+47
| | | | | | | | | | | | | | | Move serialization dirty into serialization.rb
| * | | | put core at the beginning so other classes can modify the behaviorKeenan Brock2014-01-222-2/+2
| | | | |
* | | | | Merge pull request #13791 from kei-s/remove_duplicate_mergeCarlos Antonio da Silva2014-01-221-1/+0
|\ \ \ \ \ | | | | | | | | | | | | Remove duplicate merge
| * | | | | Remove duplicate mergekei2014-01-221-1/+0
| | |/ / / | |/| | |
* | | | | Improve the CHANGELOG entry [ci skip]Rafael Mendonça França2014-01-221-2/+14
| | | | |
* | | | | Make CollectionProxy#reset return selfRafael Mendonça França2014-01-221-1/+2
| | | | |
* | | | | Merge pull request #13790 from kschlarman/collection_association_reset_fixRafael Mendonça França2014-01-223-0/+36
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | Calling reset on a collection association should unload the assocation
| * | | | Calling reset on a collection association should unload the assocationKelsey Schlarman2014-01-213-0/+36
| | | | | | | | | | | | | | | | | | | | Need to define #reset on CollectionProxy.
* | | | | Merge pull request #13728 from semenyukdmitriy/masterYves Senn2014-01-222-2/+2
|\ \ \ \ \ | |/ / / / |/| | | | Added missing `file` delivery method to the Configuration Guide
| * | | | [ci skip] Added missing `file` delivery methodSemenyuk Dmitriy2014-01-222-2/+2
| | | | |
* | | | | Merge pull request #13786 from terracatta/masterRafael Mendonça França2014-01-219-85/+168
|\ \ \ \ \ | | | | | | | | | | | | Ensure AR #second, #third, etc. finders work through associations
| * | | | | Ensure AR #second, #third, etc. finders work through associationsJason Meller2014-01-219-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 typoRafael Mendonça França2014-01-211-1/+1
|/ / / / /
* | | | | Merge pull request #13776 from rails/dirty-enumRafael Mendonça França2014-01-216-4/+128
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | Implement the Dirty API with the Enum feature correctly. Conflicts: activerecord/CHANGELOG.md
| * | | | Use string as keysRafael Mendonça França2014-01-211-2/+2
| | | | |
| * | | | Store the enum values in the DEFINED_ENUM constantRafael Mendonça França2014-01-211-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | This will make simpler to compare if the values changed in the save_changed_attribute method.
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-17 12:05:01 +0000