aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | Include return value in examples added in #17378 [ci skip]Zachary Scott2014-10-241-2/+2
* | | | | | | | | | | Improved try documentation [ci skip]Eugene Gilburg2014-10-241-8/+25
| |_|_|/ / / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge pull request #17381 from jonatack/patch-8Santiago Pastorino2014-10-241-1/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | |
| * | | | | | | | | AR Migrations Guide#Foreign Keys: fix wrong tableJon Atack2014-10-241-1/+1
|/ / / / / / / / /
* | | | | | | | | Merge pull request #17377 from aripollak/dry-try-bangGodfrey Chan2014-10-231-10/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | DRY up try/try!Ari Pollak2014-10-231-10/+6
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #17369 from rails/secure_compareGuillermo Iguaran2014-10-234-14/+33
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Use AS secure_compare for CSRF token comparisonGuillermo Iguaran2014-10-231-2/+2
| * | | | | | | | Use AS secure_compare in AS::MessageVerifierGuillermo Iguaran2014-10-231-12/+2
| * | | | | | | | Add AS::SecurityUtils.secure_compare for constant time string comparisonGuillermo Iguaran2014-10-232-0/+29
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'mrgilman-reword-uncountable-documentation'Zachary Scott2014-10-231-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Reword documentation for `uncountable` [ci skip]Melanie Gilman2014-10-231-1/+1
|/ / / / / / /
* | | | | | | Merge pull request #17355 from vipulnsward/aj-string-fixesYves Senn2014-10-231-1/+1
|\ \ \ \ \ \ \
| * | | | | | | - Fix error string raised from `enqueue_at`Vipul A M2014-10-221-1/+1
* | | | | | | | Merge pull request #17343 from vipulnsward/inline-aj-callbacksYves Senn2014-10-231-16/+13
|\ \ \ \ \ \ \ \
| * | | | | | | | - Inline AJ around_perform and around_enqueue in CallbackJob used for tests.Vipul A M2014-10-211-16/+13
| |/ / / / / / /
* | | | | | | | Update CHANGELOG and release notes for e98f2a7Godfrey Chan2014-10-222-2/+6
* | | | | | | | Merge pull request #17361 from aripollak/try-bang-parityGodfrey Chan2014-10-222-5/+9
|\ \ \ \ \ \ \ \
| * | | | | | | | 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
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |