aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Deprecate implicit AD::Response splatting and Array conversionJeremy Kemper2014-09-063-5/+43
* :scissors:Rafael Mendonça França2014-09-051-1/+1
* Add test to assert_recognizes with custom messageRafael Mendonça França2014-09-051-1/+9
* Message doesn't need to be optionalRafael Mendonça França2014-09-051-2/+2
* Merge pull request #14911 from estsauver/14908Rafael Mendonça França2014-09-052-7/+15
|\
| * Propagate test messages through assert_routing helper, Fixes #14908Earl St Sauver2014-04-292-7/+15
* | Fix for inflector's incorrect camelCase replacement for acronymsMatthew Draper2014-09-064-1/+10
* | Merge pull request #16818 from phoet/patch-4Rafael Mendonça França2014-09-051-1/+2
|\ \
| * | world writable might be a bit too open...Peter Schröder2014-09-051-1/+2
|/ /
* | For now, we will keep sorting the tests.Matthew Draper2014-09-054-4/+7
* | Merge pull request #16815 from seuros/ar-freeze-adapter-nameSantiago Pastorino2014-09-056-17/+6
|\ \
| * | Freeze ADAPTER_NAME in adaptersAbdelkader Boudih2014-09-056-17/+6
|/ /
* | Fixed regression with referencing polymorphic assoc in eager-loadGodfrey Chan2014-09-053-2/+13
* | Merge pull request #16807 from tgxworld/carry_out_assignment_within_blockYves Senn2014-09-051-8/+16
|\ \
| * | Move variable assignment within logging block.Guo Xiang Tan2014-09-051-8/+16
* | | Merge pull request #16765 from Agis-/time-change-bugAndrew White2014-09-053-0/+7
|\ \ \
| * | | Time#change throws exception with an out-of-range :usecAgis-2014-09-043-0/+7
* | | | Merge pull request #16813 from seuros/rdocZachary Scott2014-09-041-14/+14
|\ \ \ \
| * | | | correct rdoc [ci skip]Abdelkader Boudih2014-09-051-14/+14
|/ / / /
* | | | Merge pull request #16809 from akshay-vishnoi/for_not_to_do_notGuillermo Iguaran2014-09-041-1/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | cover all cases of `For not` --> `Do not`, related to #16804Akshay Vishnoi2014-09-051-1/+1
|/ / /
* | | Merge pull request #16699 from cristianbica/aj-refactor-queueingDavid Heinemeier Hansson2014-09-0433-265/+447
|\ \ \
| * | | Rename remaining :in / :at to :wait / :wait_untilCristian Bica2014-09-044-25/+22
| * | | Active Job refactoringCristian Bica2014-09-0333-256/+441
* | | | Load :developers fixtures where expecting a Developer to be thereAkira Matsuda2014-09-051-1/+1
* | | | Merge pull request #16788 from codeodor/fix-16761Aaron Patterson2014-09-046-3/+34
|\ \ \ \
| * | | | Skip StatementCache for eager loaded associations (Fixes #16761)Sammy Larbi2014-09-046-3/+34
* | | | | always reorder bind parameters. fixes #15920Aaron Patterson2014-09-042-7/+12
* | | | | :scissors: and from #16803 [ci skip]Zachary Scott2014-09-041-1/+1
* | | | | Merge pull request #16803 from Peeja/methods-are-not-duplicable--update-guideZachary Scott2014-09-041-1/+1
|\ \ \ \ \
| * | | | | Document that method objects are not `duplicable?`Peter Jaros2014-09-041-1/+1
| | |_|/ / | |/| | |
* | | | | Merge pull request #16804 from kaleworsley/for_not_to_do_notRafael Mendonça França2014-09-041-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Change "For not..." to "Do not...".Kale Worsley2014-09-041-1/+1
|/ / / /
* / / / Remove example fileRafael Mendonça França2014-09-041-30/+0
|/ / /
* | | Merge pull request #16801 from eileencodes/refactor-scope_chain-on-through-re...Rafael Mendonça França2014-09-042-7/+6
|\ \ \
| * | | Always add lambda to scope chain to eliminate branch in eval_scopeeileencodes2014-09-042-7/+6
* | | | Fix a warningMatthew Draper2014-09-051-1/+1
* | | | Merge pull request #16797 from eileencodes/refactor-add_constraints-followup-...Matthew Draper2014-09-041-4/+4
|\ \ \ \ | |/ / / |/| | |
| * | | Follup to PR #16762eileencodes2014-09-041-4/+4
|/ / /
* | | Merge pull request #16799 from rramsden/fix-typoYves Senn2014-09-041-1/+1
|\ \ \
| * | | [ci skip] Fix typo in rails guide for routingRichard Ramsden2014-09-041-1/+1
* | | | Enums shouldn't ruin people's anniversariesGodfrey Chan2014-09-043-4/+8
* | | | build fix, we have to reset the RACK_ENV as well.Yves Senn2014-09-041-2/+5
* | | | get rid of shadowing warning when running tests AR and railtie tests.Yves Senn2014-09-041-2/+2
* | | | code gardening in ActionController::RenderersXavier Noria2014-09-041-7/+12
* | | | Extract data/aria attribute prefixes to a constantRafael Mendonça França2014-09-031-1/+3
* | | | Merge pull request #16796 from ARIATeam/ariaRafael Mendonça França2014-09-033-4/+23
|\ \ \ \
| * | | | Add support for ARIA attributes in tagsPaoMar2014-09-033-4/+23
|/ / / /
* | | | Merge pull request #16795 from Peeja/methods-are-not-duplicableRafael Mendonça França2014-09-033-1/+16
|\ \ \ \
| * | | | Methods are not duplicable.Peter Jaros2014-09-033-1/+16