Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Tell the user which file is missing when config/database.yml was not found | Akira Matsuda | 2014-09-10 | 2 | -3/+13 |
| | | | | | | Since cc03675d30b58e28f585720dad14e947a57ff5b the error message became like "Could not load database configuration. No such file -" which doesn't really tell what's actually missing. | ||||
* | Merge pull request #16858 from y-yagi/fix_web_console_docs | Guillermo Iguaran | 2014-09-10 | 1 | -1/+1 |
|\ | | | | | [ci skip] application.rb -> development.rb in web-console docs | ||||
| * | [ci skip] application.rb -> development.rb in web-console docs | yuuji.yaginuma | 2014-09-10 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #16855 from slavingia/patch-1 | Jeremy Kemper | 2014-09-09 | 1 | -1/+5 |
|\ | | | | | Removed any default margin from mail preview body. | ||||
| * | Removed any default margin from body. | Sahil Lavingia | 2014-09-09 | 1 | -1/+5 |
|/ | |||||
* | Oracle does not support `IF EXISTS` for `DROP VIEW`. | Yves Senn | 2014-09-09 | 1 | -2/+2 |
| | | | | /cc @yahonda | ||||
* | models backed by views don't assume "id" columns are the primary key. | Yves Senn | 2014-09-09 | 1 | -0/+11 |
| | | | | | | | | Closes #10247. The same goes for tables with an "id" column but without primary key constraint. Reading from the view works without configuration. If you have an updateable view you need to use `self.primary_key = ''`. | ||||
* | add test-cases for primary-key-less-views. Closes #16555. | Yves Senn | 2014-09-09 | 1 | -0/+43 |
| | |||||
* | Merge pull request #14056 from girishso/14041 | Yves Senn | 2014-09-09 | 4 | -4/+7 |
|\ | | | | | | | | | | | | | SQLite3Adapter now checks for views in table_exists? fixes: 14041 Conflicts: activerecord/CHANGELOG.md | ||||
| * | SQLite3Adapter now checks for views in table_exists? fixes: 14041 | Girish S | 2014-02-14 | 3 | -1/+17 |
| | | |||||
* | | introduce `connection.supports_views?` and basic view tests. | Yves Senn | 2014-09-09 | 6 | -4/+64 |
| | | | | | | | | | | | | | | `AbstractAdapter#supports_views?` defaults to `false` so we have to turn it on in adapter subclasses. Currently the flag only controls test execution. /cc @yahonda | ||||
* | | Merge pull request #16849 from y-yagi/patch-1 | Vijay Dev | 2014-09-09 | 1 | -1/+0 |
|\ \ | | | | | | | Remove extra newline from ActiveJob test template | ||||
| * | | Remove extra newline from ActiveJob test template | yuuji.yaginuma | 2014-09-09 | 1 | -1/+0 |
| | | | |||||
* | | | Merge pull request #16850 from aditya-kapoor/correct-line | Vijay Dev | 2014-09-09 | 1 | -3/+1 |
|\ \ \ | | | | | | | | | [ci skip] change the line orientation on asset precompile page | ||||
| * | | | [ci skip] change the line orientation on asset precompile page | Aditya Kapoor | 2014-09-09 | 1 | -3/+1 |
| |/ / | |||||
* / / | Allow included modules to override association methods. | Yves Senn | 2014-09-09 | 5 | -2/+23 |
|/ / | | | | | | | | | | | | | | | | | | | Closes #16684. This is achieved by always generating `GeneratedAssociationMethods` when `ActiveRecord::Base` is subclassed. When some of the included modules of `ActiveRecord::Base` were reordered this behavior was broken as `Core#initialize_generated_modules` was no longer called. Meaning that the module was generated on first access. | ||||
* | | :scissors: "now" [ci skip] | Godfrey Chan | 2014-09-08 | 1 | -1/+1 |
| | | | | | | minor fix for #16846 | ||||
* | | Merge pull request #16846 from ↵ | Godfrey Chan | 2014-09-08 | 1 | -1/+16 |
|\ \ | | | | | | | | | | | | | prathamesh-sonpatki/document-error-handling-in-transactions-callbacks Update upgrading guide about error handling in transactional callbacks [ci skip] | ||||
| * | | Update upgrading guide about error handling in transactional callbacks | Prathamesh Sonpatki | 2014-09-09 | 1 | -1/+16 |
| | | | | | | | | | | | | | | | - Part of 16576 - [ci skip] | ||||
* | | | Merge pull request #16848 from prathamesh-sonpatki/kill-extra-has-been | Guillermo Iguaran | 2014-09-09 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Remove extra 'has been' from deprecation warning about asserting selectors | ||||
| * | | | Remove extra 'has been' from deprecation warning about asserting selectors | Prathamesh Sonpatki | 2014-09-09 | 1 | -1/+1 |
|/ / / | | | | | | | | | | [ci skip] | ||||
* | | | Merge pull request #16847 from prathamesh-sonpatki/kill-extra-has-been | Guillermo Iguaran | 2014-09-09 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Remove extra 'has been' from the deprecation message | ||||
| * | | | Remove extra 'has been' from the deprecation message | Prathamesh Sonpatki | 2014-09-09 | 1 | -1/+1 |
| |/ / | | | | | | | | | | - [ci skip] | ||||
* | | | Merge pull request #16845 from todd/upgrade_guide_console_docs | Guillermo Iguaran | 2014-09-08 | 1 | -2/+6 |
|\ \ \ | |/ / |/| | | Add docs for web-console to 4.2 Upgrade Guide | ||||
| * | | Add docs for web-console to 4.2 Upgrade Guide [ci skip] | Todd Bealmear | 2014-09-08 | 1 | -2/+6 |
|/ / | |||||
* | | Do not memoize document_root_element in view tests | Rafael Mendonça França | 2014-09-08 | 2 | -2/+12 |
| | | | | | | | | | | | | | | Memoizing will not make possible to assert the output of the view if it is changed after the first assert_select call Related with plataformatec/simple_form#1130 and rails/rails-dom-testing#15 | ||||
* | | Merge pull request #16827 from kuldeepaggarwal/f-disable-migration-logging | Yves Senn | 2014-09-08 | 1 | -1/+4 |
|\ \ | | | | | | | | | | disable migrations logging while running test cases for AR schema tests | ||||
| * | | disable migrations logging while running test cases for AR schema tests | Kuldeep Aggarwal | 2014-09-06 | 1 | -0/+2 |
| | | | |||||
* | | | Merge pull request #16825 from cristianbica/fix-ar-nested-arrays | Matthew Draper | 2014-09-08 | 4 | -6/+44 |
|\ \ \ | | | | | | | | | Fix query with nested array in Active Record | ||||
| * | | | Fix query with nested array in Active Record | Cristian Bica | 2014-09-06 | 4 | -6/+44 |
| |/ / | | | | | | | | | | | | | | | | | | | | | | `User.where(id: [[1,2],3])` was equal to `User.where(id:[1, 2, 3])` in Rails 4.1.x but because of some refactoring in Arel this stopped working in 4.2.0. This fixes it in Rails. [Dan Olson & Cristian Bica] | ||||
* | | | Merge pull request #16834 from tchandy/removing_unused_fake_models | Guillermo Iguaran | 2014-09-07 | 1 | -45/+0 |
|\ \ \ | | | | | | | | | Removing unused fake models | ||||
| * | | | Removing unused fake models | Thiago Pradi | 2014-09-07 | 1 | -45/+0 |
| | | | | |||||
* | | | | Schema dumper: all connection adapters implement #primary_key, so rely on it ↵ | Jeremy Kemper | 2014-09-07 | 1 | -10/+1 |
|/ / / | | | | | | | | | | exclusively | ||||
* | | | Merge pull request #16830 from teeparham/schema_dumper | Santiago Pastorino | 2014-09-07 | 1 | -27/+28 |
|\ \ \ | | | | | | | | | Cleanup SchemaDumper | ||||
| * | | | Fix warnings for undefined local variable | Tee Parham | 2014-09-07 | 1 | -6/+10 |
| | | | | | | | | | | | | | | | | | | | | * Add private method primary_key_for, which more clearly shows that the expected return value is nil when a primary key is not found. | ||||
| * | | | Prefer "if any?" to "unless empty?" | Tee Parham | 2014-09-07 | 1 | -9/+6 |
| | | | | | | | | | | | | | | | | | | | | * Consistent whitespace * Remove unnecessary parentheses | ||||
| * | | | Convert string concatenations to substitutions | Tee Parham | 2014-09-07 | 1 | -15/+15 |
| |/ / | |||||
* | | | Merge pull request #16832 from yuki24/use-match-via-all-in-custom-exceptions-app | Zachary Scott | 2014-09-06 | 1 | -3/+3 |
|\ \ \ | | | | | | | | | [guides] Use `match ..., via: :all` in the custom exceptions app [ci skip] | ||||
| * | | | [guides] Use `match ..., via: :all` in the custom exceptions app [ci skip] | Yuki Nishijima | 2014-09-06 | 1 | -3/+3 |
|/ / / | | | | | | | | | | | | | Using `get` results in an unexpected error page(returning empty body) for requests of other HTTP mehtods other than GET. Use `match ..., via: :all` so the exceptions app can be more stable. | ||||
* | | | Ignore segfault build errors with 2.0.0 + mysql-ruby | Jeremy Kemper | 2014-09-06 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | Continuation of c9a43126c5e2c608ab3ff1be994bce69e815a144 :cry: | ||||
* | | | Merge pull request #16793 from javan/comply_with_rack_content_length_middleware | Jeremy Kemper | 2014-09-06 | 2 | -0/+18 |
|\ \ \ | |/ / |/| | | Add support for Rack::ContentLength middelware | ||||
| * | | Add support for Rack::ContentLength middelware | Javan Makhmali | 2014-09-06 | 2 | -0/+18 |
|/ / | |||||
* | | Dynamically modified schema and association would not be correctly reset | Akira Matsuda | 2014-09-06 | 4 | -16/+21 |
| | | | | | | | | | | This fixes <"SQLite3::SQLException: no such column: legacy_things.person_id: SELECT \"legacy_things\".* FROM \"legacy_things\" WHERE \"legacy_things\".\"person_id\" = ?"> in OptimisticLockingTest#test_lock_destroy | ||||
* | | Merge pull request #16824 from rajcybage/action_view_content_tag | Jeremy Kemper | 2014-09-06 | 2 | -1/+1 |
|\ \ | | | | | | | fix the undefined method content_tag #15245 | ||||
| * | | fix the undefined method content_tag #15245 | Rajarshi Das | 2014-09-06 | 2 | -1/+1 |
| | | | | | | | | | | | | not required include ActionView::Helpers::TagHelper in test as well | ||||
* | | | Merge pull request #16822 from ↵ | Jeremy Kemper | 2014-09-06 | 3 | -5/+43 |
|\ \ \ | |/ / |/| | | | | | | | | jeremy/deprecate-problematic-implicit-response-splatting Deprecate implicit AD::Response splatting and Array conversion | ||||
| * | | Deprecate implicit AD::Response splatting and Array conversion | Jeremy Kemper | 2014-09-06 | 3 | -5/+43 |
| | | | |||||
* | | | Dependencies: bump to jquery-rails 4.0.0.beta2 | Godfrey Chan | 2014-09-05 | 2 | -2/+2 |
| | | | |||||
* | | | Use the released jquery-rails gem | Godfrey Chan | 2014-09-05 | 2 | -3/+9 |
| | | | |||||
* | | | Add TODO to release the gems before the next Rails release | Rafael Mendonça França | 2014-09-05 | 1 | -0/+5 |
| | | |