| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | 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. | ||||
| | | * | Fix reset_counters() crashing on has_many :through associations. | lulalala | 2012-10-02 | 5 | -4/+28 |
| | | | | | | | | | | | | | | | | The counter column name in the intermediate model need to be access via the through reflection. | ||||
| | * | | Merge pull request #7636 from steveklabnik/issue_5660 | Rafael Mendonça França | 2012-10-01 | 3 | -3/+21 |
| | |\ \ | | | | | | | | | Fixes issue #5660: Failsafe exception returns text/html and text/plain. | ||||
| | | * | | Failsafe exception returns text/plain. | Steve Klabnik | 2012-10-01 | 3 | -3/+21 |
| | |/ / | | | | | | | | | | | | | | | | | | | It's best to just return text/plain when something has gone terribly wrong. Fixes #5660. | ||||
| | * | | Merge pull request #7708 from bdurand/optimize_log_subscribers | Rafael Mendonça França | 2012-10-01 | 5 | -14/+28 |
| | |\ \ | | |/ | |/| | Optimize log subscribers to check if the log level is sufficient | ||||
| | | * | Merge branch 'optimize_log_subscribers' of github.com:bdurand/rails into ↵ | Brian Durand | 2012-09-30 | 0 | -0/+0 |
| | | |\ | | | | | | | | | | | | | optimize_log_subscribers | ||||
| | | | * | 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 ↵ | Brian Durand | 2012-09-19 | 4 | -14/+26 |
| | | | | | | | | | | | | | | | | | performing an operations. | ||||
| | | * | | Optimize log subscribers to check if the log level is sufficient before ↵ | Brian Durand | 2012-09-30 | 5 | -14/+28 |
| | | |/ | | | | | | | | | | performing an operations. | ||||
| | * | | 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 |
| | |\ \ | | | | | | | | | Use Rack::Cache middleware only if is in Gemfile | ||||
| | | * | | 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. Closes #7459 | ||||
| | | * | | | 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 | ||||
| | | * | | | resource and resources do no longer modify passed options | Yves Senn | 2012-10-01 | 3 | -2/+27 |
| | |/ / / | | | | | | | | | | | | | this is a patch for #7777. | ||||
| | * | | | Merge pull request #7813 from arunagw/warning_fixed_as | Rafael Mendonça França | 2012-10-01 | 1 | -1/+1 |
| | |\ \ \ | | | | | | | | | | | warning fixed: (...) interpreted as grouped expression | ||||
| | | * | | | warning fixed: (...) interpreted as grouped expression | Arun Agrawal | 2012-10-01 | 1 | -1/+1 |
| | |/ / / | |||||
| | * | | | Merge pull request #7812 from bdurand/optimize_cache_entry_take_2 | Jeremy Kemper | 2012-09-30 | 2 | -3/+3 |
| | |\ \ \ | | | | | | | | | | | fix broken cache tests | ||||
| | | * | | | fix broken cache tests | Brian Durand | 2012-09-30 | 2 | -3/+3 |
| | |/ / / | |||||
| | * | | | Merge pull request #7811 from iHiD/resource_generator_routes_master | Santiago Pastorino | 2012-09-30 | 1 | -1/+1 |
| | |\ \ \ | | | | | | | | | | | Fix the build (Broken scaffold routes test) | ||||
| | | * | | | Fix broken scaffold routes test | Jeremy Walker | 2012-10-01 | 1 | -1/+1 |
| | |/ / / | |||||
| | * | | | Merge pull request #7810 from steveklabnik/fix_build | Jeremy Kemper | 2012-09-30 | 1 | -0/+1 |
| | |\ \ \ | | | | | | | | | | | fix cache store test | ||||
| | | * | | | fix cache store test | Steve Klabnik | 2012-09-30 | 1 | -0/+1 |
| | |/ / / | | | | | | | | | | | | | Pull #7800 broke the build, this should fix it. | ||||
| | * | | | Merge pull request #6450 from iHiD/resource_generator_routes_master | Rafael Mendonça França | 2012-09-30 | 2 | -6/+115 |
| | |\ \ \ | | | | | | | | | | | Master branch: Fixed generated whitespace in routes when using namespaced resource. | ||||
| | | * | | | Fixed generated whitespace in routes when using namespaced resource. | Jeremy Walker | 2012-09-29 | 2 | -6/+115 |
| | | | | | | |||||
| | * | | | | Add a changelog entry for asset aliasing update in sprockets-rails. Supports ↵ | Jeremy Kemper | 2012-09-30 | 1 | -0/+14 |
| | | | | | | | | | | | | | | | | | | | | | referencing foo.js as foo/index.js and vice versa. | ||||
| | * | | | | Merge pull request #7808 from steveklabnik/fix_assertion_order | Xavier Noria | 2012-09-30 | 1 | -5/+5 |
| | |\ \ \ \ | | | | | | | | | | | | | Fix other assertions that were backwards. | ||||
| | | * | | | | Fix other assertions that were backwards. | Steve Klabnik | 2012-09-30 | 1 | -5/+5 |
| | |/ / / / | | | | | | | | | | | | | | | | This time I used ack. | ||||
| | * | | | | Merge pull request #7805 from steveklabnik/fix_assertion_order | Xavier Noria | 2012-09-30 | 1 | -2/+2 |
| | |\ \ \ \ | | | | | | | | | | | | | fix order of assertions. | ||||
| | | * | | | | fix order of assertions. | Steve Klabnik | 2012-09-30 | 1 | -2/+2 |
| | |/ / / / | |||||
| | * | | | | Merge pull request #7800 from bdurand/optimize_cache_entry_take_2 | Xavier Noria | 2012-09-30 | 4 | -101/+141 |
| | |\ \ \ \ | | | | | | | | | | | | | Optimize ActiveSupport::Cache::Entry to reduce overhead | ||||
| | | * | | | | Optimize ActiveSupport::Cache::Entry to reduce memory and processing overhead. | Brian Durand | 2012-09-30 | 4 | -101/+141 |
| | |/ / / / | |||||
| | * | | | | Merge pull request #7795 from guilleiguaran/fix-ap-changelog | Vijay Dev | 2012-09-30 | 1 | -3/+2 |
| | |\ \ \ \ | | | | | | | | | | | | | Fix changelog entry about sprockets-rails | ||||
| | | * | | | | Fix changelog entry about sprockets-rails | Guillermo Iguaran | 2012-09-30 | 1 | -3/+2 |
| | |/ / / / | |||||
| | * | | | | Merge pull request #7791 from acapilleri/build_association | Rafael Mendonça França | 2012-09-29 | 1 | -5/+3 |
| | |\ \ \ \ | | | | | | | | | | | | | small refactoring of build_relation in uniqueness | ||||
| | | * | | | | small refactoring of build_relation in uniqueness | Angelo Capilleri | 2012-09-29 | 1 | -5/+3 |
| | | | |/ / | | |/| | | | | | | | | | | | | | | | | | reflection init as 'if' stantment. column is always the same expression and depends from the changing of attributes | ||||
| | * | | | | Whitespaces :scissors: [ci skip] | Rafael Mendonça França | 2012-09-30 | 2 | -11/+14 |
| | | | | | | |||||
| | * | | | | Merge pull request #7659 from HugoLnx/template_error_no_matches_rebased | Rafael Mendonça França | 2012-09-29 | 4 | -5/+51 |
| | |\ \ \ \ | | |/ / / | |/| | | | REBASED: fixing assert_template bug when template matches expected, but not ends with | ||||
| | | * | | | `assert_template` no more passing with what ever string that matches. | Hugo Roque | 2012-09-29 | 4 | -5/+51 |
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Given Im rendering an template `/layout/hello.html.erb`, assert_template was passing with any string that matches. This behavior allowed false passing like: assert_template "layout" assert_template "out/hello" Now the passing possibilities are: assert_template "layout/hello" assert_template "hello" fixing assert_template bug when template matches expected, but not ends with Cherry Pick Merge: Fixes issue #3849 assert_template false positive taking redundant test off prevening incorrect assert_template when rendering with repeated names in path updating CHANGELOG with bugfix: assert_template false passing | ||||
| | * | | | Merge pull request #7784 from morgoth/proper_test_names_for_assertions | Rafael Mendonça França | 2012-09-28 | 1 | -2/+2 |
| | |\ \ \ | | |/ / | |/| | | Changed test names to match proper context | ||||
| | | * | | Changed test names to match proper context | Wojciech Wnętrzak | 2012-09-28 | 1 | -2/+2 |
| | | | | | |||||
| | * | | | Merge pull request #7787 from sferik/update_minitest | Jeremy Kemper | 2012-09-28 | 1 | -1/+1 |
| | |\ \ \ | | | | | | | | | | | Update minitest dependency to ~> 4.0 | ||||
| | | * | | | Update minitest dependency to ~> 4.0 | Erik Michaels-Ober | 2012-09-28 | 1 | -1/+1 |
| | |/ / / | |||||
| | * | | | Merge pull request #7783 from guilleiguaran/namespace-assets-cache-store | Santiago Pastorino | 2012-09-28 | 3 | -3/+6 |
| | |\ \ \ | | | | | | | | | | | Assets cache shouldn't be shared between different environments | ||||
| | | * | | | Assets cache shouldn't be shared between different environments | Guillermo Iguaran | 2012-09-28 | 3 | -3/+6 |
| | | | | | | |||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |