Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | Merge pull request #10152 from Noemj/statement_cache | Rafael Mendonça França | 2013-04-10 | 4 | -0/+108 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Added statement cache | Noemj | 2013-04-10 | 4 | -0/+108 | |
* | | | | | | | Merge pull request #10168 from neerajdotname/simple_improvements | Rafael Mendonça França | 2013-04-10 | 3 | -5/+39 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | converge three lines into one | Neeraj Singh | 2013-04-10 | 1 | -3/+1 | |
| * | | | | | | | rdoc for some of the methods in JoinDependency | Neeraj Singh | 2013-04-10 | 2 | -0/+36 | |
| * | | | | | | | remove_duplicate_results! should be protected | Neeraj Singh | 2013-04-10 | 1 | -2/+2 | |
* | | | | | | | | Revert "Merge pull request #6226 from gnufied/master" | Rafael Mendonça França | 2013-04-10 | 2 | -34/+6 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #10164 from neerajdotname/3002-final | Rafael Mendonça França | 2013-04-10 | 4 | -4/+78 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | While merging relations preserve context for joins | Jared Armstrong and Neeraj Singh | 2013-04-10 | 4 | -4/+78 | |
* | | | | | | | | Revert "Merge pull request #10158 from steveklabnik/issue_10125" | Rafael Mendonça França | 2013-04-10 | 2 | -19/+2 | |
* | | | | | | | | code review of 22e5ab3 | Xavier Noria | 2013-04-10 | 1 | -8/+7 | |
* | | | | | | | | Merge pull request #10157 from prathamesh-sonpatki/app_loader | Xavier Noria | 2013-04-10 | 2 | -19/+14 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Searching for rails executable correctly | Prathamesh Sonpatki | 2013-04-10 | 2 | -19/+14 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge pull request #10165 from wangjohn/public_send_for_instance | Rafael Mendonça França | 2013-04-10 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | ||||||
| * | | | | | | | Using public send instead of send for the PerThreadRegistry module. | wangjohn | 2013-04-10 | 1 | -1/+1 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #10162 from choudhuryanupam/fix_activesupport_test | Carlos Antonio da Silva | 2013-04-10 | 1 | -2/+0 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Removed unused setup | Anupam Choudhury | 2013-04-10 | 1 | -2/+0 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #10160 from choudhuryanupam/fix_typo_n_grammar | Xavier Noria | 2013-04-10 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Fixed typo | Anupam Choudhury | 2013-04-10 | 1 | -1/+1 | |
|/ / / / / / / | ||||||
* | | | | | | | Return nil for Mime::NullType#ref | Andrew White | 2013-04-10 | 2 | -1/+5 | |
* | | | | | | | Reverts rendering behavior when format is unknown | Grzegorz Świrski | 2013-04-10 | 2 | -2/+6 | |
* | | | | | | | Add failing test case for #9654 | Andrew White | 2013-04-10 | 1 | -0/+45 | |
* | | | | | | | Merge pull request #10158 from steveklabnik/issue_10125 | Steve Klabnik | 2013-04-09 | 2 | -2/+19 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Fix inflector to respect default locale. | Nick Cox | 2013-04-10 | 2 | -2/+19 | |
* | | | | | | | | Merge pull request #10156 from wangjohn/grouping_thread_locals | Jeremy Kemper | 2013-04-09 | 9 | -19/+92 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | ||||||
| * | | | | | | | Changed the ScopeRegistry and the InstrumentationRegistry to use the | wangjohn | 2013-04-09 | 3 | -13/+12 | |
| * | | | | | | | 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 | |
|/ / / / / / / | ||||||
* | | | | | | | 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 error screen | Nikolay Shebanov | 2013-04-10 | 1 | -1/+1 | |
* | | | | | | | | Merge pull request #10103 from senny/get_action_mailer_guide_ready_for_prime_... | Steve Klabnik | 2013-04-09 | 2 | -118/+238 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | ||||||
| * | | | | | | | 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 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | 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 | 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 to the | wangjohn | 2013-04-08 | 2 | -9/+16 | |
* | | | | | | | | | | 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 | Neeraj Singh | 2013-04-09 | 4 | -12/+12 | |
* | | | | | | | | | | | 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 | 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 | Vipul A M | 2013-04-09 | 1 | -6/+4 |