aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | [ci skip] application.rb -> development.rb in web-console docsyuuji.yaginuma2014-09-101-1/+1
|/ / /
* | | Merge pull request #16855 from slavingia/patch-1Jeremy Kemper2014-09-091-1/+5
|\ \ \ | | | | | | | | Removed any default margin from mail preview body.
| * | | Removed any default margin from body.Sahil Lavingia2014-09-091-1/+5
|/ / /
* | | Oracle does not support `IF EXISTS` for `DROP VIEW`.Yves Senn2014-09-091-2/+2
| | | | | | | | | | | | /cc @yahonda
* | | models backed by views don't assume "id" columns are the primary key.Yves Senn2014-09-091-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 Senn2014-09-091-0/+43
| | |
* | | Merge pull request #14056 from girishso/14041Yves Senn2014-09-094-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: 14041Girish S2014-02-143-1/+17
| | | |
* | | | introduce `connection.supports_views?` and basic view tests.Yves Senn2014-09-096-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-1Vijay Dev2014-09-091-1/+0
|\ \ \ \ | | | | | | | | | | Remove extra newline from ActiveJob test template
| * | | | Remove extra newline from ActiveJob test templateyuuji.yaginuma2014-09-091-1/+0
| | | | |
* | | | | Merge pull request #16850 from aditya-kapoor/correct-lineVijay Dev2014-09-091-3/+1
|\ \ \ \ \ | | | | | | | | | | | | [ci skip] change the line orientation on asset precompile page
| * | | | | [ci skip] change the line orientation on asset precompile pageAditya Kapoor2014-09-091-3/+1
| |/ / / /
* / / / / Allow included modules to override association methods.Yves Senn2014-09-095-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 Chan2014-09-081-1/+1
| | | | | | | | | | | | minor fix for #16846
* | | | Merge pull request #16846 from ↵Godfrey Chan2014-09-081-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 callbacksPrathamesh Sonpatki2014-09-091-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | | - Part of 16576 - [ci skip]
* | | | | Merge pull request #16848 from prathamesh-sonpatki/kill-extra-has-beenGuillermo Iguaran2014-09-091-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Remove extra 'has been' from deprecation warning about asserting selectors
| * | | | | Remove extra 'has been' from deprecation warning about asserting selectorsPrathamesh Sonpatki2014-09-091-1/+1
|/ / / / / | | | | | | | | | | | | | | | [ci skip]
* | | | | Merge pull request #16847 from prathamesh-sonpatki/kill-extra-has-beenGuillermo Iguaran2014-09-091-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Remove extra 'has been' from the deprecation message
| * | | | | Remove extra 'has been' from the deprecation messagePrathamesh Sonpatki2014-09-091-1/+1
| |/ / / / | | | | | | | | | | | | | | | - [ci skip]
* | | | | Merge pull request #16845 from todd/upgrade_guide_console_docsGuillermo Iguaran2014-09-081-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 Bealmear2014-09-081-2/+6
|/ / / /
* | | | Do not memoize document_root_element in view testsRafael Mendonça França2014-09-082-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-loggingYves Senn2014-09-081-1/+4
|\ \ \ \ | |_|_|/ |/| | | | | | | disable migrations logging while running test cases for AR schema tests
| * | | disable migrations logging while running test cases for AR schema testsKuldeep Aggarwal2014-09-061-0/+2
| | | |
* | | | Merge pull request #16825 from cristianbica/fix-ar-nested-arraysMatthew Draper2014-09-084-6/+44
|\ \ \ \ | | | | | | | | | | Fix query with nested array in Active Record
| * | | | Fix query with nested array in Active RecordCristian Bica2014-09-064-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_modelsGuillermo Iguaran2014-09-071-45/+0
|\ \ \ \ | | | | | | | | | | Removing unused fake models
| * | | | Removing unused fake modelsThiago Pradi2014-09-071-45/+0
| | | | |
* | | | | Schema dumper: all connection adapters implement #primary_key, so rely on it ↵Jeremy Kemper2014-09-071-10/+1
|/ / / / | | | | | | | | | | | | exclusively
* | | | Merge pull request #16830 from teeparham/schema_dumperSantiago Pastorino2014-09-071-27/+28
|\ \ \ \ | | | | | | | | | | Cleanup SchemaDumper
| * | | | Fix warnings for undefined local variableTee Parham2014-09-071-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 Parham2014-09-071-9/+6
| | | | | | | | | | | | | | | | | | | | | | | | | * Consistent whitespace * Remove unnecessary parentheses
| * | | | Convert string concatenations to substitutionsTee Parham2014-09-071-15/+15
| |/ / /
* | | | Merge pull request #16832 from yuki24/use-match-via-all-in-custom-exceptions-appZachary Scott2014-09-061-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 Nishijima2014-09-061-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-rubyJeremy Kemper2014-09-061-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | Continuation of c9a43126c5e2c608ab3ff1be994bce69e815a144 :cry:
* | | | Merge pull request #16793 from javan/comply_with_rack_content_length_middlewareJeremy Kemper2014-09-062-0/+18
|\ \ \ \ | |/ / / |/| | | Add support for Rack::ContentLength middelware
| * | | Add support for Rack::ContentLength middelwareJavan Makhmali2014-09-062-0/+18
|/ / /
* | | Dynamically modified schema and association would not be correctly resetAkira Matsuda2014-09-064-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_tagJeremy Kemper2014-09-062-1/+1
|\ \ \ | | | | | | | | fix the undefined method content_tag #15245
| * | | fix the undefined method content_tag #15245Rajarshi Das2014-09-062-1/+1
| | | | | | | | | | | | | | | | not required include ActionView::Helpers::TagHelper in test as well
* | | | Merge pull request #16822 from ↵Jeremy Kemper2014-09-063-5/+43
|\ \ \ \ | |/ / / |/| | | | | | | | | | | jeremy/deprecate-problematic-implicit-response-splatting Deprecate implicit AD::Response splatting and Array conversion
| * | | Deprecate implicit AD::Response splatting and Array conversionJeremy Kemper2014-09-063-5/+43
| | | |
* | | | Dependencies: bump to jquery-rails 4.0.0.beta2Godfrey Chan2014-09-052-2/+2
| | | |
* | | | Use the released jquery-rails gemGodfrey Chan2014-09-052-3/+9
| | | |
* | | | Add TODO to release the gems before the next Rails releaseRafael Mendonça França2014-09-051-0/+5
| | | |
* | | | Merge pull request #16114 from seuros/test_cleanRafael Mendonça França2014-09-057-26/+25
|\ \ \ \ | | | | | | | | | | [Postgresql tests] Added enable_extension! to helper
| * | | | Added enable_extension! to helperAbdelkader Boudih2014-09-057-26/+25
| | | | |