| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge pull request #10158 from steveklabnik/issue_10125 | Steve Klabnik | 2013-04-09 | 2 | -2/+19 |
| |\ | | | | | Fix inflector to respect default locale. | ||||
| | * | Fix inflector to respect default locale. | Nick Cox | 2013-04-10 | 2 | -2/+19 |
| | | | | | | | | | | | | | | | | | The inflector was made aware of locales in 7db0b073fec6bc3e6f213b58c76e7f43fcc2ab97, but it defaulted to :en. That should actually be our default locale instead. Fixes #10125 | ||||
| * | | Merge pull request #10156 from wangjohn/grouping_thread_locals | Jeremy Kemper | 2013-04-09 | 9 | -19/+92 |
| |\ \ | |/ |/| | Grouping thread locals in ActiveRecord | ||||
| | * | Changed the ScopeRegistry and the InstrumentationRegistry to use the | wangjohn | 2013-04-09 | 3 | -13/+12 |
| | | | | | | | | | PerThreadRegistry module. | ||||
| | * | Created a runtime registry for thread local variables in active record. | wangjohn | 2013-04-09 | 5 | -6/+39 |
| | | | |||||
| | * | Creating a module so that per thread registries can be easily created as | wangjohn | 2013-04-09 | 1 | -0/+41 |
| |/ | | | | thread local variables. | ||||
| * | Explain how to upgrade bin/ for Rails 4 | Jeremy Kemper | 2013-04-09 | 1 | -8/+29 |
| | | |||||
| * | Merge pull request #10154 from killthekitten/fix_template_error_header | Carlos Antonio da Silva | 2013-04-09 | 1 | -1/+1 |
| |\ | | | | | Use camelize instead of capitalize on template error screen | ||||
| | * | Use camelize instead of capitalize on error screen | Nikolay Shebanov | 2013-04-10 | 1 | -1/+1 |
| | | | |||||
| * | | Merge pull request #10103 from ↵ | Steve Klabnik | 2013-04-09 | 2 | -118/+238 |
| |\ \ | |/ |/| | | | | | senny/get_action_mailer_guide_ready_for_prime_time Get Action Mailer guide ready for prime time [ci skip] | ||||
| | * | get the Action Mailer guide ready. [ci skip] | Yves Senn | 2013-04-09 | 2 | -118/+238 |
| | | | |||||
| * | | copy-edit pass in AM changelog [ci skip] | Xavier Noria | 2013-04-09 | 1 | -9/+11 |
| | | | |||||
| * | | Merge pull request #9843 from indirect/rails_bin | Rafael Mendonça França | 2013-04-09 | 1 | -10/+20 |
| |\ \ | | | | | | | Rails 4 prints help for "rails new" when running "rails console" | ||||
| | * | | fix binstub typo | Andre Arko | 2013-03-30 | 1 | -1/+1 |
| | | | | |||||
| | * | | need to delete bin, not binstub, update wording | Andre Arko | 2013-03-27 | 1 | -4/+4 |
| | | | | |||||
| | * | | script/rails could never be from bundler | Andre Arko | 2013-03-27 | 1 | -1/+1 |
| | | | | |||||
| | * | | rails commands even if bin/rails is a gem stub | Andre Arko | 2013-03-20 | 1 | -10/+20 |
| | | | | |||||
| * | | | Fix typo | Rafael Mendonça França | 2013-04-09 | 1 | -2/+2 |
| | | | | |||||
| * | | | Merge pull request #10153 from choudhuryanupam/master | Rafael Mendonça França | 2013-04-09 | 1 | -4/+0 |
| |\ \ \ | | | | | | | | | Removed unused setup | ||||
| | * | | | Removed unused setup | Anupam Choudhury | 2013-04-09 | 1 | -4/+0 |
| |/ / / | |||||
| * | | | Merge pull request #10142 from wangjohn/grouping_thread_locals | Rafael Mendonça França | 2013-04-09 | 2 | -9/+16 |
| |\ \ \ | | | | | | | | | Delegating the value getter and setters in the ScopeRegistry | ||||
| | * | | | Delegating the value getter and setters in the ScopeRegistry to the | wangjohn | 2013-04-08 | 2 | -9/+16 |
| | | | | | | | | | | | | | | | | | current ScopeRegister object. | ||||
| * | | | | Merge pull request #10151 from neerajdotname/ar-to-klass | Rafael Mendonça França | 2013-04-09 | 4 | -12/+12 |
| |\ \ \ \ | | | | | | | | | | | changed variable name active_record => base_klass | ||||
| | * | | | | changed variable name active_record => base_klass | Neeraj Singh | 2013-04-09 | 4 | -12/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Current code stores the klass name in active_record and this is used throughout. While reviewing the code time and again I had the mental picture of active_record being an instance of a klass. However here the actual klass is being stored in @active_record. Secondly at two different places while referring to @active_record the comment refers to it as base klass. All this points to active_record being not the best variable name. So I thought it is better to replace active_record with base_klass. This change is confined to JoinDependency, JoinBase, JoinPart and JoinAssociation - all joining related work. | ||||
| * | | | | | Merge pull request #10138 from hbakhtiyor/test-dirs-environment | Rafael Mendonça França | 2013-04-09 | 1 | -2/+3 |
| |\ \ \ \ \ | |/ / / / |/| | | | | Add TEST_DIRS enviroment for constrain test directories in rakefile | ||||
| | * | | | | Add TEST_DIRS enviroment for constrain test directories in rakefile | Abd ar-Rahman Hamidi | 2013-04-08 | 1 | -2/+3 |
| | | | | | | |||||
| * | | | | | Merge pull request #10148 from vipulnsward/traces_change | Carlos Antonio da Silva | 2013-04-09 | 1 | -6/+4 |
| |\ \ \ \ \ | | | | | | | | | | | | | change array of array to hash | ||||
| | * | | | | | change array of array to hash | Vipul A M | 2013-04-09 | 1 | -6/+4 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #10147 from vipulnsward/fix_AP_live_warning | Carlos Antonio da Silva | 2013-04-08 | 2 | -1/+2 |
| |\ \ \ \ \ \ | |/ / / / / |/| | | | | | fix AP warning; remove unused variable | ||||
| | * | | | | | fix AP warning; remove unused variable | Vipul A M | 2013-04-09 | 2 | -1/+2 |
| |/ / / / / | |||||
| * | | | | | Merge pull request #10145 from wangjohn/instrumentation_registry_creation | Rafael Mendonça França | 2013-04-08 | 1 | -1/+27 |
| |\ \ \ \ \ | | | | | | | | | | | | | Consolidating thread locals in AS::Notifications | ||||
| | * | | | | | Creating an object to consolidate thread locals which hold the | wangjohn | 2013-04-08 | 1 | -1/+27 |
| |/ / / / / | | | | | | | | | | | | | | | | instrumenters for the AS::Notifications module. | ||||
| * | | | | | Merge pull request #10143 from Agis-/mark_unused_vars | Rafael Mendonça França | 2013-04-08 | 9 | -13/+13 |
| |\ \ \ \ \ | |_|/ / / |/| | | | | Mark unused variables and make some style fixes | ||||
| | * | | | | Mark unused variables and make some style fixes | Agis Anastasopoulos | 2013-04-08 | 9 | -13/+13 |
| |/ / / / | | | | | | | | | | | | | It'd be a nice convention to mark the unused variables like this, now that Ruby 2 will issue no warnings for such vars being unused. | ||||
| * | | | | Merge pull request #10135 from wangjohn/grouping_thread_locals | Rafael Mendonça França | 2013-04-08 | 3 | -6/+57 |
| |\ \ \ \ | | | | | | | | | | | Grouping thread locals in the ActiveRecord scopes | ||||
| | * | | | | Grouping thread locals in the ActiveRecord scopes so that the | wangjohn | 2013-04-08 | 3 | -6/+57 |
| |/ / / / | | | | | | | | | | | | | | | | | current_scope and ignore_default_scope locals are brought together under a registry object. | ||||
| * | | | | Merge pull request #9604 from sgrif/live_streaming_exceptions | Rafael Mendonça França | 2013-04-08 | 2 | -1/+103 |
| |\ \ \ \ | | | | | | | | | | | Exceptions raised when using ActionController::Live cause server crash | ||||
| | * | | | | Exception handling for controllers using ActionController::Live | Sean Griffin | 2013-03-18 | 2 | -1/+103 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Any exceptions that occured at the view or controller level for a controller using ActionController::Live would cause the server to either hang with an open socket indefinitely, or immediately crash (depending on whether the server was launched with rails s or directly). Changed the behavior of exceptions to act the same as streaming templates for html requests, and allow for an on_error callback if needed. | ||||
| * | | | | | Merge pull request #10122 from wangjohn/adding_documentation_to_form_builder | Rafael Mendonça França | 2013-04-08 | 1 | -2/+55 |
| |\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | Added documentation to the FormBuilder class Closes #10115 | ||||
| | * | | | | Added documentation to the FormBuilder class, should help | wangjohn | 2013-04-06 | 1 | -2/+55 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | clarify issue #10115. Also made the field_helpers an explicit list of methods. | ||||
| * | | | | | Merge pull request #10130 from Agis-/patch-2 | Carlos Antonio da Silva | 2013-04-08 | 1 | -3/+3 |
| |\ \ \ \ \ | | | | | | | | | | | | | Mark unused block parameters. | ||||
| | * | | | | | Remove unused block parameters | Agis Anastasopoulos | 2013-04-07 | 1 | -3/+3 |
| | | |_|/ / | |/| | | | |||||
| * | | | | | Merge pull request #10131 from Agis-/metal_helper | Carlos Antonio da Silva | 2013-04-08 | 1 | -1/+0 |
| |\ \ \ \ \ | |/ / / / |/| | | | | Remove unecessary variable call since `sort!` always returns the sorted array | ||||
| | * | | | | Remove unecessary variable call, `#sort!` always returns an array | Agis Anastasopoulos | 2013-04-07 | 1 | -1/+0 |
| |/ / / / | |||||
| * | | | | Minor AR changelog improvements [ci skip] | Carlos Antonio da Silva | 2013-04-07 | 1 | -4/+3 |
| | | | | | |||||
| * | | | | Avoid iterating over records hash when not necessary | Carlos Antonio da Silva | 2013-04-07 | 1 | -2/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | If the reflection scope is not flagged with distinct value, there is no need to iterate over the records, so we avoid that by doing the check before iterating rather than inside the iteration block. | ||||
| * | | | | Merge pull request #10127 from vipulnsward/each_to_each_value | Carlos Antonio da Silva | 2013-04-07 | 2 | -3/+3 |
| |\ \ \ \ | | | | | | | | | | | each to each_value; remove unused vars | ||||
| | * | | | | each to each_value; remove unused vars | Vipul A M | 2013-04-07 | 2 | -3/+3 |
| |/ / / / | |||||
| * | | | | Merge pull request #10123 from ↵ | Carlos Antonio da Silva | 2013-04-06 | 1 | -3/+3 |
| |\ \ \ \ | |/ / / |/| | | | | | | | | | | | wangjohn/added_bang_to_raise_nested_attributes_method Added a bang to the raise_nested_attributes_record_not_found method | ||||
| | * | | | Added a bang to the end of +raise_nested_attributes_record_not_found+ | wangjohn | 2013-04-06 | 1 | -3/+3 |
| |/ / / | | | | | | | | | | method to signify an exception possibly being raised. | ||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |