aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | | | Setting an association replaces records with the same id in memorySean Griffin2014-11-252-2/+82
| |/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The records weren't being replaced since equality in Active Record is defined in terms of `id` only. It is reasonable to expect that the references would be replaced in memory, even if no queries are actually executed. This change did not appear to affect any other parts of the code base. I chose not to execute callbacks since we're not actually modifying the association in a way that will be persisted. Fixes #17730
* | | | | | | | | | | | Merge pull request #17767 from javiervidal/fixing_documentationRafael Mendonça França2014-11-251-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing wrong link in 'Ruby on Rails 3.0 Release Notes' [ci skip]
| * | | | | | | | | | | | Fixing wrong link in 'Ruby on Rails 3.0 Release Notes' [ci skip]Javier Vidal2014-11-251-1/+1
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #17754 from eileencodes/refactor-aliased_table_forSantiago Pastorino2014-11-252-13/+4
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | Combine aliased_table_for and aliased_name_for
| * | | | | | | | | | | Combine aliased_table_for and aliased_name_foreileencodes2014-11-242-13/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This refactoring reduces the number of conditionals needed to build `aliased_table_for` and removes `aliased_name_for` because it's no longer necessary. `aliased_name_for` was also used in `JoinDependency#initialize` so that was replaced with `aliased_table_for` as well.
* | | | | | | | | | | | Merge pull request #17753 from gsamokovarov/dont-center-routing-tableSantiago Pastorino2014-11-251-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Don't center the routes table on routing errors
| * | | | | | | | | | | | Don't center the routes table on routing errorsGenadi Samokovarov2014-11-241-1/+1
| | | | | | | | | | | | |
* | | | | | | | | | | | | tests, run `test_test.rb` with `RAILS_ENV=test`.Yves Senn2014-11-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The tests to verify our testing setup used `RAILS_ENV=development` to execute the tests. Let's keep it as close to a real-world setup as possible.
* | | | | | | | | | | | | Rearrange release notes by importance [ci skip]Godfrey Chan2014-11-251-99/+85
| | | | | | | | | | | | |
* | | | | | | | | | | | | :scissors: WIP labels [ci skip]Godfrey Chan2014-11-252-6/+0
| | | | | | | | | | | | |
* | | | | | | | | | | | | Prepare for RC: un-wip release notes [ci skip]Godfrey Chan2014-11-251-1/+0
| | | | | | | | | | | | |
* | | | | | | | | | | | | We shouldn't be linking to edgeapi [ci skip]Godfrey Chan2014-11-251-1/+1
| | | | | | | | | | | | |
* | | | | | | | | | | | | Prepare for RC: link to the 4-2-stable [ci skip]Godfrey Chan2014-11-252-3/+3
| | | | | | | | | | | | |
* | | | | | | | | | | | | Cross link to upgrade guide [ci skip]Godfrey Chan2014-11-251-1/+2
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'nil_script_name'Santiago Pastorino2014-11-252-1/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Add regression test case to ensure script_name as nil is not used anymore in ↵Santiago Pastorino2014-11-251-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | url_for
| * | | | | | | | | | | | | sets script_name to always be a string.JONBRWN2014-11-251-1/+1
|/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #17615 #17616 when script_name is nil in the options hash, script_name is set to nil. options = {script_name: nil} script_name = options.delete(:script_name) {‘’} # => nil Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
* | | | | | | | | | | | | Final sync with CHANGELOGs [ci skip]Godfrey Chan2014-11-251-2/+7
| | | | | | | | | | | | |
* | | | | | | | | | | | | :scissors: TODOGodfrey Chan2014-11-251-4/+3
| | | | | | | | | | | | |
* | | | | | | | | | | | | The default hasn't changed, so this is not an incompatibility [ci skip]Godfrey Chan2014-11-251-16/+0
| | | | | | | | | | | | |
* | | | | | | | | | | | | Simplify section on adequate record [ci skip]Godfrey Chan2014-11-251-14/+14
| | | | | | | | | | | | |
* | | | | | | | | | | | | Added tests for log_level deprecationGodfrey Chan2014-11-251-13/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #17756 [Godfrey Chan, Zachary Scott]
* | | | | | | | | | | | | Set the test_order in the basic app as well, see 58e8b48Godfrey Chan2014-11-252-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This removes the unwanted deprecation warnings in the tests
* | | | | | | | | | | | | Set the default log_level to info in all testsGodfrey Chan2014-11-251-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a follow-up to 116de07. That change was for two reasons: 1) speed up the tests by reducing the amount of log lines 2) avoid a deprecation warning from a6de6f5. This setting need to be on the basic app too, otherwise the deprecation warning will show up on other unrelated test cases.
* | | | | | | | | | | | | Merge pull request #17763 from kamipo/fix_out_of_range_error_messageGodfrey Chan2014-11-251-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix out of range error message
| * | | | | | | | | | | | | Fix out of range error messageRyuta Kamizono2014-11-251-1/+1
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge pull request #17757 from zzak/railties-default-to-debug-log_levelGodfrey Chan2014-11-251-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Always default the log_level to :info for Railties
| * | | | | | | | | | | | | Always default the log_level to :info for RailtiesZachary Scott2014-11-241-0/+1
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Mention log_level deprecation in upgrade guides [ci skip]Godfrey Chan2014-11-251-0/+12
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #17755 from zzak/changelog-for-16622Godfrey Chan2014-11-252-0/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | Add a CHANGELOG entry for #16622 and a6de6f5 [ci skip]
| * | | | | | | | | | | | Add Release Note for #16622 [ci skip]Zachary Scott2014-11-241-0/+3
| | | | | | | | | | | | |
| * | | | | | | | | | | | Add a CHANGELOG entry for #16622 and a6de6f5 [ci skip]Zachary Scott2014-11-241-0/+4
| |/ / / / / / / / / / /
* | | | | | | | | | | | let the AM test suite pass in 1.9Xavier Noria2014-11-241-2/+2
| | | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #17760 from zzak/release-not-for-17743Sean Griffin2014-11-241-0/+13
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Add release note for #17743 [ci skip]
| * | | | | | | | | | | | Add release note for #17743 [ci skip]Zachary Scott2014-11-241-0/+13
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #17687 from fabiolnm/masterRafael Mendonça França2014-11-252-20/+52
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refs #17684: Enhances rdoc for ActiveJob assert_performed assertions
| * | | | | | | | | | | | Add perform_enqueued_jobsFábio Luiz Nery de Miranda2014-11-252-20/+52
|/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It will set proper queue_adapter state required by assert_performed_jobs assertions. Also the block version of assert_performed_jobs will make sure this state is respected. Fixes #17684
* | | | | | | | | | | | Changelog formatSean Griffin2014-11-241-2/+3
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'deprecate-string-options-in-url-helpers'Sean Griffin2014-11-243-1/+43
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Deprecate string options in URL helpersMelanie Gilman2014-11-243-1/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes https://github.com/rails/rails/issues/16958 [Byron Bischoff & Melanie Gilman]
* | | | | | | | | | | | | Merge pull request #17758 from tgxworld/mailer_generatorRafael Mendonça França2014-11-256-31/+68
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / |/| | | | | | | | | | | | Follow up to #17646.
| * | | | | | | | | | | | Update docs to reflect changes to MailerGenerator.Guo Xiang Tan2014-11-252-22/+43
| | | | | | | | | | | | |
| * | | | | | | | | | | | Add missing CHANGELOG entry.Guo Xiang Tan2014-11-251-0/+7
| | | | | | | | | | | | |
| * | | | | | | | | | | | Generate mailer layouts even if no action is given.Guo Xiang Tan2014-11-252-4/+6
| | | | | | | | | | | | |
| * | | | | | | | | | | | MailerGenerator should inherit from Base.Guo Xiang Tan2014-11-251-3/+4
| | | | | | | | | | | | |
| * | | | | | | | | | | | Add tests which were incorrectly removed.Guo Xiang Tan2014-11-253-4/+10
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #17646 from andyjeffries/html_layout_fixDavid Heinemeier Hansson2014-11-258-12/+54
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Creating mailer layouts by default, including html and body tags
| * | | | | | | | | | | | Removing unnecessary File.join callsAndy Jeffries2014-11-242-2/+2
| | | | | | | | | | | | |
| * | | | | | | | | | | | Creates an ApplicationMailer and layout by default, including html and body ↵Andy Jeffries2014-11-218-12/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tags to reduce spam score
* | | | | | | | | | | | | let mailer templates generate URLs by default [Xavier Noria, Richard Schneeman]Xavier Noria2014-11-247-12/+107
| | | | | | | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-07 17:40:25 +0000