aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Bring try! into parity with try.Ari Pollak2014-10-222-5/+9
* Merge pull request #17353 from swapdisc/activejob-queue-test-typoRafael Mendonça França2014-10-221-2/+2
|\
| * :nail_care: fix typos in activejob queuing testJoe Lewis2014-10-221-2/+2
|/
* Merge pull request #17346 from accessd/fix-small-typo-in-testRafael Mendonça França2014-10-211-1/+1
|\
| * fix small typo in routing testAccessd2014-10-211-1/+1
|/
* Merge pull request #17313 from accessd/fix-url-generation-error-messageRafael Mendonça França2014-10-212-1/+11
|\
| * fix url generation error messageAccessd2014-10-212-1/+11
* | Oops, missed a closing bracket [ci skip]Godfrey Chan2014-10-211-1/+1
* | Merge pull request #17336 from rebyn/patch-1Godfrey Chan2014-10-211-1/+1
|\ \
| * | [ci skip] Provide more reasoning to not accept cosmetic changesTu Hoang2014-10-211-1/+1
* | | Merge pull request #17331 from vipulnsward/activejob-cleanupsRafael Mendonça França2014-10-203-4/+1
|\ \ \
| * | | - Remove duplication in AJ logging test for setting logger.Vipul A M2014-10-202-3/+1
| * | | No need to specify log level, run at log level as all other Rails components.Vipul A M2014-10-201-1/+0
| |/ /
* | | Merge pull request #17337 from claudiob/remove-duplicate-select-methodRafael Mendonça França2014-10-205-17/+3
|\ \ \
| * | | Remove duplicate 'select' database statementclaudiob2014-10-205-17/+3
| |/ /
* | | Merge pull request #17338 from vipulnsward/aj-doc-fixesRafael Mendonça França2014-10-203-6/+6
|\ \ \ | |/ / |/| |
| * | - Changed description for AJ enqueuing methods to provide a sane description.Vipul A M2014-10-211-3/+3
| * | - Fix mentioned shortcut, to what the shortcut actually is, and that it accep...Vipul A M2014-10-212-3/+3
|/ /
* | Merge pull request #17329 from vipulnsward/mention-perform-later-docsYves Senn2014-10-201-0/+4
|\ \
| * | Mention `perform_now` in AJ base docs to specify how to immediately invoke a ...Vipul A M2014-10-201-0/+4
* | | docs, It's "Active Job" not "Active job". [ci skip]Yves Senn2014-10-201-2/+2
* | | Merge pull request #17324 from vipulnsward/activejob-warningsYves Senn2014-10-206-5/+7
|\ \ \
| * | | - Removed unused variable warnings from ActiveJob AdaptersVipul A M2014-10-195-5/+5
| * | | Enable emitting of warnings from ActiveJob tests.Vipul A M2014-10-191-0/+2
* | | | Merge pull request #17019 from yuki24/add-class-name-to-unknown-attr-errorYves Senn2014-10-203-7/+4
|\ \ \ \
| * | | | AR::UnknownAttributeError should include the class name of a recordYuki Nishijima2014-10-153-4/+14
* | | | | AR::UnknownAttributeError should include the class name of a recordYuki Nishijima2014-10-203-4/+14
* | | | | Merge branch 'justanshulsharma-activerecord-merge-docs'Zachary Scott2014-10-191-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Merge branch 'activerecord-merge-docs' of https://github.com/justanshulsharma...Zachary Scott2014-10-191-1/+1
|/| | | |
| * | | | [ci skip] Make merge method nodocAnshul Sharma2014-10-201-8/+1
| * | | | [ci skip] merge docsAnshul Sharma2014-10-201-0/+7
| | |/ / | |/| |
* | | | Merge pull request #17323 from seuros/masterRafael Mendonça França2014-10-192-4/+1
|\ \ \ \ | |/ / / |/| | |
| * | | remove duplicate method (_status_code) in action_dispatchAbdelkader Boudih2014-10-192-4/+1
* | | | Merge pull request #17322 from vipulnsward/fix-test-warningMatthew Draper2014-10-201-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Fixed test throwing unused variable warningVipul A M2014-10-191-1/+1
* | | | Merge pull request #17321 from prathamesh-sonpatki/nodoc-status_atAbdelkader Boudih2014-10-192-4/+4
|\ \ \ \ | |/ / / |/| | |
| * | | Make _status_code methods nodocPrathamesh Sonpatki2014-10-192-4/+4
| | |/ | |/|
* | | Merge pull request #17319 from igas/fix-17318Matthew Draper2014-10-191-1/+1
|\ \ \
| * | | fix wrong #17318 [ci skip]Igor Kapkov2014-10-191-1/+1
|/ / /
* | | Merge pull request #17318 from igas/guides-more-friendly-for-nonlatinAbdelkader Boudih2014-10-191-1/+1
|\ \ \
| * | | make guides example more friendly to nonlatin langsIgor Kapkov2014-10-191-1/+1
|/ / /
* | | :nail_care: it's -> its (see comments on 9a586ac)Godfrey Chan2014-10-181-1/+1
* | | Merge pull request #17314 from y-yagi/message_delivery_docZachary Scott2014-10-181-0/+2
|\ \ \
| * | | [ci skip] add :queue option to deliver_later and deliver_later! documentationyuuji.yaginuma2014-10-191-0/+2
|/ / /
* | | [ci skip] A Rails engine is not a man :ok_woman:Zachary Scott2014-10-181-1/+1
* | | [ci skip] Fix word wrap, capitalization, and spacing of text from #17284Zachary Scott2014-10-181-4/+5
* | | Merge pull request #17302 from claudiob/replace-slower-block-call-with-faster...Rafael Mendonça França2014-10-185-11/+11
* | | Revert "Replace (slower) block.call with (faster) yield"Zachary Scott2014-10-185-11/+11
* | | Merge branch 'master' of github.com:rails/railsZachary Scott2014-10-180-0/+0
|\ \ \
| * \ \ Merge pull request #17034 from pramod-sharma/masterZachary Scott2014-10-181-1/+15
| |\ \ \ | | |/ / | |/| |