aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Enforce middleware ordering with a test, instead of commentsMatthew Draper2016-12-312-6/+35
| | | | | | | | | We want the actual order to be very predictable, so it's rightly defined in code -- not with an on-the-fly tsort. But we can do the tsort here, and then verify that it matches the implemented ordering. This way we don't leave future readers guessing which parts of the ordering are deliberate and which are arbitrary.
* Merge pull request #27515 from ↵Matthew Draper2016-12-312-3/+4
|\ | | | | | | | | | | kbrock/fix_log_remote_ip_before_dispatcher_ips_settings Allow log remote ip addres when config.action_dispatch.trusted_proxie…
| * Allow log remote ip addres when config.action_dispatch.trusted_proxies passedLeonid Batizhevsky2016-12-302-2/+3
|/
* Merge pull request #27512 from ↵Rafael França2016-12-301-3/+1
|\ | | | | | | | | kamipo/remove_needless_activesupport_deprecation_silence Remove needless `ActiveSupport::Deprecation.silence`
| * Remove needless `ActiveSupport::Deprecation.silence`Ryuta Kamizono2016-12-311-3/+1
| |
* | Merge pull request #27509 from kamipo/remove_remaining_deprecationsRafael França2016-12-309-58/+9
|\ \ | |/ |/| Remove remaining ActiveRecord deprecations
| * Remove deprecated `#uniq`, `#uniq!`, and `#uniq_value`Ryuta Kamizono2016-12-307-46/+5
| |
| * Remove deprecated `#insert_sql`, `#update_sql`, and `#delete_sql`Ryuta Kamizono2016-12-303-12/+4
|/
* Merge pull request #27506 from maclover7/jm-ar-changelogJon Moss2016-12-291-5/+5
|\ | | | | Grammar linting in activerecord/CHANGELOG.md
| * Grammar linting in activerecord/CHANGELOG.mdJon Moss2016-12-291-5/+5
|/ | | | [ci skip]
* Merge pull request #27504 from kenta-s/fix-grammar-in-ar-changelogJon Moss2016-12-291-1/+1
|\ | | | | Fix grammar in AR CHANGELOG.md [ci skip]
| * Fix grammar in AR CHANGELOG.md [ci skip]kenta-s2016-12-301-1/+1
|/
* Merge pull request #27503 from rails/activerecord-deprecationRafael França2016-12-2966-650/+329
|\ | | | | Remove all ActiveRecord deprecations
| * Delayed job doesn't support Active Record 5.1 yetRafael Mendonça França2016-12-291-1/+2
| |
| * Remove deprecated #use_transactional_fixtures configurationRafael Mendonça França2016-12-293-31/+5
| |
| * Remove deprecated `#raise_in_transactional_callbacks` configurationRafael Mendonça França2016-12-292-10/+4
| |
| * Remove deprecated #load_schema_forRafael Mendonça França2016-12-292-8/+4
| |
| * Remove deprecated conditions parameter from #delete_allRafael Mendonça França2016-12-293-26/+12
| |
| * Remove deprecated conditions parameter from `#destroy_all`Rafael Mendonça França2016-12-293-16/+6
| |
| * Remove deprecated support to passing arguments to `#select` when a block is ↵Rafael Mendonça França2016-12-293-10/+5
| | | | | | | | provided.
| * Remove deprecated support to query using commas on LIMITRafael Mendonça França2016-12-294-37/+9
| |
| * Remove deprecated support to passing a class as a value in a queryRafael Mendonça França2016-12-294-40/+4
| |
| * Raises IrreversibleOrderError when using last with an irreversible orderRafael Mendonça França2016-12-293-9/+6
| |
| * Raise when a through association has an ambiguous reflection nameRafael Mendonça França2016-12-294-10/+27
| |
| * Raises when `ActiveRecord::Migration` is inherited directly.Rafael Mendonça França2016-12-294-54/+35
| |
| * Remove original_exception from ActiveRecord::StatementInvalidRafael Mendonça França2016-12-293-12/+7
| |
| * `#tables` and `#table_exists?` and returns only tables and not viewsRafael Mendonça França2016-12-2919-166/+131
| |
| * Remove deprecated `name` argument from `#tables`Rafael Mendonça França2016-12-298-30/+10
| |
| * Remove deprecated support to passing a column to #quoteRafael Mendonça França2016-12-2914-44/+38
| |
| * Set time as a timezone aware type and remove related deprecationRafael Mendonça França2016-12-293-26/+7
| |
| * Remove deprecated force reload argument in association readersRafael Mendonça França2016-12-299-67/+12
| |
| * Remove deprecated i18n scopes in Active RecordRafael Mendonça França2016-12-295-55/+7
|/
* Merge pull request #27493 from kamipo/sync_visibilityRafael França2016-12-291-1/+1
|\ | | | | Sync the visibility of `sql_for_insert` to private
| * Sync the visibility of `sql_for_insert` to privateRyuta Kamizono2016-12-291-1/+1
| | | | | | | | | | The visibility of all internal protected methods was changed to private since 5b14129.
* | Merge pull request #27371 from yukideluxe/with-routing-api-onlyKasper Timm Hansen2016-12-293-2/+33
|\ \ | | | | | | fix with_routing test helper to make it work with api-only controllers
| * | fix with_routing when testing api only controllersJulia López2016-12-293-2/+33
|/ /
* | [ci skip] Add changelog for 261e94b.Kasper Timm Hansen2016-12-291-0/+7
| | | | | | | | [ *Kasper Timm Hansen* & *Kir Shatrov* ]
* | Remove try! usage in sqlite_database_tasks.Kasper Timm Hansen2016-12-291-2/+2
| | | | | | | | We try to not try! internally.
* | Merge pull request #27437 from kirs/structure-load-dump-flagsKasper Timm Hansen2016-12-297-15/+109
|\ \ | | | | | | Make ActiveRecord structure load/dump configurable
| * | Make ActiveRecord structure load/dump configurableKir Shatrov2016-12-227-15/+109
| | | | | | | | | | | | | | | | | | | | | | | | Without this patch it's impossible to pass extra flags to mysqldump/pg_dump when running `rake db:structure:dump` or `load` The following config variables (`structure_load_flags` and `structure_dump_flags`) make it better configurable.
* | | [ci skip] Rejigger the dublicable? wording a bit.Kasper Timm Hansen2016-12-291-9/+12
| | |
* | | Merge pull request #27346 from utilum/core_ext_guide_duplicableKasper Timm Hansen2016-12-291-17/+31
|\ \ \ | | | | | | | | Update list of `duplicable?` objects in AS core_ext guide [ci skip]
| * | | Update list of `duplicable?` objects in AS core_ext guide [ci skip]utilum2016-12-231-17/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Complex and Rational objects can not be duplicated. Duplicable objects in Ruby 2.4.0 include: - most numbers - symbols - `nil` - `true` - `false`
* | | | Merge pull request #26977 from y-yagi/fix_26964Kasper Timm Hansen2016-12-292-90/+110
|\ \ \ \ | | | | | | | | | | use Thor option parser in server commands parse
| * \ \ \ Merge branch 'master' into fix_26964Kasper Timm Hansen2016-12-29458-2495/+4095
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge pull request #27499 from maclover7/jm-fix-27454Rafael França2016-12-292-1/+22
|\ \ \ \ \ | | | | | | | | | | | | Use `next` instead of `break`; avoid terminating whole loop
| * | | | | Use `next` instead of `break`; avoid terminating whole loopJon Moss2016-12-292-1/+22
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We want to avoid terminating the whole loop here, because it will cause parameters that should be removed to not be removed, since we are terminating early. In this specific case, `param2` is processed before `param1` due to the reversing of `route.parts`, and since `param2` fails the check on this line, it would previously cause the whole loop to fail, and `param1` would still be in `parameterized_parts`. Now, we are simply calling `next`, which is the intended behavior. Introduced by 8ca8a2d773b942c4ea76baabe2df502a339d05b1. Fixes #27454.
* | | | | Use proper output format [ci skip] (#27498)प्रथमेश Sonpatki2016-12-292-2/+2
| | | | |
* | | | | Merge pull request #27482 from shardulparab97/patch-8प्रथमेश Sonpatki2016-12-291-0/+3
|\ \ \ \ \ | |_|_|_|/ |/| | | | Update request.rb --ci skip
| * | | | Update request.rb --ci skipShardul Parab2016-12-291-0/+3
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Documentation for ActionDispatch::Request#key? [ci skip] Update request.rb --ci skip Documentation for ActionDispatch::Request#key? [ci skip] Also made change after the review by @rafaelfranca . Update request.rb --ci skip Documentation for ActionDispatch::Request#key? [ci skip] Also made change after the review by @rafaelfranca . Update request.rb --ci skip