aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #27399 from sinogermany/rails-env-for-empty-string-env-varsRafael Mendonça França2017-01-033-1/+18
|\ | | | | | | Rails env for empty string env vars
| * Rails.env falls back to dev mode when env var is emptyDaniel Deng2017-01-043-1/+18
| |
* | Merge pull request #27564 from kamipo/fix_find_by_active_record_base_object-2Rafael França2017-01-032-3/+8
|\ \ | | | | | | Fix `find_by` and `where` consistency
| * | Fix `find_by` and `where` consistencyRyuta Kamizono2017-01-042-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The alternative of #26213. Currently `find_by` and `where` with AR object return inconsistent result. This is caused by statement cache does not support AR object. Passing to finder method to fix the issue. Fixes #26210.
* | | Fix configuration test now that Metal#env was removedRafael Mendonça França2017-01-031-1/+1
|/ /
* | Revert "Merge pull request #21233 from ↵Rafael Mendonça França2017-01-0325-207/+114
| | | | | | | | | | | | | | | | | | | | mtsmfm/disable-referential-integrity-without-superuser-privileges" This reverts commit eeac6151a55cb7d5f799e1ae33aa64a839cbc3aa, reversing changes made to 5c40239d3104543e70508360d27584a3e4dc5baf. Reason: Broke the isolated tests. https://travis-ci.org/rails/rails/builds/188721346
* | Revert "Merge pull request #27550 from ↵Rafael Mendonça França2017-01-039-29/+9
| | | | | | | | | | | | | | | | | | mtsmfm/fix-generator-command-for-nested-rails-engine" This reverts commit 1e969bfb98b88799e2c759fce25a1d8cf00d7ce7, reversing changes made to a5041f267ded119c2d00b8786c2f2c1e3f93c8a1. Reason: It breaks the public API
* | Merge pull request #27550 from ↵Rafael França2017-01-039-9/+29
|\ \ | | | | | | | | | | | | mtsmfm/fix-generator-command-for-nested-rails-engine Fix generator command for nested (namespaced) rails engine
| * | Fix generator command for nested (namespaced) rails engineFumiaki MATSUSHIMA2017-01-039-9/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we create nested (namespaced) rails engine such like bukkits-admin, `bin/rails g scaffold User name:string age:integer` will create `bukkits-admin/app/controllers/bukkits/users_controller.rb` but it should create `bukkits-admin/app/controllers/bukkits/admin/users_controller.rb`. In #6643, we changed `namespaced_path` as root path because we supposed application_controller is always in root but nested rails engine's application_controller will not.
* | | Merge pull request #27562 from maclover7/jm-as-rm-requireRafael Mendonça França2017-01-031-3/+0
|\ \ \ | | | | | | | | | | | | Remove unnecessary require statements
| * | | Remove unnecessary require statementsJon Moss2017-01-031-3/+0
| | | | | | | | | | | | | | | | Should have been removed via 8e43fc5ace8039370f233570863b34821a3be46f.
* | | | Remove deprecated ActionController::Metal.callRafael Mendonça França2017-01-033-17/+11
| | | |
* | | | List full class nameJon Moss2017-01-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | `Metal#env` --> `ActionController::Metal#env` [ci skip]
* | | | Remove deprecated Metal#envRafael Mendonça França2017-01-032-5/+4
| | | |
* | | | Remove unneeded Deprecation.silenceRafael Mendonça França2017-01-031-3/+1
| | | |
* | | | Merge pull request #27563 from kamipo/fix_typoRafael França2017-01-032-3/+3
|\ \ \ \ | | | | | | | | | | Fix typo s/permited/permitted/
| * | | | Fix typo s/permited/permitted/Ryuta Kamizono2017-01-042-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ``` % git grep -n permited actionview/test/template/url_helper_test.rb:238: def test_button_to_with_permited_strong_params actionview/test/template/url_helper_test.rb:245: def test_button_to_with_unpermited_strong_params activerecord/test/cases/relations_test.rb:1620: def test_update_on_relation_passing_active_record_object_is_not_permited ```
* | | | | Remove test to the db:test:cloneRafael Mendonça França2017-01-031-10/+0
| | | | |
* | | | | Remove deprecated CONTROLLER environment variable for routes taskRafael Mendonça França2017-01-033-49/+29
| | | | |
* | | | | Remove deprecated tasks in railtiesRafael Mendonça França2017-01-032-12/+5
| | | | |
* | | | | Remove deprecated file `rails/rack/debuggerRafael Mendonça França2017-01-032-3/+4
| | | | |
* | | | | Remove deprecated config.serve_static_filesRafael Mendonça França2017-01-033-29/+4
| | | | |
* | | | | Remove deprecated `config.static_cache_control`Rafael Mendonça França2017-01-034-24/+6
| | | | |
* | | | | Merge pull request #21233 from ↵Rafael França2017-01-0325-114/+207
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | mtsmfm/disable-referential-integrity-without-superuser-privileges Use `SET CONSTRAINTS` for `disable_referential_integrity` without superuser privileges
| * | | | Use `SET CONSTRAINTS` for `disable_referential_integrity` without superuser ↵Fumiaki MATSUSHIMA2016-12-0325-114/+207
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | privileges ref: 72c1557254 - We must use `authors` fixture with `author_addresses` because of its foreign key constraint. - Tests require PostgreSQL >= 9.4.2 because it had a bug about `ALTER CONSTRAINTS` and fixed in 9.4.2.
* | | | | Merge pull request #25522 from ↵Rafael França2017-01-033-20/+24
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | kamipo/fix_select_rows_method_signature_for_consistency Fix `select_rows` method signature for consistency
| * | | | | Fix `select_rows` method signature for consistencyRyuta Kamizono2017-01-043-20/+24
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Related #22973, #24708. `select_all`, `select_one`, `select_value`, and `select_values` method signature is `(arel, name = nil, binds = [])`. But `select_rows` is `(sql, name = nil, binds = [])`.
* | | | | Remove unneeded requires at active recordRafael Mendonça França2017-01-033-5/+0
| | | | |
* | | | | Merge pull request #25626 from maclover7/jm-standardize-ac-readmeRafael França2017-01-031-0/+9
|\ \ \ \ \ | | | | | | | | | | | | Standardize Action Cable README.md
| * | | | | Standardize Action Cable README.mdJon Moss2016-07-021-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All other Rails components feature this section, Action Cable should have it as well. [ci skip]
* | | | | | Merge pull request #26689 from kamipo/deprecate_passing_name_to_indexesRafael Mendonça França2017-01-037-5/+29
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Deprecate passing `name` to `indexes` like `tables`
| * | | | | | Deprecate passing `name` to `indexes` like `tables`Ryuta Kamizono2017-01-047-5/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Passing `name` to `tables` is already deprecated at #21601. Passing `name` to `indexes` is also unused.
* | | | | | | Remove deprecation of using ActiveRecord::Base instance in .updateRafael Mendonça França2017-01-033-6/+5
| | | | | | |
* | | | | | | Remove deprecated db:test:clone* tasksRafael Mendonça França2017-01-032-24/+4
| | | | | | |
* | | | | | | Merge pull request #27560 from kamipo/fix_test_name_deprecated_to_not_permittedRafael Mendonça França2017-01-031-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix test name `deprecated` to `not_permitted`
| * | | | | | | Fix test name `deprecated` to `not_permitted`Ryuta Kamizono2017-01-031-2/+2
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | Follow up to 4b6709e818177792735e99a70ec03210c0ac38dc.
* | | | | | | Merge pull request #27559 from maclover7/jm-ar-changelog-grammarJon Moss2017-01-031-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Rephrase CHANGELOG.md entry
| * | | | | | Rephrase CHANGELOG.md entryJon Moss2017-01-031-1/+1
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Rephrase entry with better sounding English. [ci skip]
* | | | | | Merge pull request #25460 from maclover7/jm-uncachedSean Griffin2017-01-031-0/+21
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Add explicit testing for `uncached` vs. `cached`
| * | | | | Add explicit testing for `uncached` vs. `cached`Jon Moss2016-06-211-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are a ton of middleware related tests in this file, and it seems like `cached vs. `uncached` is being neglected. Added in a test to confirm the expected behavior.
* | | | | | Generate indexed names in input even when objects are not persistedRafael Mendonça França2017-01-032-6/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When you ask to generate multiple nested inputs using: field_for('comments[]', Comment.new) do |c| c.text_field :body Rails should generated the names like `post[comments][][body]`. To make sure we don't have regression the fake models now use the same implementation of `#to_param` as `ActiveRecord::Base` Fixes #26942
* | | | | | Merge pull request #26352 from kamipo/avoid_to_call_set_inverse_instance_twiceArthur Nogueira Neves2017-01-032-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | Avoid to call `set_inverse_instance` twice for `has_many` association
| * | | | | | Avoid to call `set_inverse_instance` twice for `has_many` associationRyuta Kamizono2016-12-282-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `create`, `create!`, and `concat` in `has_many` association hits `set_inverse_instance` twice. It is enough to hit only once.
* | | | | | | Merge pull request #25927 from y-yagi/remove_needless_warning_for_hstoreSean Griffin2017-01-031-5/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | remove needless warning for hstore
| * | | | | | | remove needless warning for hstoreyuuji.yaginuma2016-08-151-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rails 5 supports only Postgresql 9.1 or higher, warning is needless because in the case of Postgresql 9.0 or less does not work.
* | | | | | | | Merge pull request #27517 from maclover7/jm-fix-27502Sean Griffin2017-01-033-0/+34
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Compare deserialized values for `PostgreSQL::OID::Hstore` types
| * | | | | | | | Compare deserialized values for `PostgreSQL::OID::Hstore` typesJon Moss2017-01-033-0/+34
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Per the regression commit below, the commit changes the behavior of `#changed?`to consult the `#changed_in_place?` method on `Type::Value` classes. Per this change, `PostgreSQL::OID::Hstore` needs to override this method in order to compare the deserialized forms of the two arguments. In Ruby, two hashes are considered equal even if their key order is different. This commit helps to bring that behavior to `Hstore` values. Fixes regression introduced by 8e633e505880755e7e366ccec2210bbe2b5436e7 Fixes #27502
* | | | | | | | Merge pull request #24596 from maclover7/jm-cleanup-3Kasper Timm Hansen2017-01-032-4/+10
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Extract variant setter to process method
| * | | | | | | | Extract variant setter to process methodJon Moss2017-01-022-4/+10
| | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Provide an API interface similar to how format is handled in Controllers. In situations where variants are not needed (ex: in Action Mailer) the method will simply trigger a no-op, and will not affect end users.
* | | | | | | | [ci skip] Find and record the article! 🤓Kasper Timm Hansen2017-01-031-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #27555. [ Ben A. Morgan & Kasper Timm Hansen ]