aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Revert "Merge pull request #10158 from steveklabnik/issue_10125"Rafael Mendonça França2013-04-102-19/+2
* code review of 22e5ab3Xavier Noria2013-04-101-8/+7
* Merge pull request #10157 from prathamesh-sonpatki/app_loaderXavier Noria2013-04-102-19/+14
|\
| * Searching for rails executable correctlyPrathamesh Sonpatki2013-04-102-19/+14
|/
* Merge pull request #10165 from wangjohn/public_send_for_instanceRafael Mendonça França2013-04-101-1/+1
|\
| * Using public send instead of send for the PerThreadRegistry module.wangjohn2013-04-101-1/+1
|/
* Merge pull request #10162 from choudhuryanupam/fix_activesupport_testCarlos Antonio da Silva2013-04-101-2/+0
|\
| * Removed unused setupAnupam Choudhury2013-04-101-2/+0
|/
* Merge pull request #10160 from choudhuryanupam/fix_typo_n_grammarXavier Noria2013-04-101-1/+1
|\
| * Fixed typoAnupam Choudhury2013-04-101-1/+1
|/
* Return nil for Mime::NullType#refAndrew White2013-04-102-1/+5
* Reverts rendering behavior when format is unknownGrzegorz Świrski2013-04-102-2/+6
* Add failing test case for #9654Andrew White2013-04-101-0/+45
* Merge pull request #10158 from steveklabnik/issue_10125Steve Klabnik2013-04-092-2/+19
|\
| * 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
|\ \ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-13 17:55:23 +0000