aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | 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
|\ \ | | | | | | Add ActiveSupport::KeyGenerator as a simple wrapper around PBKDF2
| * | Provide access to the application's KeyGeneratorMichael Koziarski2012-10-012-1/+11
| | | | | | | | | | | | Available both as an env entry for rack and an instance method on Rails::Application for other uses
| * | Add ActiveSupport::KeyGenerator as a simple wrapper around PBKDF2Michael Koziarski2012-10-013-0/+56
| | | | | | | | | | | | | | | | | | This will be used to derive keys from the secret and a salt, in order to allow us to do things like encrypted cookie stores without using the secret for multiple purposes directly.
| | * 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.
| * | | Fix reset_counters() crashing on has_many :through associations.lulalala2012-10-025-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_5660Rafael Mendonça França2012-10-013-3/+21
|\ \ \ \ | | | | | | | | | | Fixes issue #5660: Failsafe exception returns text/html and text/plain.
| * | | | Failsafe exception returns text/plain.Steve Klabnik2012-10-013-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_subscribersRafael Mendonça França2012-10-015-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 Durand2012-09-300-0/+0
| |\ \ \ | | | | | | | | | | | | | | | optimize_log_subscribers
| | * | | 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 ↵Brian Durand2012-09-194-14/+26
| | | | | | | | | | | | | | | | | | | | performing an operations.
| * | | | Optimize log subscribers to check if the log level is sufficient before ↵Brian Durand2012-09-305-14/+28
| |/ / / | | | | | | | | | | | | performing an operations.
* | | | 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
|\ \ \ \ | | | | | | | | | | Use Rack::Cache middleware only if is in Gemfile
| * | | | 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. Closes #7459
| * | | | | 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 options
| * | | | | resource and resources do no longer modify passed optionsYves Senn2012-10-013-2/+27
|/ / / / / | | | | | | | | | | | | | | | this is a patch for #7777.
* | | | | Merge pull request #7813 from arunagw/warning_fixed_asRafael Mendonça França2012-10-011-1/+1
|\ \ \ \ \ | | | | | | | | | | | | warning fixed: (...) interpreted as grouped expression
| * | | | | warning fixed: (...) interpreted as grouped expressionArun Agrawal2012-10-011-1/+1
|/ / / / /
* | | | | Merge pull request #7812 from bdurand/optimize_cache_entry_take_2Jeremy Kemper2012-09-302-3/+3
|\ \ \ \ \ | | | | | | | | | | | | fix broken cache tests
| * | | | | fix broken cache testsBrian Durand2012-09-302-3/+3
|/ / / / /
* | | | | Merge pull request #7811 from iHiD/resource_generator_routes_masterSantiago Pastorino2012-09-301-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Fix the build (Broken scaffold routes test)
| * | | | | Fix broken scaffold routes testJeremy Walker2012-10-011-1/+1
|/ / / / /
* | | | | Merge pull request #7810 from steveklabnik/fix_buildJeremy Kemper2012-09-301-0/+1
|\ \ \ \ \ | | | | | | | | | | | | fix cache store test
| * | | | | fix cache store testSteve Klabnik2012-09-301-0/+1
|/ / / / / | | | | | | | | | | | | | | | Pull #7800 broke the build, this should fix it.
* | | | | Merge pull request #6450 from iHiD/resource_generator_routes_masterRafael Mendonça França2012-09-302-6/+115
|\ \ \ \ \ | |_|_|/ / |/| | | | Master branch: Fixed generated whitespace in routes when using namespaced resource.
| * | | | Fixed generated whitespace in routes when using namespaced resource.Jeremy Walker2012-09-292-6/+115
| | | | |
* | | | | Add a changelog entry for asset aliasing update in sprockets-rails. Supports ↵Jeremy Kemper2012-09-301-0/+14
| | | | | | | | | | | | | | | | | | | | referencing foo.js as foo/index.js and vice versa.
* | | | | Merge pull request #7808 from steveklabnik/fix_assertion_orderXavier Noria2012-09-301-5/+5
|\ \ \ \ \ | | | | | | | | | | | | Fix other assertions that were backwards.
| * | | | | Fix other assertions that were backwards.Steve Klabnik2012-09-301-5/+5
|/ / / / / | | | | | | | | | | | | | | | This time I used ack.
* | | | | Merge pull request #7805 from steveklabnik/fix_assertion_orderXavier Noria2012-09-301-2/+2
|\ \ \ \ \ | | | | | | | | | | | | fix order of assertions.
| * | | | | fix order of assertions.Steve Klabnik2012-09-301-2/+2
|/ / / / /
* | | | | Merge pull request #7800 from bdurand/optimize_cache_entry_take_2Xavier Noria2012-09-304-101/+141
|\ \ \ \ \ | | | | | | | | | | | | Optimize ActiveSupport::Cache::Entry to reduce overhead
| * | | | | Optimize ActiveSupport::Cache::Entry to reduce memory and processing overhead.Brian Durand2012-09-304-101/+141
|/ / / / /
* | | | | Merge pull request #7795 from guilleiguaran/fix-ap-changelogVijay Dev2012-09-301-3/+2
|\ \ \ \ \ | | | | | | | | | | | | Fix changelog entry about sprockets-rails
| * | | | | Fix changelog entry about sprockets-railsGuillermo Iguaran2012-09-301-3/+2
|/ / / / /
* | | | | Merge pull request #7791 from acapilleri/build_associationRafael Mendonça França2012-09-291-5/+3
|\ \ \ \ \ | | | | | | | | | | | | small refactoring of build_relation in uniqueness
| * | | | | small refactoring of build_relation in uniquenessAngelo Capilleri2012-09-291-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ça2012-09-302-11/+14
| | | | |
* | | | | Merge pull request #7659 from HugoLnx/template_error_no_matches_rebasedRafael Mendonça França2012-09-294-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 Roque2012-09-294-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_assertionsRafael Mendonça França2012-09-281-2/+2
|\ \ \ \ | |/ / / |/| | | Changed test names to match proper context
| * | | Changed test names to match proper contextWojciech Wnętrzak2012-09-281-2/+2
| | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-06 10:22:31 +0000