aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Add CHANGELOG entry for #17064Rafael Mendonça França2014-10-251-0/+6
* Use new hash syntaxRafael Mendonça França2014-10-252-3/+4
* :scissors:Rafael Mendonça França2014-10-252-3/+2
* Merge pull request #17064 from frenkel/fix_select_tag_include_blankRafael Mendonça França2014-10-252-2/+14
|\
| * Use include_blank value as option labelFrank Groeneveld2014-10-172-2/+14
* | Merge pull request #17392 from prathamesh-sonpatki/fix-docstring-for-sanitize...Rafael Mendonça França2014-10-251-2/+2
|\ \
| * | Clarify comments about sanitized_allowed_tagsPrathamesh Sonpatki2014-10-251-2/+2
* | | Merge pull request #17391 from prathamesh-sonpatki/fix-oid-description-ci-skipEileen M. Uchitelle2014-10-251-1/+1
|\ \ \ | |/ / |/| |
| * | Fix description of OID in TypeMapInitializerPrathamesh Sonpatki2014-10-251-1/+1
|/ /
* | give a better error message for misspelled helpersXavier Noria2014-10-253-1/+38
* | fixes circularity check in dependenciesXavier Noria2014-10-254-1/+37
* | instance_eval is evilAkira Matsuda2014-10-251-1/+1
* | Reduce object allocationAkira Matsuda2014-10-251-1/+5
* | Reduce object allocationAkira Matsuda2014-10-251-1/+1
* | Avoid creating range objects (take II)Akira Matsuda2014-10-251-1/+5
* | The code was not up-to-dateAkira Matsuda2014-10-251-9/+7
* | Avoid creating unneeded Hash instance and calling slow Hash#fetchAkira Matsuda2014-10-251-1/+1
* | Merge pull request #17385 from nakadai/patch-1Zachary Scott2014-10-241-1/+1
|\ \
| * | Fix typo in "Active Record Basics" guide. [ci skip]nakadai2014-10-241-1/+1
|/ /
* | Revert a change made to the example in 1ac4525Godfrey Chan2014-10-241-1/+1
* | 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