Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | | | Include return value in examples added in #17378 [ci skip] | Zachary Scott | 2014-10-24 | 1 | -2/+2 | |
* | | | | | | | | | | | Improved try documentation [ci skip] | Eugene Gilburg | 2014-10-24 | 1 | -8/+25 | |
| |_|_|/ / / / / / / |/| | | | | | | | | | ||||||
* | | | | | | | | | | Merge pull request #17381 from jonatack/patch-8 | Santiago Pastorino | 2014-10-24 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | | | ||||||
| * | | | | | | | | | AR Migrations Guide#Foreign Keys: fix wrong table | Jon Atack | 2014-10-24 | 1 | -1/+1 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #17377 from aripollak/dry-try-bang | Godfrey Chan | 2014-10-23 | 1 | -10/+6 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | DRY up try/try! | Ari Pollak | 2014-10-23 | 1 | -10/+6 | |
| | |_|_|/ / / / / | |/| | | | | | | | ||||||
* | | | | | | | | | Merge pull request #17369 from rails/secure_compare | Guillermo Iguaran | 2014-10-23 | 4 | -14/+33 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Use AS secure_compare for CSRF token comparison | Guillermo Iguaran | 2014-10-23 | 1 | -2/+2 | |
| * | | | | | | | | Use AS secure_compare in AS::MessageVerifier | Guillermo Iguaran | 2014-10-23 | 1 | -12/+2 | |
| * | | | | | | | | Add AS::SecurityUtils.secure_compare for constant time string comparison | Guillermo Iguaran | 2014-10-23 | 2 | -0/+29 | |
| | |_|/ / / / / | |/| | | | | | | ||||||
* | | | | | | | | Merge branch 'mrgilman-reword-uncountable-documentation' | Zachary Scott | 2014-10-23 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | ||||||
| * | | | | | | | Reword documentation for `uncountable` [ci skip] | Melanie Gilman | 2014-10-23 | 1 | -1/+1 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #17355 from vipulnsward/aj-string-fixes | Yves Senn | 2014-10-23 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | - Fix error string raised from `enqueue_at` | Vipul A M | 2014-10-22 | 1 | -1/+1 | |
* | | | | | | | | Merge pull request #17343 from vipulnsward/inline-aj-callbacks | Yves Senn | 2014-10-23 | 1 | -16/+13 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | - Inline AJ around_perform and around_enqueue in CallbackJob used for tests. | Vipul A M | 2014-10-21 | 1 | -16/+13 | |
| |/ / / / / / / | ||||||
* | | | | | | | | Update CHANGELOG and release notes for e98f2a7 | Godfrey Chan | 2014-10-22 | 2 | -2/+6 | |
* | | | | | | | | Merge pull request #17361 from aripollak/try-bang-parity | Godfrey Chan | 2014-10-22 | 2 | -5/+9 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Bring try! into parity with try. | Ari Pollak | 2014-10-22 | 2 | -5/+9 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge pull request #17353 from swapdisc/activejob-queue-test-typo | Rafael Mendonça França | 2014-10-22 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | ||||||
| * | | | | | | | :nail_care: fix typos in activejob queuing test | Joe Lewis | 2014-10-22 | 1 | -2/+2 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #17346 from accessd/fix-small-typo-in-test | Rafael Mendonça França | 2014-10-21 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | fix small typo in routing test | Accessd | 2014-10-21 | 1 | -1/+1 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #17313 from accessd/fix-url-generation-error-message | Rafael Mendonça França | 2014-10-21 | 2 | -1/+11 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | fix url generation error message | Accessd | 2014-10-21 | 2 | -1/+11 | |
* | | | | | | | | Oops, missed a closing bracket [ci skip] | Godfrey Chan | 2014-10-21 | 1 | -1/+1 | |
* | | | | | | | | Merge pull request #17336 from rebyn/patch-1 | Godfrey Chan | 2014-10-21 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | ||||||
| * | | | | | | | [ci skip] Provide more reasoning to not accept cosmetic changes | Tu Hoang | 2014-10-21 | 1 | -1/+1 | |
| | |_|/ / / / | |/| | | | | | ||||||
* | | | | | | | Merge pull request #17331 from vipulnsward/activejob-cleanups | Rafael Mendonça França | 2014-10-20 | 3 | -4/+1 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | - Remove duplication in AJ logging test for setting logger. | Vipul A M | 2014-10-20 | 2 | -3/+1 | |
| * | | | | | | | No need to specify log level, run at log level as all other Rails components. | Vipul A M | 2014-10-20 | 1 | -1/+0 | |
| |/ / / / / / | ||||||
* | | | | | | | Merge pull request #17337 from claudiob/remove-duplicate-select-method | Rafael Mendonça França | 2014-10-20 | 5 | -17/+3 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Remove duplicate 'select' database statement | claudiob | 2014-10-20 | 5 | -17/+3 | |
| |/ / / / / / | ||||||
* | | | | | | | Merge pull request #17338 from vipulnsward/aj-doc-fixes | Rafael Mendonça França | 2014-10-20 | 3 | -6/+6 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | ||||||
| * | | | | | | - Changed description for AJ enqueuing methods to provide a sane description. | Vipul A M | 2014-10-21 | 1 | -3/+3 | |
| * | | | | | | - Fix mentioned shortcut, to what the shortcut actually is, and that it accep... | Vipul A M | 2014-10-21 | 2 | -3/+3 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #17329 from vipulnsward/mention-perform-later-docs | Yves Senn | 2014-10-20 | 1 | -0/+4 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Mention `perform_now` in AJ base docs to specify how to immediately invoke a ... | Vipul A M | 2014-10-20 | 1 | -0/+4 | |
* | | | | | | | docs, It's "Active Job" not "Active job". [ci skip] | Yves Senn | 2014-10-20 | 1 | -2/+2 | |
* | | | | | | | Merge pull request #17324 from vipulnsward/activejob-warnings | Yves Senn | 2014-10-20 | 6 | -5/+7 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | - Removed unused variable warnings from ActiveJob Adapters | Vipul A M | 2014-10-19 | 5 | -5/+5 | |
| * | | | | | | | Enable emitting of warnings from ActiveJob tests. | Vipul A M | 2014-10-19 | 1 | -0/+2 | |
* | | | | | | | | Merge pull request #17019 from yuki24/add-class-name-to-unknown-attr-error | Yves Senn | 2014-10-20 | 3 | -7/+4 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | AR::UnknownAttributeError should include the class name of a record | Yuki Nishijima | 2014-10-15 | 3 | -4/+14 | |
* | | | | | | | | | AR::UnknownAttributeError should include the class name of a record | Yuki Nishijima | 2014-10-20 | 3 | -4/+14 | |
* | | | | | | | | | Merge branch 'justanshulsharma-activerecord-merge-docs' | Zachary Scott | 2014-10-19 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Merge branch 'activerecord-merge-docs' of https://github.com/justanshulsharma... | Zachary Scott | 2014-10-19 | 1 | -1/+1 | |
|/| | | | | | | | | ||||||
| * | | | | | | | | [ci skip] Make merge method nodoc | Anshul Sharma | 2014-10-20 | 1 | -8/+1 | |
| * | | | | | | | | [ci skip] merge docs | Anshul Sharma | 2014-10-20 | 1 | -0/+7 | |
| | |/ / / / / / | |/| | | | | | | ||||||
* | | | | | | | | Merge pull request #17323 from seuros/master | Rafael Mendonça França | 2014-10-19 | 2 | -4/+1 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | |