Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #22657 from matthewd/loosen-version | Rafael Mendonça França | 2015-12-18 | 4 | -3/+32 |
|\ | | | | | | | Allow normal version updates within a release series | ||||
| * | Allow normal version updates within a release series | Matthew Draper | 2015-12-18 | 4 | -3/+32 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We originally chose to apply very strict versioning on the `rails` entry in the Gemfile, because our future versioning policy was not strongly defined. Now it is, and our policy is very much designed on the expectation that people will regularly update to the latest patch level in their release series... so we should encourage that. Of course, Gemfile.lock will do its job and prevent unplanned updates, just as it does for every other gem in the bundle... but if you run `bundle update`, we want to get you the latest bug/security fixes without requiring a manual edit of the Gemfile entry. Our current version could be a few different shapes, so it takes a bit of work to find the right specifier, but in principle, we match anything of the form x.y.*, where x.y matches our current release series. | ||||
* | | Same gemspec formats everywhere | David Heinemeier Hansson | 2015-12-18 | 2 | -2/+2 |
| | | |||||
* | | Stray line | David Heinemeier Hansson | 2015-12-18 | 1 | -1/+2 |
| | | |||||
* | | Simplify | David Heinemeier Hansson | 2015-12-18 | 1 | -9/+2 |
| | | |||||
* | | Now available in action_cable | David Heinemeier Hansson | 2015-12-18 | 1 | -2/+2 |
| | | |||||
* | | Refer to rails command instead of rake in a bunch of places | David Heinemeier Hansson | 2015-12-18 | 16 | -40/+40 |
| | | | | | | | | Still more to do. Please assist! | ||||
* | | Explain reason for eager loading | David Heinemeier Hansson | 2015-12-18 | 1 | -0/+1 |
| | | |||||
* | | Explain Redis' role in Action Cable | David Heinemeier Hansson | 2015-12-18 | 1 | -0/+1 |
| | | |||||
* | | [ci skip] Revert most of ff851017 | Kasper Timm Hansen | 2015-12-18 | 1 | -2/+2 |
| | | | | | | We went back to `Thread.current[]` in 33e11e59. | ||||
* | | Merge pull request #22656 from akshay-vishnoi/fix-typos | Kasper Timm Hansen | 2015-12-18 | 3 | -5/+5 |
|\ \ | | | | | | | [ci skip] Fix grammar | ||||
| * | | [ci skip] Fix grammar | Akshay Vishnoi | 2015-12-18 | 3 | -5/+5 |
| | | | |||||
* | | | Bring comment in line with rest of initializers | David Heinemeier Hansson | 2015-12-18 | 1 | -2/+2 |
| | | | |||||
* | | | Explain the concept of config initializers for backwards compatibility | David Heinemeier Hansson | 2015-12-18 | 3 | -2/+5 |
| | | | |||||
* | | | Fix spacing | David Heinemeier Hansson | 2015-12-18 | 1 | -1/+1 |
| | | | |||||
* | | | These options are not changed nearly often enough to warrant inclusion like ↵ | David Heinemeier Hansson | 2015-12-18 | 1 | -8/+0 |
| | | | | | | | | | | | | this at a high level | ||||
* | | | Better explanation | David Heinemeier Hansson | 2015-12-18 | 1 | -2/+6 |
| | | | |||||
* | | | Use the rails command, not rake, for all rails commands | David Heinemeier Hansson | 2015-12-18 | 2 | -6/+6 |
| | | | |||||
* | | | README.md in the app is now used to describe the app itself, not Rails | David Heinemeier Hansson | 2015-12-18 | 1 | -1/+0 |
| | | | |||||
* | | | More sensible ordering with the more important options first | David Heinemeier Hansson | 2015-12-18 | 1 | -12/+12 |
| | | | |||||
* | | | List the major frameworks you can remove together | David Heinemeier Hansson | 2015-12-18 | 1 | -3/+3 |
| | | | |||||
* | | | Revert "Use Thread.current.thread_variable_set/get insetad of the direct ↵ | David Heinemeier Hansson | 2015-12-18 | 1 | -4/+4 |
| | | | | | | | | | | | | | | | | | | accessors" This reverts commit 301f43820562c6a70dffe30f4227ff0751f47d4f per @matthewd on https://github.com/rails/rails/pull/22630/files#r47997074 | ||||
* | | | Merge pull request #22659 from y-yagi/fix_indent_in_controller_test | Kasper Timm Hansen | 2015-12-18 | 2 | -3/+3 |
|\ \ \ | | | | | | | | | fix indentation of generated controller test | ||||
| * | | | fix indentation of generated controller test | yuuji.yaginuma | 2015-12-18 | 2 | -3/+3 |
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ``` # before module Bukkits class UsersControllerTest < ActionDispatch::IntegrationTest include Engine.routes.url_helpers setup do @user = bukkits_users(:one) end ``` ``` # after module Bukkits class UsersControllerTest < ActionDispatch::IntegrationTest include Engine.routes.url_helpers setup do @user = bukkits_users(:one) end ``` | ||||
* / / | Ignore Byebug command history file | Akira Matsuda | 2015-12-18 | 1 | -0/+3 |
|/ / | | | | | | | | | This file is generated by a gem that is bundled by default in the generated Rails app, just like .sqlite3 files. Hence it might be natural to be ignored here rather than in each developer's .gitignore_global. | ||||
* | | Use released rack | Rafael Mendonça França | 2015-12-18 | 3 | -14/+3 |
| | | |||||
* | | Merge pull request #22649 from derekprior/dp-redirect-back-docs | Kasper Timm Hansen | 2015-12-18 | 1 | -2/+8 |
|\ \ | | | | | | | Document when fallback_location is used [ci-skip] | ||||
| * | | Document when fallback_location is used [ci-skip] | Derek Prior | 2015-12-17 | 1 | -2/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | If you're not familiar with how the `Referer` header works, you likely won't understand why you need to provide a fallback or under what circumstances it would be used. Hopefully this clarifies things a bit. | ||||
* | | | Merge pull request #22655 from akshay-vishnoi/fix-typos | Rafael França | 2015-12-18 | 1 | -1/+1 |
|\ \ \ | |_|/ |/| | | Fix typo | ||||
| * | | [ci skip] Fix typo | Akshay Vishnoi | 2015-12-18 | 1 | -1/+1 |
|/ / | |||||
* | | Install jquery-rails | Rafael Mendonça França | 2015-12-18 | 2 | -0/+6 |
| | | | | | | | | | | It will make sure that the generated application in the tests get the gem. | ||||
* | | Merge pull request #22653 from matthewd/find_array_ordered | Matthew Draper | 2015-12-18 | 4 | -2/+100 |
|\ \ | | | | | | | | | | ActiveRecord::Base#find(array) returning result in the same order as the array passed | ||||
| * | | Implement limit & offset for ourselves | Matthew Draper | 2015-12-18 | 2 | -8/+21 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We know the query will return exactly one row for each entry in the `ids` array, so we can do all the limit/offset calculations on that array, in advance. I also split our new ordered-ids behaviour out of the existing `find_some` method: especially with this change, the conditionals were overwhelming the actual logic. | ||||
| * | | Adding a new test using chained where, limit and find([pks]) | Miguel Grazziotin | 2015-08-07 | 1 | -2/+12 |
| | | | |||||
| * | | using order_values method instead of relying on ActiveRecord::Relation ↵ | Miguel Grazziotin | 2015-06-19 | 1 | -2/+2 |
| | | | | | | | | | | | | @values hash | ||||
| * | | WIP: fixing the limit bug and introducing new tests (failing for now) on ↵ | Miguel Grazziotin | 2015-06-19 | 2 | -7/+30 |
| | | | | | | | | | | | | .find(array) with offset | ||||
| * | | do not change the order of the result if the object was already ordered by ↵ | Miguel Grazziotin | 2015-06-05 | 2 | -0/+6 |
| | | | | | | | | | | | | the user via :order clause | ||||
| * | | adding a test to ensure the find is obbeying the limit | Miguel Grazziotin | 2015-06-03 | 1 | -0/+7 |
| | | | |||||
| * | | [#20338] adding tests to ensure the order clause takes precedence | Miguel Grazziotin | 2015-06-03 | 1 | -0/+18 |
| | | | |||||
| * | | [#20338] improving implementation, fixing and adding some more specs | Miguel Grazziotin | 2015-06-03 | 2 | -6/+4 |
| | | | |||||
| * | | [#20338] WIP: first basic implementation and specs | Miguel Grazziotin | 2015-05-29 | 2 | -1/+17 |
| | | | |||||
* | | | These limits are now implicit | Matthew Draper | 2015-12-18 | 2 | -2/+2 |
| | | | |||||
* | | | Merge pull request #20815 from ↵ | Matthew Draper | 2015-12-18 | 3 | -3/+8 |
|\ \ \ | | | | | | | | | | | | | | | | | | | | | byroot/do-not-include-column-limit-if-it-is-default Do not include column limit in schema.rb if it matches the default | ||||
| * | | | Do not include column limit in schema.rb if it matches the default | Jean Boussier | 2015-07-08 | 2 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When working on engines that supports multiple databases, it's very annoying to have a different schema.rb output based on which database you use. MySQL being the primary offender. This patch should reduce the disparities a bit. | ||||
* | | | | Merge pull request #21914 from zachalewel/zachalewel-patch-1 | Matthew Draper | 2015-12-18 | 1 | -8/+8 |
|\ \ \ \ | | | | | | | | | | | | | | | | Update CHANGELOG.md for readability | ||||
| * | | | | Update CHANGELOG.md | Zach Alewel | 2015-10-08 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Update CHANGELOG.md for readability | Zach Alewel | 2015-10-08 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge pull request #22623 from greysteil/support-passing-schema-name-to-indexes | Matthew Draper | 2015-12-18 | 3 | -9/+24 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | Support passing the schema name prefix to `conenction.indexes` | ||||
| * | | | | | Support passing the schema name prefix to `conenction.indexes` | Grey Baker | 2015-12-17 | 3 | -9/+24 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support passing the schema name as a prefix to table name in `ConnectionAdapters::SchemaStatements#indexes`. Previously the prefix would be considered a full part of the index name, and only the schema in the current search path would be considered. | ||||
* | | | | | | Merge pull request #19456 from greysteil/index-exists-behaviour | Matthew Draper | 2015-12-18 | 7 | -20/+126 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Ignore index name in `index_exists?` when not passed a name to check for |