Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #12390 from kennyj/rename_to_association_methods | Rafael Mendonça França | 2013-11-05 | 4 | -7/+7 |
|\ | | | | | | | | | | | | | | | | | Renamed generated_feature_methods to generated_association_methods. Conflicts: activerecord/lib/active_record/associations/builder/association.rb activerecord/lib/active_record/associations/builder/singular_association.rb activerecord/test/cases/base_test.rb | ||||
| * | Renamed generated_feature_methods to generated_association_methods. | kennyj | 2013-09-28 | 5 | -12/+12 |
| | | |||||
* | | Remove private API test | Rafael Mendonça França | 2013-11-05 | 1 | -10/+0 |
| | | |||||
* | | Merge pull request #12773 from ptn/use_19_syntax_in_schema_test | Guillermo Iguaran | 2013-11-05 | 1 | -1/+1 |
|\ \ | | | | | | | Use 1.9 Hash syntax consistently | ||||
| * | | Use 1.9 Hash syntax consistently | Pablo Torres | 2013-11-05 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #12752 from notalex/expand_path_refactoring | Yves Senn | 2013-11-05 | 3 | -3/+3 |
|\ \ | | | | | | | Refactor File.expand_path usage to remove additional File.join | ||||
| * | | Refactor File.expand_path usage to remove additional File.join | Alex Johnson | 2013-11-05 | 3 | -3/+3 |
| | | | |||||
* | | | ask the fixture set for the sql statements | Aaron Patterson | 2013-11-04 | 2 | -11/+17 |
| | | | |||||
* | | | The enum value constant isn't used, so rm it for now. | Aaron Patterson | 2013-11-04 | 2 | -27/+7 |
| | | | |||||
* | | | stop doing the same calculation over and over | Aaron Patterson | 2013-11-04 | 1 | -4/+5 |
| | | | |||||
* | | | oops, template replay needs to happen after bundle. :orz: | Aaron Patterson | 2013-11-04 | 1 | -1/+1 |
| | | | |||||
* | | | application template respects Gemfile entries | Aaron Patterson | 2013-11-04 | 2 | -0/+25 |
| | | | |||||
* | | | gems can be added or skipped from the template | Aaron Patterson | 2013-11-04 | 4 | -2/+92 |
| | | | |||||
* | | | fix copy & paste test-case naming. [ci skip] | Yves Senn | 2013-11-04 | 1 | -1/+1 |
| | | | |||||
* | | | document `BACKTRACE` env var usage in testing guide. [ci skip] | Yves Senn | 2013-11-04 | 1 | -0/+11 |
| | | | |||||
* | | | Fix failures related to enum changes | Carlos Antonio da Silva | 2013-11-04 | 1 | -6/+4 |
| | | | | | | | | | | | | | | | | | | Commit 6e4a810f51b9ed2468b92247ef5568cc9d6dbcc0 changed the implementation from class_eval to define_method, but missed the access to the constant versus the access to the constant name. | ||||
* | | | Convert schema file to ruby 1.9 style hash | Carlos Antonio da Silva | 2013-11-04 | 1 | -214/+214 |
| | | | |||||
* | | | Style fixes on test schema file | Carlos Antonio da Silva | 2013-11-04 | 1 | -6/+6 |
| | | | |||||
* | | | Merge pull request #12755 from cbartlett/master | Carlos Antonio da Silva | 2013-11-04 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Remove extra whitespace | ||||
| * | | | Remove extra whitespace | Colin Bartlett | 2013-11-04 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | When generating an app with --skip_active_record, an extra line of whitespace was included unnecessarily. | ||||
* | | | | Refactor logic to grab the max time of the list of timestamp names in #cache_key | Carlos Antonio da Silva | 2013-11-04 | 2 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | | Reuse the already existing logic used for grabbing this information from the updated columns. | ||||
* | | | | Respect cache timestamp format when giving timestamps to #cache_key | Carlos Antonio da Silva | 2013-11-04 | 2 | -3/+4 |
|/ / / | |||||
* | | | :scissors: [ci skip] | Carlos Antonio da Silva | 2013-11-04 | 2 | -5/+2 |
| | | | |||||
* | | | Merge pull request #12754 from ↵ | David Heinemeier Hansson | 2013-11-04 | 1 | -4/+12 |
|\ \ \ | | | | | | | | | | | | | | | | | ck3g/replace-class-evals-with-define-method-for-enum Replace `class_eval` with `define_method` for enum | ||||
| * | | | Replace `class_eval` with `define_method` for enum | Vitaly Tatarintsev | 2013-11-04 | 1 | -4/+12 |
| |/ / | | | | | | | | | | https://github.com/rails/rails/commit/db41eb8a6ea88b854bf5cd11070ea4245e1639c5#commitcomment-4502683 | ||||
* | | | Fix typo in railties changelog | Carlos Antonio da Silva | 2013-11-04 | 1 | -2/+2 |
| | | | | | | | | | | | | Also improve the example to show as shell command [ci skip] | ||||
* | | | Fix changelog indent [ci skip] | Carlos Antonio da Silva | 2013-11-04 | 1 | -6/+6 |
|/ / | |||||
* | | BACKTRACE environment variable to show unfiltered backtraces. | Yves Senn | 2013-11-04 | 3 | -6/+48 |
| | | | | | | | | | | | | | | | | | | | | | | We used to support the `BACKTRACE` environment variable but when we switched to MiniTest it got removed: f9382cd7948 This commit adds back the functionality to show the unfiltered backtrace when needed. This also works when you run your tests with `rake`: * `BACKTRACE=1 bin/rake test` * `BACKTRACE=1 ruby -Itest ...` | ||||
* | | Merge pull request #12750 from arunagw/webconsole-invite-only | Guillermo Iguaran | 2013-11-03 | 3 | -15/+0 |
|\ \ | | | | | | | Not adding webconsole by default in new apps | ||||
| * | | No web-console for now | Arun Agrawal | 2013-11-03 | 3 | -15/+0 |
|/ / | |||||
* | | Line up the comments for aesthetics | David Heinemeier Hansson | 2013-11-03 | 1 | -5/+5 |
| | | |||||
* | | Aesthetics | David Heinemeier Hansson | 2013-11-03 | 1 | -22/+30 |
| | | |||||
* | | Code style for privacy indention | David Heinemeier Hansson | 2013-11-03 | 1 | -8/+8 |
| | | |||||
* | | Ensure backwards compability after the #deep_munge extraction | David Heinemeier Hansson | 2013-11-03 | 1 | -0/+10 |
| | | |||||
* | | Add test verifying that you can only sort ARs of the same type | David Heinemeier Hansson | 2013-11-02 | 1 | -1/+7 |
| | | |||||
* | | Revert "ActiveRecord::Base#<=> has been removed. Primary keys may not be in ↵ | David Heinemeier Hansson | 2013-11-02 | 3 | -12/+16 |
| | | | | | | | | | | | | | | | | | | order," -- will be replaced with a check to ensure that the keys used for comparison are integers, and only fail if they are not. This reverts commit 6256734e2d0bdd89f4b5d11da259d40afa0c95c7. Conflicts: activerecord/CHANGELOG.md | ||||
* | | Delegate #rewhere to all on the class like all other relation methods | David Heinemeier Hansson | 2013-11-02 | 2 | -1/+5 |
| | | |||||
* | | Move documentation around a bit | David Heinemeier Hansson | 2013-11-02 | 1 | -4/+7 |
| | | |||||
* | | Merge pull request #12747 from yury/explicit-enum-values | David Heinemeier Hansson | 2013-11-02 | 4 | -1/+15 |
|\ \ | | | | | | | Explicit mapping for enum | ||||
| * | | Explicit mapping for enum | Yury Korolev | 2013-11-02 | 4 | -1/+15 |
| | | | |||||
* | | | Added ActiveRecord::QueryMethods#rewhere which will overwrite an existing, ↵ | David Heinemeier Hansson | 2013-11-02 | 3 | -0/+52 |
| | | | | | | | | | | | | named where condition. | ||||
* | | | unscope now works on default_scope after ↵ | Rafael Mendonça França | 2013-11-02 | 3 | -9/+9 |
|/ / | | | | | | | 94924dc32baf78f13e289172534c2e71c9c8cade | ||||
* | | Add a test case for the scope enum adds | David Heinemeier Hansson | 2013-11-02 | 1 | -0/+4 |
| | | |||||
* | | Extend ActiveRecord::Base#cache_key to take an optional list of timestamp ↵ | David Heinemeier Hansson | 2013-11-02 | 4 | -2/+27 |
| | | | | | | | | attributes of which the highest will be used. | ||||
* | | Merge branch 'master' of github.com:rails/rails | David Heinemeier Hansson | 2013-11-02 | 10 | -94/+48 |
|\ \ | |||||
| * | | Use an already existing fixture | Carlos Antonio da Silva | 2013-11-02 | 1 | -1/+1 |
| | | | |||||
| * | | Fix to work on Ruby 1.9.3, example and changelog improvements | Carlos Antonio da Silva | 2013-11-02 | 4 | -34/+34 |
| | | | |||||
| * | | Improve wording in AC::ParameterMissing error message | Guillermo Iguaran | 2013-11-02 | 1 | -1/+1 |
| | | | |||||
| * | | Update guides welcome page to point to version 3.2.15 [ci skip] | Carlos Antonio da Silva | 2013-11-02 | 1 | -1/+1 |
| | | | |||||
| * | | Revert "Merge pull request #9660 from ↵ | Guillermo Iguaran | 2013-11-02 | 5 | -57/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | sebasoga/change_strong_parameters_require_behaviour" This reverts commit c2b5a8e61ba0f35015e6ac949a5c8fce2042a1f2, reversing changes made to 1918b12c0429caec2a6134ac5e5b42ade103fe90. See: https://github.com/rails/rails/pull/9660#issuecomment-27627493 |