aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | Fix Active Job changelog formatting and reword a bit [ci skip]Carlos Antonio da Silva2015-01-081-24/+22
* | | Merge pull request #18397 from georgeclaghorn/enhance-job-assertionsDavid Heinemeier Hansson2015-01-073-7/+76
|\ \ \
| * | | Add :only option to assert_enqueued_jobsGeorge Claghorn2015-01-073-7/+76
|/ / /
* | | Merge pull request #16640 from mfazekas/fix_loop_in_changed_for_autosaveGodfrey Chan2015-01-072-4/+21
|\ \ \
| * | | Fix potenital stack level too deep with autosave or validationMiklos Fazkeas2015-01-042-4/+21
* | | | Merge pull request #18377 from brainopia/custom_connection_with_countSean Griffin2015-01-072-1/+8
|\ \ \ \ | |_|_|/ |/| | |
| * | | Fix count on a separate connection (fixes #18359)brainopia2015-01-082-1/+8
* | | | Merge pull request #18378 from shunsukeaida/avoid_orm_being_humanized_in_gene...Carlos Antonio da Silva2015-01-072-2/+2
|\ \ \ \
| * | | | acronyms like ORM should be in uppercase, so overwrite the desc generated by ...shunsukeaida2015-01-072-2/+2
* | | | | Move changelog entry to the top [ci skip]Carlos Antonio da Silva2015-01-071-7/+5
| |/ / / |/| | |
* | | | Merge pull request #18074 from caike/masterRafael Mendonça França2015-01-069-38/+58
|\ \ \ \ | |_|_|/ |/| | |
| * | | Add mailer suffix to generated files and classesCarlos Souza2015-01-069-38/+58
* | | | Use Ruby's #include? to avoid relying on AS extensionCarlos Antonio da Silva2015-01-061-1/+1
* | | | Merge pull request #18368 from kuldeepaggarwal/fix-attribute-scopeCarlos Antonio da Silva2015-01-061-3/+1
|\ \ \ \
| * | | | fix `attribute` method scoping(i.e. private)Kuldeep Aggarwal2015-01-061-3/+1
* | | | | Merge pull request #18370 from LindseyB/patch-1Guillermo Iguaran2015-01-061-1/+1
|\ \ \ \ \
| * | | | | Changing sets -> set Lindsey Bieda2015-01-061-1/+1
|/ / / / /
* | | | | Merge pull request #18335 from georgeclaghorn/day-gymnasticsDavid Heinemeier Hansson2015-01-063-17/+151
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Add #prev_day and #next_day as counterparts to #yesterday and #tomorrow for D...George Claghorn2015-01-063-6/+31
| * | | | Add same_time option to #prev_week and #next_week for Date, Time, and DateTimeGeorge Claghorn2015-01-063-17/+42
| * | | | Add #on_weekend?, #next_weekday, and #prev_weekday methods to Date, Time, and...George Claghorn2015-01-063-0/+84
* | | | | Merge pull request #18366 from codeodor/patch-1Rafael Mendonça França2015-01-061-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Add log_level options to configuration guideSammy Larbi2015-01-061-1/+1
|/ / / /
* | | | Merge pull request #18362 from georgemillo/attributeRafael Mendonça França2015-01-061-3/+2
|\ \ \ \
| * | | | replacing 'attribute' method with an aliasGeorge Millo2015-01-061-3/+2
| |/ / /
* | | | Merge pull request #18364 from prathamesh-sonpatki/ar-changelog-typosAbdelkader Boudih2015-01-061-5/+5
|\ \ \ \
| * | | | Fixed typos and wording in ActiveRecord CHANGELOG [ci skip]Prathamesh Sonpatki2015-01-061-5/+5
|/ / / /
* | | | Merge pull request #18358 from prathamesh-sonpatki/add-test-for-non-string-la...Yves Senn2015-01-064-1/+12
|\ \ \ \ | |/ / / |/| | |
| * | | Fix lookup of fixtures with non-string labelPrathamesh Sonpatki2015-01-064-1/+13
|/ / /
* | | Merge pull request #18354 from simi/improve-request-forgery-documentationDavid Heinemeier Hansson2015-01-051-3/+3
|\ \ \
| * | | Improve protect_from_forgery documentation. [ci skip].Josef Šimánek2015-01-061-3/+3
* | | | Merge pull request #18356 from georgemillo/singularizeRafael Mendonça França2015-01-051-2/+2
|\ \ \ \
| * | | | removing unecessary parameter in private methodGeorge Millo2015-01-061-2/+2
* | | | | Merge pull request #18355 from georgemillo/docsSean Griffin2015-01-051-0/+3
|\ \ \ \ \
| * | | | | adding documentation for 'remove_possible_method' and 'redefine_method' [ci s...George Millo2015-01-051-0/+3
| |/ / / /
* | | | | Merge pull request #18350 from brainopia/fix_build_from_bind_valuesSean Griffin2015-01-052-2/+12
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Correctly fetch bind_values from join in subquerybrainopia2015-01-062-2/+12
* | | | | Define attribute methods before attempting to populate recordsSean Griffin2015-01-051-1/+1
* | | | | Whitespace fixes from #18349Sean Griffin2015-01-051-2/+1
* | | | | Merge pull request #18349 from jdelStrother/primarykeylessSean Griffin2015-01-052-1/+23
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix rollback of primarykey-less tablesJonathan del Strother2015-01-052-1/+23
* | | | | Avoid changing the global state on the testsRafael Mendonça França2015-01-051-1/+6
* | | | | Merge pull request #17676 from tigrish/fix_custom_i18n_exception_handler_regr...Rafael Mendonça França2015-01-052-6/+27
|\ \ \ \ \
| * | | | | Fix I18n regression introduced by #13832Christopher Dell2014-11-192-6/+27
* | | | | | Merge pull request #17720 from rzane/firebird-test-supportRafael Mendonça França2015-01-055-21/+28
|\ \ \ \ \ \
| * | | | | | Add firebird support to test suiteRay Zane2015-01-055-21/+28
|/ / / / / /
* | | | | | Merge pull request #18344 from jonatack/patch-1Rafael Mendonça França2015-01-051-5/+5
|\ \ \ \ \ \
| * | | | | | Clean up secure_token_testJon Atack2015-01-051-5/+5
* | | | | | | Merge pull request #18345 from mtthgn/patch-1Rafael Mendonça França2015-01-051-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Fix TypeError in Fixture creationMatt Hogan2015-01-051-1/+1
|/ / / / / /