aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* refactor order hash testVipul A M2013-04-111-5/+1
|
* fixes app_rails_loader_test.rb in Mac OS XXavier Noria2013-04-111-1/+12
|
* Merge pull request #10174 from vipulnsward/cleanup_caching_testCarlos Antonio da Silva2013-04-111-4/+4
|\ | | | | Cleanup statement cache test
| * cleanup statement cache testVipul A M2013-04-111-4/+4
| |
* | fixes remaining lowercase "rails"Xavier Noria2013-04-111-1/+1
|/
* application loader refactor and test suite complete rewriteXavier Noria2013-04-112-58/+71
|
* Remove warningCarlos Antonio da Silva2013-04-101-2/+2
| | | | warning: `*' interpreted as argument prefix
* Merge pull request #10170 from rubys/editorial_pass_over_generated_gemfileCarlos Antonio da Silva2013-04-102-7/+11
|\ | | | | Editorial pass over generated Gemfile
| * Editorial pass over generated GemfileSam Ruby2013-04-102-7/+11
|/ | | | | | * When run with default options, no repeated blank lines * Every gem has a comment, perhaps a generic one, but a comment nonetheless * Most comments used to start with "Use", some with "To use" => made consistent
* Merge pull request #10152 from Noemj/statement_cacheRafael Mendonça França2013-04-104-0/+108
|\ | | | | | | | | | | | | Statement cache Conflicts: activerecord/CHANGELOG.md
| * Added statement cacheNoemj2013-04-104-0/+108
| |
* | Merge pull request #10168 from neerajdotname/simple_improvementsRafael Mendonça França2013-04-103-5/+39
|\ \ | | | | | | Simple improvements
| * | converge three lines into oneNeeraj Singh2013-04-101-3/+1
| | |
| * | rdoc for some of the methods in JoinDependencyNeeraj Singh2013-04-102-0/+36
| | |
| * | remove_duplicate_results! should be protectedNeeraj Singh2013-04-101-2/+2
| | |
* | | Revert "Merge pull request #6226 from gnufied/master"Rafael Mendonça França2013-04-102-34/+6
|/ / | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 9bf1a0db4acbbf9e8e6f707250269185224e7efe, reversing changes made to fed97091b9546d369a240d10b184793d49247dd3. Conflicts: activerecord/test/cases/transaction_callbacks_test.rb Reason: This fix introduces another issue described at #8937, so we are reverting it to restore the behavior of 3-2-stable. We will fix both issues when we come out with a better solution
* | Merge pull request #10164 from neerajdotname/3002-finalRafael Mendonça França2013-04-104-4/+78
|\ \ | | | | | | While merging relations preserve context for joins
| * | While merging relations preserve context for joinsJared Armstrong and Neeraj Singh2013-04-104-4/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #3002. Also see #5494. ``` class Comment < ActiveRecord::Base belongs_to :post end class Author < ActiveRecord::Base has_many :posts end class Post < ActiveRecord::Base belongs_to :author has_many :comments end ``` `Comment.joins(:post).merge(Post.joins(:author).merge(Author.where(:name => "Joe Blogs"))).all` would fail with `ActiveRecord::ConfigurationError: Association named 'author' was not found on Comment`. It is failing because `all` is being called on relation which looks like this after all the merging: `{:joins=>[:post, :author], :where=>[#<Arel::Nodes::Equality: ....}`. In this relation all the context that `Post` was joined with `Author` is lost and hence the error that `author` was not found on `Comment`. Ths solution is to build JoinAssociation when two relations with join information are being merged. And later while building the arel use the previously built `JoinAssociation` record in `JoinDependency#graft` to build the right from clause. Thanks to Jared Armstrong (https://github.com/armstrjare) for most of the work. I ported it to make it compatible with new code base.
* | | Revert "Merge pull request #10158 from steveklabnik/issue_10125"Rafael Mendonça França2013-04-102-19/+2
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit fa3ef8e82ab2f96cf15ef9bc885b2468fad77621, reversing changes made to e0af93dd3a5eeee2e2a67b05f34afb66cc80c00b. Reason: Routes, Active Record and the rendering stack should not depend on the default locale
* | | 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 correctly
| * | | Searching for rails executable correctlyPrathamesh Sonpatki2013-04-102-19/+14
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * Current logic of finding Rails executable in parent directory is not returning full path of executable if it is found in one of the parent directories * To compensate for this, we have to call exec_app_rails recursively until the executable is found or we cant do 'chdir' anymore * This solution finds the correct executable path from parent directory(s) recursively
* | | 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.
| * | Using public send instead of send for the PerThreadRegistry module.wangjohn2013-04-101-1/+1
|/ / | | | | | | Prevents you from accidentally calling a protected method.
* | Merge pull request #10162 from choudhuryanupam/fix_activesupport_testCarlos Antonio da Silva2013-04-101-2/+0
|\ \ | | | | | | Removed unused setup
| * | Removed unused setupAnupam Choudhury2013-04-101-2/+0
|/ /
* | Merge pull request #10160 from choudhuryanupam/fix_typo_n_grammarXavier Noria2013-04-101-1/+1
|\ \ | | | | | | Fixed typo
| * | 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
| | | | | | | | | | | | | | | | | | If a request has unknown format (eg. /foo.bar), the renderer fallbacks to default format. This patch reverts Rails 3.2 behavior after c2267db commit. Fixes issue #9654.
* | 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.
| * | Fix inflector to respect default locale.Nick Cox2013-04-102-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_localsJeremy Kemper2013-04-099-19/+92
|\ \ \ | |/ / |/| | Grouping thread locals in ActiveRecord
| * | Changed the ScopeRegistry and the InstrumentationRegistry to use thewangjohn2013-04-093-13/+12
| | | | | | | | | | | | PerThreadRegistry module.
| * | 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
|/ / | | | | | | thread local variables.
* | 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 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-02 23:03:37 +0000