aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Default headers, removed in controller actions, will not be reapplied to the ...Jonas Baumann2015-01-093-0/+35
* Merge pull request #18416 from caike/masterRafael Mendonça França2015-01-093-6/+6
|\
| * Add _mailer suffix to i18n pathCarlos Souza2015-01-083-6/+6
* | Merge pull request #18417 from yoshiokatsuneo/active_record_connection_pool_e...Sean Griffin2015-01-091-0/+3
|\ \ | |/ |/|
| * ActiveRecord: release connection on reconnect failure.Yoshioka Tsuneo2015-01-091-0/+3
|/
* Merge pull request #18410 from seuros/ripfilterRafael Mendonça França2015-01-083-9/+37
|\
| * Deprecate all *_filter callbacks in favor of *_action callbacksAbdelkader Boudih2015-01-083-9/+37
|/
* Merge pull request #18404 from claudiob/rebase-14549Rafael Mendonça França2015-01-082-0/+44
|\
| * Add test/doc for :if/:except in skip_before_actionclaudiob2015-01-082-2/+24
| * Add test case and documentation for skip_before_filter.Lauro Caetano2015-01-082-0/+22
* | Fix the example (for realz)David Heinemeier Hansson2015-01-081-1/+1
* | Fix the exampleDavid Heinemeier Hansson2015-01-081-1/+1
* | Merge pull request #18334 from simi/prepend-false-for-protect-from-forgeryDavid Heinemeier Hansson2015-01-083-1/+91
|\ \
| * | Add prepend option to protect_from_forgery.Josef Šimánek2015-01-083-1/+91
|/ /
* | Merge pull request #18371 from brainopia/remove_hide_actionsDavid Heinemeier Hansson2015-01-085-93/+7
|\ \
| * | Remove ActionController::HideActions (closes #18336)brainopia2015-01-065-93/+7
* | | Document has_many :extend optionCaleb Thompson2015-01-081-0/+4
| |/ |/|
* | Merge pull request #18403 from georgeclaghorn/enqueued-email-assertionsDavid Heinemeier Hansson2015-01-085-2/+144
|\ \
| * | Add assert_enqueued_emails and assert_no_enqueued_emailsGeorge Claghorn2015-01-083-0/+115
| * | Add :only option to assert_no_enqueued_jobsGeorge Claghorn2015-01-082-2/+29
|/ /
* | 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
|\ \ \