| Commit message (Expand) | Author | Age | Files | Lines |
* | Add turbolinks as development dependency | Rafael Mendonça França | 2012-10-04 | 1 | -0/+1 |
* | Remove unneeded CHANGELOG entry. | Rafael Mendonça França | 2012-10-04 | 1 | -3/+0 |
* | Merge pull request #7847 from bloudermilk/recursive_permit | David Heinemeier Hansson | 2012-10-04 | 3 | -0/+15 |
|\ |
|
| * | ActionController::Parameters#permit! is recursive | Brendan Loudermilk | 2012-10-04 | 3 | -0/+15 |
* | | Do not set removed option | Rafael Mendonça França | 2012-10-04 | 1 | -1/+0 |
* | | Turn turbolinks on by default for new apps | David Heinemeier Hansson | 2012-10-04 | 3 | -4/+11 |
|/ |
|
* | Merge pull request #7833 from frodsan/extract_ap_pages_actions_caching | Rafael Mendonça França | 2012-10-04 | 8 | -1138/+65 |
|\ |
|
| * | add an entry about AP page and action extraction in the upgrading guide [ci s... | Francesco Rodriguez | 2012-10-04 | 1 | -0/+7 |
| * | add CHANGELOG entry for AP page and action caching extraction [ci skip] | Francesco Rodriguez | 2012-10-04 | 1 | -0/+11 |
| * | rename page_cache_extension option to default_static_extension | Francesco Rodriguez | 2012-10-03 | 3 | -11/+28 |
| * | extract AP Page and Action caching to actionpack-deprecated_caching gem | Francesco Rodriguez | 2012-10-03 | 5 | -1138/+30 |
* | | Merge pull request #7846 from ahaymond/master | Rafael Mendonça França | 2012-10-04 | 1 | -2/+2 |
|\ \ |
|
| * | | Update activerecord/lib/active_record/persistence.rb | Adam Haymond | 2012-10-04 | 1 | -2/+2 |
|/ / |
|
* | | Merge pull request #7769 from rgarver/feature/public-fragment_name_with_digest | David Heinemeier Hansson | 2012-10-04 | 1 | -11/+12 |
|\ \ |
|
| * | | Add nodoc to now public fragment_name_with_digest | Ryan Garver | 2012-10-04 | 1 | -0/+1 |
| * | | Merge branch 'master' into feature/public-fragment_name_with_digest | Ryan Garver | 2012-10-04 | 14 | -10/+122 |
| |\ \
| |/ /
|/| | |
|
* | | | Fix CHANGELOG entry [ci skip] | Rafael Mendonça França | 2012-10-04 | 1 | -4/+4 |
* | | | Merge pull request #6978 from frodsan/count_nosql_unsaved_parent | Rafael Mendonça França | 2012-10-03 | 5 | -0/+37 |
|\ \ \
| |_|/
|/| | |
|
| * | | Count returns 0 without querying if parent is not saved | Francesco Rodriguez | 2012-10-03 | 5 | -0/+37 |
|/ / |
|
* | | Refactor | Santiago Pastorino | 2012-10-03 | 1 | -5/+4 |
* | | Use the `flat_map` method. | Rafael Mendonça França | 2012-10-03 | 1 | -2/+2 |
* | | Revert "Merge pull request #7826 from sikachu/master-validators-kind" | Rafael Mendonça França | 2012-10-02 | 3 | -32/+1 |
* | | Don't use tap in this case. | Rafael Mendonça França | 2012-10-02 | 1 | -5/+7 |
* | | Merge pull request #7826 from sikachu/master-validators-kind | Rafael Mendonça França | 2012-10-02 | 3 | -1/+30 |
|\ \ |
|
| * | | Make `.validators_on` accept `:kind` option | Prem Sichanugrist | 2012-10-02 | 3 | -1/+30 |
* | | | Merge pull request #7825 from sikachu/master-rails-pathname | Rafael Mendonça França | 2012-10-02 | 3 | -2/+12 |
|\ \ \
| |/ /
|/| | |
|
| * | | Make Rails.public_path return a Pathname | Prem Sichanugrist | 2012-10-02 | 3 | -2/+12 |
|/ / |
|
* | | Merge pull request #6952 from NZKoz/key_generator | Michael Koziarski | 2012-10-02 | 5 | -1/+67 |
|\ \ |
|
| * | | Provide access to the application's KeyGenerator | Michael Koziarski | 2012-10-01 | 2 | -1/+11 |
| * | | Add ActiveSupport::KeyGenerator as a simple wrapper around PBKDF2 | Michael Koziarski | 2012-10-01 | 3 | -0/+56 |
| | * | Merge branch 'master' into feature/public-fragment_name_with_digest | Ryan Garver | 2012-10-02 | 92 | -650/+1086 |
| | |\
| |_|/
|/| | |
|
* | | | fix warning: method redefined | kennyj | 2012-10-02 | 2 | -2/+2 |
* | | | Merge pull request #7822 from lulalala/reset-counter-cache-for-has-many-through | Rafael Mendonça França | 2012-10-02 | 5 | -4/+28 |
|\ \ \ |
|
| * | | | Fix reset_counters() crashing on has_many :through associations. | lulalala | 2012-10-02 | 5 | -4/+28 |
* | | | | Merge pull request #7636 from steveklabnik/issue_5660 | Rafael Mendonça França | 2012-10-01 | 3 | -3/+21 |
|\ \ \ \ |
|
| * | | | | Failsafe exception returns text/plain. | Steve Klabnik | 2012-10-01 | 3 | -3/+21 |
|/ / / / |
|
* | | | | Merge pull request #7708 from bdurand/optimize_log_subscribers | Rafael Mendonça França | 2012-10-01 | 5 | -14/+28 |
|\ \ \ \
| |/ / /
|/| | | |
|
| * | | | Merge branch 'optimize_log_subscribers' of github.com:bdurand/rails into opti... | Brian Durand | 2012-09-30 | 0 | -0/+0 |
| |\ \ \ |
|
| | * | | | Fix ActionMailer::LogSubscriber to use the correct log level check. | Brian Durand | 2012-09-19 | 1 | -2/+2 |
| | * | | | Optimize log subscribers to check if the log level is sufficient before perfo... | Brian Durand | 2012-09-19 | 4 | -14/+26 |
| * | | | | Optimize log subscribers to check if the log level is sufficient before perfo... | Brian Durand | 2012-09-30 | 5 | -14/+28 |
| |/ / / |
|
* | | | | Add the CHANGELOG entry that Guillermo forgot :P | Santiago Pastorino | 2012-10-02 | 1 | -0/+5 |
* | | | | Merge pull request #7794 from guilleiguaran/extract-rack-cache | Santiago Pastorino | 2012-10-01 | 5 | -1/+16 |
|\ \ \ \ |
|
| * | | | | Add rack-cache to default Gemfile | Guillermo Iguaran | 2012-10-01 | 2 | -0/+9 |
| * | | | | Use Rack::Cache middleware only if is in Gemfile | Guillermo Iguaran | 2012-10-01 | 3 | -1/+7 |
* | | | | | Merge pull request #7797 from senny/7459_prefix_tempalte_assertion_variables | Rafael Mendonça França | 2012-10-01 | 3 | -23/+29 |
|\ \ \ \ \ |
|
| * | | | | | prefix TemplateAssertions ivars (#7459) | Yves Senn | 2012-10-01 | 3 | -23/+29 |
* | | | | | | New CHANGELOG entries always in the top | Rafael Mendonça França | 2012-10-01 | 1 | -2/+2 |
|/ / / / / |
|
* | | | | | Merge pull request #7789 from senny/7777_resource_functions_modify_options | Rafael Mendonça França | 2012-10-01 | 3 | -2/+27 |
|\ \ \ \ \ |
|
| * | | | | | resource and resources do no longer modify passed options | Yves Senn | 2012-10-01 | 3 | -2/+27 |
|/ / / / / |
|