aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* formatting pass over CHANGELOGs. [ci skip]Yves Senn2015-01-104-6/+12
* Remove note about supported plugins from the releasing docsCarlos Antonio da Silva2015-01-091-11/+0
* Remove support for the protected attributes gemCarlos Antonio da Silva2015-01-092-10/+6
* Merge pull request #18347 from robertomiranda/has_secure_token_base62Guillermo Iguaran2015-01-092-32/+8
|\
| * Switch Secure Token generation to Base58robertomiranda2015-01-092-32/+8
* | Merge pull request #10690 from robertomiranda/remove_mass_assignment_securityGuillermo Iguaran2015-01-091-7/+0
|\ \
| * | Remove attributes_protected_by_default reference, since MassAssignmentSecurit...robertomiranda2015-01-091-7/+0
* | | Add missing requireGuillermo Iguaran2015-01-091-0/+2
| |/ |/|
* | Add SecureRandom.base58Guillermo Iguaran2015-01-093-0/+45
|/
* Merge pull request #18426 from arthurnn/txn_refGodfrey Chan2015-01-091-3/+3
|\
| * Copy records to parent transaction should happen on TransactionManagerArthur Neves2015-01-091-3/+3
* | Merge pull request #18425 from arthurnn/kargs_transactionRafael Mendonça França2015-01-092-5/+5
|\|
| * Use keyword args on committed! and rolledback!Arthur Neves2015-01-092-5/+5
|/
* Properly copy nested bind values from subqueried relationsSean Griffin2015-01-092-12/+22
* Properly persist `lock_version` as 0 if the DB has no defaultSean Griffin2015-01-092-7/+13
* Merge pull request #18390 from tgxworld/parallel_bundle_installRafael Mendonça França2015-01-091-1/+1
|\
| * Use parallel bundler install.Guo Xiang Tan2015-01-101-1/+1
* | Merge pull request #18413 from brainopia/automatic_inverse_of_for_belongs_toDavid Heinemeier Hansson2015-01-095-31/+70
|\ \
| * | Drop old test locations from `rake stats`brainopia2015-01-093-6/+8
| * | Update `rake counts` to count declarative tests in minitestbrainopia2015-01-093-25/+62
* | | Merge pull request #18423 from jone/remove-default-headerYves Senn2015-01-093-0/+35
|\ \ \
| * | | 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