aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * mark relation mutator as :nodoc: [ci skip]Francesco Rodriguez2013-04-021-2/+1
| | |
| | * Merge pull request #131 from lazylester/masterGrayson Wright2013-04-021-1/+1
| | |\ | | | | | | | | Edge rails new syntax for importing engine migration
| | | * as of Rails 3.2.13 it appears that importing an engine's migration into the ↵Les Nightingill2013-03-311-1/+1
| | | | | | | | | | | | | | | | host app is achieved by rake blorgh_engine:install:migrations
| | * | Proofreading tweaks to the Mailer guideJonathan Roes2013-04-011-15/+15
| | | |
| | * | Merge pull request #129 from rafBM/masterVijay Dev2013-04-011-2/+2
| | |\ \ | | | | | | | | | | Remove “Sweepers” from Caching TOC and mention Page/Action caching removal
| | | * | Remove “Sweepers” from Caching TOC and mention Page/Action caching are ↵Rafaël Blais Masson2013-03-241-2/+2
| | | | | | | | | | | | | | | | | | | | removed
| | * | | Merge pull request #132 from hlee/masterKen2013-03-311-1/+1
| | |\ \ \ | | | |_|/ | | |/| | Fixed an article link at sitepoint
| | | * | fixed a article link at sitepointKen Lu2013-03-311-1/+1
| | |/ /
| | * | Remove unnecessary / confusing code in exampleJonathan Roes2013-03-311-11/+2
| | | |
| | * | Fix typoCarson McDonald2013-03-311-1/+1
| | | |
| | * | minor copy editingNeeraj Singh2013-03-303-4/+9
| | | |
| | * | Merge branch 'master' of github.com:rails/railsVijay Dev2013-03-30306-1613/+4285
| | |\ \
| | * | | Revert "Using American English spellings over British style spellings"Vijay Dev2013-03-302-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 573df1cf2a5d5d1f288c8a4a5d76194675141832. Reason: changelog edits aren't allowed in docrails. [ci skip]
| * | | | Added a section on Rails Controller naming conventions.Oliver Jakubiec2013-04-021-2/+12
| | | | |
* | | | | Revert "added details to section 4.1.2 of the Asset Pipeline guide, ↵Vijay Dev2013-04-111-29/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | describing how to configure Apache to serve the gzipped version of the precompiled assets" This reverts commit aec466e75294be177f66472fcdbd392831b26fdd. Reason: We're not sure about the correctness and won't want to document something like this with doubts.
* | | | | Merge pull request #10175 from vipulnsward/initialize_fixRafael Mendonça França2013-04-111-0/+1
|\ \ \ \ \ | | | | | | | | | | | | initialize instead of assert to fix warning
| * | | | | initialize instead of assert to fix warningVipul A M2013-04-111-0/+1
| | | | | |
* | | | | | Switched to new naming conventionsNoemj2013-04-112-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | Merge pull request #10177 from ↵Carlos Antonio da Silva2013-04-111-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | yahonda/test_relation_merging_with_merged_joins_oracle Address ORA-00979: not a GROUP BY expression error
| * | | | | | Address ORA-00979: not a GROUP BY expression errorYasuo Honda2013-04-111-1/+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
| | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-19 01:50:34 +0000