aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | Fix inflector to respect default locale.Nick Cox2013-04-102-2/+19
* | | | | | | Merge pull request #10156 from wangjohn/grouping_thread_localsJeremy Kemper2013-04-099-19/+92
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Changed the ScopeRegistry and the InstrumentationRegistry to use thewangjohn2013-04-093-13/+12
| * | | | | | Created a runtime registry for thread local variables in active record.wangjohn2013-04-095-6/+39
| * | | | | | Creating a module so that per thread registries can be easily created aswangjohn2013-04-091-0/+41
|/ / / / / /
* | | | | | Explain how to upgrade bin/ for Rails 4Jeremy Kemper2013-04-091-8/+29
* | | | | | Merge pull request #10154 from killthekitten/fix_template_error_headerCarlos Antonio da Silva2013-04-091-1/+1
|\ \ \ \ \ \
| * | | | | | Use camelize instead of capitalize on error screenNikolay Shebanov2013-04-101-1/+1
* | | | | | | Merge pull request #10103 from senny/get_action_mailer_guide_ready_for_prime_...Steve Klabnik2013-04-092-118/+238
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | 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
|\ \ \ \ \ \ \
| * | | | | | | 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 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 to thewangjohn2013-04-082-9/+16
* | | | | | | | | Merge pull request #10151 from neerajdotname/ar-to-klassRafael Mendonça França2013-04-094-12/+12
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | changed variable name active_record => base_klassNeeraj Singh2013-04-094-12/+12
* | | | | | | | | | 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 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 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 variableVipul A M2013-04-092-1/+2
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #10145 from wangjohn/instrumentation_registry_creationRafael Mendonça França2013-04-081-1/+27
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Creating an object to consolidate thread locals which hold thewangjohn2013-04-081-1/+27
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #10143 from Agis-/mark_unused_varsRafael Mendonça França2013-04-089-13/+13
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Mark unused variables and make some style fixesAgis Anastasopoulos2013-04-089-13/+13
|/ / / / / / / / /
* | | | | | | | | Merge pull request #10135 from wangjohn/grouping_thread_localsRafael Mendonça França2013-04-083-6/+57
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Grouping thread locals in the ActiveRecord scopes so that thewangjohn2013-04-083-6/+57
|/ / / / / / / / /
* | | | | | | | | Merge pull request #9604 from sgrif/live_streaming_exceptionsRafael Mendonça França2013-04-082-1/+103
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Exception handling for controllers using ActionController::LiveSean Griffin2013-03-182-1/+103
* | | | | | | | | | 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, should helpwangjohn2013-04-061-2/+55
* | | | | | | | | | Merge pull request #10130 from Agis-/patch-2Carlos Antonio da Silva2013-04-081-3/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | 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, `#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
* | | | | | | | | Merge pull request #10127 from vipulnsward/each_to_each_valueCarlos Antonio da Silva2013-04-072-3/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | each to each_value; remove unused varsVipul A M2013-04-072-3/+3
|/ / / / / / / / /
* | | | | | | | | Merge pull request #10123 from wangjohn/added_bang_to_raise_nested_attributes...Carlos Antonio da Silva2013-04-061-3/+3
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Added a bang to the end of +raise_nested_attributes_record_not_found+wangjohn2013-04-061-3/+3
|/ / / / / / / /
* | | | | | | | Merge pull request #10101 from wangjohn/refactoring_routing_mapperAndrew White2013-04-061-12/+13
|\ \ \ \ \ \ \ \