aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | Merge pull request #17755 from zzak/changelog-for-16622Godfrey Chan2014-11-252-0/+7
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / |/| | | | | | | | | |
| * | | | | | | | | | 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]Zachary Scott2014-11-241-0/+13
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #17687 from fabiolnm/masterRafael Mendonça França2014-11-252-20/+52
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add perform_enqueued_jobsFábio Luiz Nery de Miranda2014-11-252-20/+52
|/ / / / / / / / / /
* | | | | | | | | | 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
* | | | | | | | | | | Merge pull request #17758 from tgxworld/mailer_generatorRafael Mendonça França2014-11-256-31/+68
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Removing unnecessary File.join callsAndy Jeffries2014-11-242-2/+2
| * | | | | | | | | | Creates an ApplicationMailer and layout by default, including html and body t...Andy Jeffries2014-11-218-12/+54
* | | | | | | | | | | let mailer templates generate URLs by default [Xavier Noria, Richard Schneeman]Xavier Noria2014-11-247-12/+107
* | | | | | | | | | | allow types to be passed in for USING castsAaron Patterson2014-11-241-0/+3
* | | | | | | | | | | oops, forgot to add the real assertion!Aaron Patterson2014-11-241-0/+1
* | | | | | | | | | | allow the "USING" statement to be specified on change column callsAaron Patterson2014-11-242-1/+28
* | | | | | | | | | | Merge pull request #17682 from ReneB/docs/update_allRafael Mendonça França2014-11-241-5/+5
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Reword documentation for update_allRené van den Berg2014-11-241-8/+1
| * | | | | | | | | | | Explain that default_scope also influences update_allRené van den Berg2014-11-201-5/+12
* | | | | | | | | | | | Merge pull request #17752 from arthurnn/fix_sprockets-rails-dependencyRafael Mendonça França2014-11-242-3/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fix sprockets-rails dependency danceArthur Neves2014-11-242-3/+1
* | | | | | | | | | | | | Document `String#html_safe` [ci skip]Sean Griffin2014-11-241-0/+5
| |_|_|_|/ / / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #17747 from gsamokovarov/missing-template-backtraceDavid Heinemeier Hansson2014-11-243-0/+33
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Show source view and backtrace on missing template errorsGenadi Samokovarov2014-11-243-0/+33
| | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge pull request #17748 from claudiob/remove-unwanted-comments-from-documen...Zachary Scott2014-11-244-0/+14
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Mark comments that should not be in the docsclaudiob2014-11-244-0/+14
|/ / / / / / / / / / /
* | | | | | | | | | | Add `.reflections` change to release note [skip ci]Arthur Neves2014-11-241-0/+3
* | | | | | | | | | | Ensure the type map's cache is thread safeSean Griffin2014-11-241-3/+7
* | | | | | | | | | | Merge pull request #17725 from chancancode/deprecate_use_routeGodfrey Chan2014-11-245-5/+41
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Don't show the warning if we're already raising the error anywayGodfrey Chan2014-11-231-8/+13
| * | | | | | | | | | | Deprecate `use_route` in controller testsGodfrey Chan2014-11-232-3/+24
| * | | | | | | | | | | Deprecate passing an invalid name to `Formatter#generate`Godfrey Chan2014-11-231-0/+10
| * | | | | | | | | | | Fix cases where the wrong name is passed to `Formatter#generate`Godfrey Chan2014-11-232-2/+2
| | |_|_|_|_|/ / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge pull request #17737 from yui-knk/fix/headSantiago Pastorino2014-11-242-5/+5
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Replace ActionDispatch::Head with Rack::Head.yui-knk2014-11-242-5/+5
* | | | | | | | | | | | Merge pull request #17678 from siddharth28/includes_with_scope_with_joinsSantiago Pastorino2014-11-245-12/+17
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fix includes on association with a scope containing joins along with conditionssiddharth@vinsol.com2014-11-215-12/+17
* | | | | | | | | | | | | Merge pull request #17707 from claudiob/move-debug-helper-testRafael Mendonça França2014-11-241-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Move test that depends on ActiveRecordclaudiob2014-11-211-0/+0
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge pull request #17744 from RichardLitt/doc-fix-syntaxRafael Mendonça França2014-11-241-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Fix wrong path in comments about stylesheetsRichard Littauer2014-11-241-1/+1
* | | | | | | | | | | | | | Merge pull request #17742 from RichardLitt/doc-fix-syntaxRafael Mendonça França2014-11-244-4/+4
|\| | | | | | | | | | | | | | |_|_|_|/ / / / / / / / / |/| | | | | | | | | | | |