aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* added primary_key option documentation for belongs_to associationGirish S2014-09-231-0/+19
| | | | fixes issue #16698
* Merge pull request #17005 from y-yagi/fix_aj_test_helperYves Senn2014-09-232-2/+4
|\ | | | | | | add message to `assert` in `assert_enqueued_with`
| * add message to `assert` in `assert_enqueued_with`yuuji.yaginuma2014-09-232-2/+4
| |
* | Merge pull request #17022 from prathamesh-sonpatki/test-for-validate-messageYves Senn2014-09-231-1/+3
|\ \ | | | | | | Added test for exception message for validate method
| * | Added test for exception message for validate methodPrathamesh Sonpatki2014-09-231-1/+3
|/ / | | | | | | - Test case for https://github.com/rails/rails/pull/16851
* | Merge pull request #17018 from prathamesh-sonpatki/tenderloveAbdelkader Boudih2014-09-231-1/+5
|\ \ | | | | | | Update changelog with tenderlove's entry
| * | Update changelog with tenderlove's entryPrathamesh Sonpatki2014-09-231-1/+5
|/ / | | | | | | [ci skip]
* | add a truncate method to the connectionAaron Patterson2014-09-226-0/+38
| | | | | | | | | | | | it doesn't work on SQLite3 since it doesn't support truncate, but that's OK. If you call truncate on the connection, you're now bound to that database (same as if you use hstore or any other db specific feature).
* | Merge pull request #17012 from ↵Rafael Mendonça França2014-09-221-1/+1
|\ \ | | | | | | | | | | | | petedmarsh/clarify-association-primary-key-option-documentation Clarify the documentation of the primary_key option for associations
| * | Clarify the documentation of the primary_key option for associationsPeter Marsh2014-09-221-1/+1
|/ / | | | | | | | | | | | | Previously the documentation stated that `primary_key` should be the name of a *method* that returns the primary key used for the association. This is incorrect. This changes the documentation to say that the value must be the name of a column.
* | Merge pull request #16963 from collectiveidea/activejob-djRafael Mendonça França2014-09-221-3/+9
|\ \ | | | | | | | | | | | | | | | | | | Cleaner queuing of jobs using Delayed Job Conflicts: activejob/lib/active_job/queue_adapters/delayed_job_adapter.rb
| * | Cleaner queuing of jobs using Delayed JobDavid Genord II2014-09-181-3/+9
| | |
* | | Merge pull request #17009 from arthurnn/foreign_key_symbolsRafael Mendonça França2014-09-223-3/+3
|\ \ \ | | | | | | | | Fixtures using Foreign key symbols
| * | | Better regression test for Fixtures with fk as a symbolArthur Neves2014-09-222-11/+2
| | | |
| * | | fix fixtures not loading if a belongs_to association is defined with a ↵Will Bryant2014-09-222-1/+10
| | | | | | | | | | | | | | | | :foreign_key option that's a symbol
* | | | Revert "Merge pull request #16888 from jejacks0n/render_template"Godfrey Chan2014-09-234-27/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 07635a74b5ee08dcba3f6617def6230d8f114fe5, reversing changes made to 1b5f61a025b6ce1ee52b7148e3ed2a9acbde28b9. Reason: it's not ready :bomb:, see https://github.com/rails/rails/pull/16888#issuecomment-56400816
* | | | Move the array to a constantGodfrey Chan2014-09-231-3/+4
| | | |
* | | | Merge pull request #16851 from ↵Godfrey Chan2014-09-231-1/+6
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | prathamesh-sonpatki/mention-validate-in-upgrade-guide Update error message of Active Model's validate method
| * | | Update error message for validate methodPrathamesh Sonpatki2014-09-201-1/+6
| | | | | | | | | | | | | | | | | | | | - Improve the error message by suggesting that the user may have intended to call validates instead of validate method.
* | | | Merge pull request #16985 from matthewd/no-isolated-for-prsGodfrey Chan2014-09-231-0/+1
|\ \ \ \ | | | | | | | | | | Skip isolated tests for PRs
| * | | | Skip isolated tests for PRsMatthew Draper2014-09-201-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | They're valuable, but the types of errors they catch are fairly rare: we can address them post-merge when they show up.
* | | | | CHANGELOG for 07635a7Godfrey Chan2014-09-232-0/+20
| | | | |
* | | | | Merge pull request #16888 from jejacks0n/render_templateGodfrey Chan2014-09-232-20/+7
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | Changes default render behavior from file to template.
| * | | | | Changes default render behavior from file to template.jejacks0n2014-09-112-20/+7
| | | | | |
* | | | | | Merge pull request #16999 from cristianbica/activejob-adapters-rdocAbdelkader Boudih2014-09-2214-71/+194
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | [ci skip] Added RDoc for each Active Job adapter
| * | | | | Added RDoc for each Active Job adapterCristian Bica2014-09-2214-71/+194
| | | | | |
* | | | | | Merge pull request #16974 from silp-com/mail_was_calledYves Senn2014-09-225-2/+30
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | ActionMailer: mark mail as called after instead of before processing it
| * | | | | | Allow attaching files while the mail view is renderedChristian Felder (masone)2014-09-224-2/+24
| | | | | | |
* | | | | | | Merge pull request #17001 from ↵Yves Senn2014-09-222-35/+19
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | claudiob/remove-wrapping-div-from-form-helpers-doc Remove wrapping <div> in form helpers from doc [ci skip]
| * | | | | | | Remove wrapping <div> in form helpers from docclaudiob2014-09-222-35/+19
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] 89ff1f8 and 1de258e6 removed from the HTML generated by the form helpers the <div> that was wrapping the field elements inside the <form>. This commit updates the documentation of the methods to reflect the two commits above.
* | | | | | | Merge pull request #17000 from yuki24/fix-false-assertionsYves Senn2014-09-222-3/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix another false assertions
| * | | | | | | Fix another false assertionsYuki Nishijima2014-09-212-3/+3
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * The assertions in AS::Duration don't actually assert. * The assertion in Railtie will pass even when `eager_load_namespaces` doesn't include `AppTemplate::Application` if `Rails.application` is truthy. For more details, see here: * https://github.com/rails/rails/pull/16998 * https://github.com/rails/rails/pull/17000
* | | | | | | Wrap it up! :trollface: [ci skip]Zachary Scott2014-09-221-3/+2
| | | | | | |
* | | | | | | Wrap Adequate Record release notes at 80 chars [ci skip]Zachary Scott2014-09-221-6/+14
|/ / / / / /
* | | | | | Merge pull request #16998 from yuki24/fix-false-assertionMatthew Draper2014-09-221-3/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix false assertions in AR::TestCase::AttributeMethodsTest
| * | | | | | Fix assertions in AR::TestCase::AttributeMethodsTestYuki Nishijima2014-09-211-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This test has always been green because it uses "assert" and the first argument is an truthy class/object.
* | | | | | | Merge pull request #16984 from chancancode/fix_16578Godfrey Chan2014-09-222-5/+16
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Document that the default for `rails server -b` has changed
| * | | | | | | Document that the default for `rails server -b` has changedGodfrey Chan2014-09-222-5/+16
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | Fixes #16578
* | | | | | | Merge pull request #16979 from square/standardize-call-styleYves Senn2014-09-214-4/+4
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | Standardize on `Rails.application` [ci skip]
| * | | | | | Standardize on `Rails.application` [ci skip]Tamir Duberstein2014-09-195-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This seems to be the style settled on in most of the templates.
* | | | | | | Merge pull request #16994 from yuki24/fix-typo-in-ar-attribute-method-testZachary Scott2014-09-211-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | [ci skip] Fix typo in activerecord/test/cases/attribute_methods_test.rb:737
| * | | | | | | Fix typo [ci skip]Yuki Nishijima2014-09-201-1/+1
|/ / / / / / /
* | | | | | | Merge pull request #16988 from y-yagi/chg_default_log_levelZachary Scott2014-09-212-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | [ci skip] modify the description of production log level default
| * | | | | | | [ci skip] modify the description of production log level defaultyuuji.yaginuma2014-09-212-2/+2
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #16987 from jonatack/patch-8Yves Senn2014-09-201-13/+15
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | ActiveRecord CHANGELOG improvements [skip ci]
| * | | | | | ActiveRecord CHANGELOG improvements [skip ci]Jon Atack2014-09-201-13/+15
|/ / / / / /
* | | | | | No need to call to_sym hereGodfrey Chan2014-09-203-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The hash is now string-keyed, and [_]reflect_on_association calls `to_s` on the argument anyway.
* | | | | | Fix find_by with associations not working with adequate recordGodfrey Chan2014-09-202-0/+8
| |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For now, we will just skip the cache when a non-column key is used in the hash. If the future, we can probably move some of the logic in PredicateBuilder.expand up the chain to make caching possible for association queries. Closes #16903 Fixes #16884
* | | | | Quick fix to address the borken build caused by #15791Godfrey Chan2014-09-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is pretty lame though, so feel free to send a PR with a better fix! ;) cc @zev @tenderlove
* | | | | Merge pull request #15791 from zev/add_model_to_recordnotfound_messageAaron Patterson2014-09-192-18/+26
|\ \ \ \ \ | | | | | | | | | | | | Update RecordNotFound exception cases to include a message with the
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-27 12:37:08 +0000