aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Remove internal options from query string of pathsGert Goet2014-09-253-18/+19
* Merge pull request #17051 from jwworth/task/fix_typoRafael Mendonça França2014-09-241-1/+1
|\
| * Fix typoJake Worth2014-09-241-1/+1
|/
* Merge pull request #17042 from DanOlson/remove-skip-action-viewRafael Mendonça França2014-09-245-11/+9
|\
| * Remove --skip-action-view option from application generatorDan Olson2014-09-245-11/+9
|/
* Merge pull request #17020 from Sirupsen/ar-override-rack-testAaron Patterson2014-09-233-1/+14
|\
| * ar/connection_pool: honor overriden rack.test in middlewareSimon Eskildsen2014-09-233-1/+14
* | Merge pull request #17032 from tgxworld/update_contributing_guideArthur Nogueira Neves2014-09-231-5/+5
|\ \
| * | [CI SKIP] Improve force push note.Guo Xiang Tan2014-09-231-5/+5
|/ /
* | Merge pull request #17029 from grk/fix-loading-fixtures-in-engine-testsSantiago Pastorino2014-09-231-1/+1
|\ \
| * | Fix loading fixtures in engine testsGrzesiek Kolodziejczyk2014-09-231-1/+1
* | | Merge pull request #17026 from prathamesh-sonpatki/mention-updating-pull-requ...Richard Schneeman2014-09-231-0/+17
|\ \ \ | |/ / |/| |
| * | Added note about updating pull requests by force pushPrathamesh Sonpatki2014-09-231-0/+17
| |/
* | Merge pull request #17005 from y-yagi/fix_aj_test_helperYves Senn2014-09-232-2/+4
|\ \
| * | add message to `assert` in `assert_enqueued_with`yuuji.yaginuma2014-09-232-2/+4
* | | Merge pull request #17022 from prathamesh-sonpatki/test-for-validate-messageYves Senn2014-09-231-1/+3
|\ \ \ | |_|/ |/| |
| * | Added test for exception message for validate methodPrathamesh Sonpatki2014-09-231-1/+3
|/ /
* | Merge pull request #17018 from prathamesh-sonpatki/tenderloveAbdelkader Boudih2014-09-231-1/+5
|\ \
| * | Update changelog with tenderlove's entryPrathamesh Sonpatki2014-09-231-1/+5
|/ /
* | add a truncate method to the connectionAaron Patterson2014-09-226-0/+38
* | Merge pull request #17012 from petedmarsh/clarify-association-primary-key-opt...Rafael Mendonça França2014-09-221-1/+1
|\ \
| * | Clarify the documentation of the primary_key option for associationsPeter Marsh2014-09-221-1/+1
|/ /
* | Merge pull request #16963 from collectiveidea/activejob-djRafael Mendonça França2014-09-221-3/+9
|\ \
| * | Cleaner queuing of jobs using Delayed JobDavid Genord II2014-09-181-3/+9
* | | Merge pull request #17009 from arthurnn/foreign_key_symbolsRafael Mendonça França2014-09-223-3/+3
|\ \ \
| * | | Better regression test for Fixtures with fk as a symbolArthur Neves2014-09-222-11/+2
| * | | fix fixtures not loading if a belongs_to association is defined with a :forei...Will Bryant2014-09-222-1/+10
* | | | Revert "Merge pull request #16888 from jejacks0n/render_template"Godfrey Chan2014-09-234-27/+20
* | | | Move the array to a constantGodfrey Chan2014-09-231-3/+4
* | | | Merge pull request #16851 from prathamesh-sonpatki/mention-validate-in-upgrad...Godfrey Chan2014-09-231-1/+6
|\ \ \ \ | |/ / / |/| | |
| * | | Update error message for validate methodPrathamesh Sonpatki2014-09-201-1/+6
* | | | Merge pull request #16985 from matthewd/no-isolated-for-prsGodfrey Chan2014-09-231-0/+1
|\ \ \ \
| * | | | Skip isolated tests for PRsMatthew Draper2014-09-201-0/+1
* | | | | CHANGELOG for 07635a7Godfrey Chan2014-09-232-0/+20
* | | | | Merge pull request #16888 from jejacks0n/render_templateGodfrey Chan2014-09-232-20/+7
|\ \ \ \ \
| * | | | | Changes default render behavior from file to template.jejacks0n2014-09-112-20/+7
* | | | | | Merge pull request #16999 from cristianbica/activejob-adapters-rdocAbdelkader Boudih2014-09-2214-71/+194
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Added RDoc for each Active Job adapterCristian Bica2014-09-2214-71/+194
* | | | | | Merge pull request #16974 from silp-com/mail_was_calledYves Senn2014-09-225-2/+30
|\ \ \ \ \ \
| * | | | | | Allow attaching files while the mail view is renderedChristian Felder (masone)2014-09-224-2/+24
* | | | | | | Merge pull request #17001 from claudiob/remove-wrapping-div-from-form-helpers...Yves Senn2014-09-222-35/+19
|\ \ \ \ \ \ \
| * | | | | | | Remove wrapping <div> in form helpers from docclaudiob2014-09-222-35/+19
|/ / / / / / /
* | | | | | | Merge pull request #17000 from yuki24/fix-false-assertionsYves Senn2014-09-222-3/+3
|\ \ \ \ \ \ \
| * | | | | | | Fix another false assertionsYuki Nishijima2014-09-212-3/+3
| | |/ / / / / | |/| | | | |
* | | | | | | Wrap it up! :trollface: [ci skip]Zachary Scott2014-09-221-3/+2
* | | | | | | Wrap Adequate Record release notes at 80 chars [ci skip]Zachary Scott2014-09-221-6/+14
|/ / / / / /
* | | | | | Merge pull request #16998 from yuki24/fix-false-assertionMatthew Draper2014-09-221-3/+3
|\ \ \ \ \ \
| * | | | | | Fix assertions in AR::TestCase::AttributeMethodsTestYuki Nishijima2014-09-211-3/+3
* | | | | | | Merge pull request #16984 from chancancode/fix_16578Godfrey Chan2014-09-222-5/+16
|\ \ \ \ \ \ \
| * | | | | | | Document that the default for `rails server -b` has changedGodfrey Chan2014-09-222-5/+16
| | |_|_|/ / / | |/| | | | |