aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Remove unneeded CHANGELOG entry.Rafael Mendonça França2012-10-041-3/+0
* Merge pull request #7847 from bloudermilk/recursive_permitDavid Heinemeier Hansson2012-10-043-0/+15
|\
| * ActionController::Parameters#permit! is recursiveBrendan Loudermilk2012-10-043-0/+15
* | Do not set removed optionRafael Mendonça França2012-10-041-1/+0
* | Turn turbolinks on by default for new appsDavid Heinemeier Hansson2012-10-043-4/+11
|/
* Merge pull request #7833 from frodsan/extract_ap_pages_actions_cachingRafael Mendonça França2012-10-048-1138/+65
|\
| * add an entry about AP page and action extraction in the upgrading guide [ci s...Francesco Rodriguez2012-10-041-0/+7
| * add CHANGELOG entry for AP page and action caching extraction [ci skip]Francesco Rodriguez2012-10-041-0/+11
| * rename page_cache_extension option to default_static_extensionFrancesco Rodriguez2012-10-033-11/+28
| * extract AP Page and Action caching to actionpack-deprecated_caching gemFrancesco Rodriguez2012-10-035-1138/+30
* | Merge pull request #7846 from ahaymond/masterRafael Mendonça França2012-10-041-2/+2
|\ \
| * | Update activerecord/lib/active_record/persistence.rbAdam Haymond2012-10-041-2/+2
|/ /
* | Merge pull request #7769 from rgarver/feature/public-fragment_name_with_digestDavid Heinemeier Hansson2012-10-041-11/+12
|\ \
| * | Add nodoc to now public fragment_name_with_digestRyan Garver2012-10-041-0/+1
| * | Merge branch 'master' into feature/public-fragment_name_with_digestRyan Garver2012-10-0414-10/+122
| |\ \ | |/ / |/| |
* | | Fix CHANGELOG entry [ci skip]Rafael Mendonça França2012-10-041-4/+4
* | | Merge pull request #6978 from frodsan/count_nosql_unsaved_parentRafael Mendonça França2012-10-035-0/+37
|\ \ \ | |_|/ |/| |
| * | Count returns 0 without querying if parent is not savedFrancesco Rodriguez2012-10-035-0/+37
|/ /
* | RefactorSantiago Pastorino2012-10-031-5/+4
* | Use the `flat_map` method.Rafael Mendonça França2012-10-031-2/+2
* | Revert "Merge pull request #7826 from sikachu/master-validators-kind"Rafael Mendonça França2012-10-023-32/+1
* | Don't use tap in this case.Rafael Mendonça França2012-10-021-5/+7
* | Merge pull request #7826 from sikachu/master-validators-kindRafael Mendonça França2012-10-023-1/+30
|\ \
| * | Make `.validators_on` accept `:kind` optionPrem Sichanugrist2012-10-023-1/+30
* | | Merge pull request #7825 from sikachu/master-rails-pathnameRafael Mendonça França2012-10-023-2/+12
|\ \ \ | |/ / |/| |
| * | Make Rails.public_path return a PathnamePrem Sichanugrist2012-10-023-2/+12
|/ /
* | Merge pull request #6952 from NZKoz/key_generatorMichael Koziarski2012-10-025-1/+67
|\ \
| * | Provide access to the application's KeyGeneratorMichael Koziarski2012-10-012-1/+11
| * | Add ActiveSupport::KeyGenerator as a simple wrapper around PBKDF2Michael Koziarski2012-10-013-0/+56
| | * Merge branch 'master' into feature/public-fragment_name_with_digestRyan Garver2012-10-0292-650/+1086
| | |\ | |_|/ |/| |
* | | fix warning: method redefinedkennyj2012-10-022-2/+2
* | | Merge pull request #7822 from lulalala/reset-counter-cache-for-has-many-throughRafael Mendonça França2012-10-025-4/+28
|\ \ \
| * | | Fix reset_counters() crashing on has_many :through associations.lulalala2012-10-025-4/+28
* | | | Merge pull request #7636 from steveklabnik/issue_5660Rafael Mendonça França2012-10-013-3/+21
|\ \ \ \
| * | | | Failsafe exception returns text/plain.Steve Klabnik2012-10-013-3/+21
|/ / / /
* | | | Merge pull request #7708 from bdurand/optimize_log_subscribersRafael Mendonça França2012-10-015-14/+28
|\ \ \ \ | |/ / / |/| | |
| * | | Merge branch 'optimize_log_subscribers' of github.com:bdurand/rails into opti...Brian Durand2012-09-300-0/+0
| |\ \ \
| | * | | Fix ActionMailer::LogSubscriber to use the correct log level check.Brian Durand2012-09-191-2/+2
| | * | | Optimize log subscribers to check if the log level is sufficient before perfo...Brian Durand2012-09-194-14/+26
| * | | | Optimize log subscribers to check if the log level is sufficient before perfo...Brian Durand2012-09-305-14/+28
| |/ / /
* | | | Add the CHANGELOG entry that Guillermo forgot :PSantiago Pastorino2012-10-021-0/+5
* | | | Merge pull request #7794 from guilleiguaran/extract-rack-cacheSantiago Pastorino2012-10-015-1/+16
|\ \ \ \
| * | | | Add rack-cache to default GemfileGuillermo Iguaran2012-10-012-0/+9
| * | | | Use Rack::Cache middleware only if is in GemfileGuillermo Iguaran2012-10-013-1/+7
* | | | | Merge pull request #7797 from senny/7459_prefix_tempalte_assertion_variablesRafael Mendonça França2012-10-013-23/+29
|\ \ \ \ \
| * | | | | prefix TemplateAssertions ivars (#7459)Yves Senn2012-10-013-23/+29
* | | | | | New CHANGELOG entries always in the topRafael Mendonça França2012-10-011-2/+2
|/ / / / /
* | | | | Merge pull request #7789 from senny/7777_resource_functions_modify_optionsRafael Mendonça França2012-10-013-2/+27
|\ \ \ \ \
| * | | | | resource and resources do no longer modify passed optionsYves Senn2012-10-013-2/+27
|/ / / / /
* | | | | Merge pull request #7813 from arunagw/warning_fixed_asRafael Mendonça França2012-10-011-1/+1
|\ \ \ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-01 06:10:29 +0000