aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #10154 from killthekitten/fix_template_error_headerCarlos Antonio da Silva2013-04-091-1/+1
|\ | | | | Use camelize instead of capitalize on template error screen
| * Use camelize instead of capitalize on error screenNikolay Shebanov2013-04-101-1/+1
| |
* | Merge pull request #10103 from ↵Steve Klabnik2013-04-092-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 Senn2013-04-092-118/+238
| |
* | copy-edit pass in AM changelog [ci skip]Xavier Noria2013-04-091-9/+11
| |
* | Merge pull request #9843 from indirect/rails_binRafael Mendonça França2013-04-091-10/+20
|\ \ | | | | | | Rails 4 prints help for "rails new" when running "rails console"
| * | fix binstub typoAndre Arko2013-03-301-1/+1
| | |
| * | need to delete bin, not binstub, update wordingAndre Arko2013-03-271-4/+4
| | |
| * | script/rails could never be from bundlerAndre Arko2013-03-271-1/+1
| | |
| * | rails commands even if bin/rails is a gem stubAndre Arko2013-03-201-10/+20
| | |
* | | Fix typoRafael Mendonça França2013-04-091-2/+2
| | |
* | | Merge pull request #10153 from choudhuryanupam/masterRafael Mendonça França2013-04-091-4/+0
|\ \ \ | | | | | | | | Removed unused setup
| * | | Removed unused setupAnupam Choudhury2013-04-091-4/+0
|/ / /
* | | Merge pull request #10142 from wangjohn/grouping_thread_localsRafael Mendonça França2013-04-092-9/+16
|\ \ \ | | | | | | | | Delegating the value getter and setters in the ScopeRegistry
| * | | Delegating the value getter and setters in the ScopeRegistry to thewangjohn2013-04-082-9/+16
| | | | | | | | | | | | | | | | current ScopeRegister object.
* | | | Merge pull request #10151 from neerajdotname/ar-to-klassRafael Mendonça França2013-04-094-12/+12
|\ \ \ \ | | | | | | | | | | changed variable name active_record => base_klass
| * | | | changed variable name active_record => base_klassNeeraj Singh2013-04-094-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-environmentRafael Mendonça França2013-04-091-2/+3
|\ \ \ \ \ | |/ / / / |/| | | | Add TEST_DIRS enviroment for constrain test directories in rakefile
| * | | | Add TEST_DIRS enviroment for constrain test directories in rakefileAbd ar-Rahman Hamidi2013-04-081-2/+3
| | | | |
* | | | | Merge pull request #10148 from vipulnsward/traces_changeCarlos Antonio da Silva2013-04-091-6/+4
|\ \ \ \ \ | | | | | | | | | | | | change array of array to hash
| * | | | | change array of array to hashVipul A M2013-04-091-6/+4
| | | | | |
* | | | | | Merge pull request #10147 from vipulnsward/fix_AP_live_warningCarlos Antonio da Silva2013-04-082-1/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | | fix AP warning; remove unused variable
| * | | | | fix AP warning; remove unused variableVipul A M2013-04-092-1/+2
|/ / / / /
* | | | | Merge pull request #10145 from wangjohn/instrumentation_registry_creationRafael Mendonça França2013-04-081-1/+27
|\ \ \ \ \ | | | | | | | | | | | | Consolidating thread locals in AS::Notifications
| * | | | | Creating an object to consolidate thread locals which hold thewangjohn2013-04-081-1/+27
|/ / / / / | | | | | | | | | | | | | | | instrumenters for the AS::Notifications module.
* | | | | Merge pull request #10143 from Agis-/mark_unused_varsRafael Mendonça França2013-04-089-13/+13
|\ \ \ \ \ | |_|/ / / |/| | | | Mark unused variables and make some style fixes
| * | | | Mark unused variables and make some style fixesAgis Anastasopoulos2013-04-089-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_localsRafael Mendonça França2013-04-083-6/+57
|\ \ \ \ | | | | | | | | | | Grouping thread locals in the ActiveRecord scopes
| * | | | Grouping thread locals in the ActiveRecord scopes so that thewangjohn2013-04-083-6/+57
|/ / / / | | | | | | | | | | | | | | | | current_scope and ignore_default_scope locals are brought together under a registry object.
* | | | Merge pull request #9604 from sgrif/live_streaming_exceptionsRafael Mendonça França2013-04-082-1/+103
|\ \ \ \ | | | | | | | | | | Exceptions raised when using ActionController::Live cause server crash
| * | | | Exception handling for controllers using ActionController::LiveSean Griffin2013-03-182-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_builderRafael Mendonça França2013-04-081-2/+55
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | Added documentation to the FormBuilder class Closes #10115
| * | | | Added documentation to the FormBuilder class, should helpwangjohn2013-04-061-2/+55
| | | | | | | | | | | | | | | | | | | | | | | | | clarify issue #10115. Also made the field_helpers an explicit list of methods.
* | | | | Merge pull request #10130 from Agis-/patch-2Carlos Antonio da Silva2013-04-081-3/+3
|\ \ \ \ \ | | | | | | | | | | | | Mark unused block parameters.
| * | | | | Remove unused block parametersAgis Anastasopoulos2013-04-071-3/+3
| | |_|/ / | |/| | |
* | | | | Merge pull request #10131 from Agis-/metal_helperCarlos Antonio da Silva2013-04-081-1/+0
|\ \ \ \ \ | |/ / / / |/| | | | Remove unecessary variable call since `sort!` always returns the sorted array
| * | | | Remove unecessary variable call, `#sort!` always returns an arrayAgis Anastasopoulos2013-04-071-1/+0
|/ / / /
* | | | Minor AR changelog improvements [ci skip]Carlos Antonio da Silva2013-04-071-4/+3
| | | |
* | | | Avoid iterating over records hash when not necessaryCarlos Antonio da Silva2013-04-071-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_valueCarlos Antonio da Silva2013-04-072-3/+3
|\ \ \ \ | | | | | | | | | | each to each_value; remove unused vars
| * | | | each to each_value; remove unused varsVipul A M2013-04-072-3/+3
|/ / / /
* | | | Merge pull request #10123 from ↵Carlos Antonio da Silva2013-04-061-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+wangjohn2013-04-061-3/+3
|/ / / | | | | | | | | | method to signify an exception possibly being raised.
* | | Merge pull request #10101 from wangjohn/refactoring_routing_mapperAndrew White2013-04-061-12/+13
|\ \ \ | | | | | | | | Refactoring some reused code into a method (inside of the routes mapper)
| * | | Refactoring some reused code into a method (inside of the routeswangjohn2013-04-051-12/+13
| | | | | | | | | | | | | | | | mapper) and adding a constant for all the possible scopes.
* | | | Forgot to lock the uglifier version in our GemfileRafael Mendonça França2013-04-061-1/+1
| | | | | | | | | | | | | | | | Related with 575838795019f7402992e3bfa83a0c5048cf143d
* | | | Merge pull request #10121 from Agis-/patch-2Rafael Mendonça França2013-04-061-1/+1
|\ \ \ \ | | | | | | | | | | Fix markdown formatting
| * | | | Fix markdown formattingAgis Anastasopoulos2013-04-061-1/+1
| | | | |
* | | | | Merge pull request #10120 from vipulnsward/change_merge_on_new_hashRafael Mendonça França2013-04-061-3/+3
|\ \ \ \ \ | |/ / / / |/| | | | change some more merge to merge! on new hashes
| * | | | change some more merge to merge! on new hashesVipul A M2013-04-061-3/+3
| | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-15 10:08:54 +0000