aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #26785 from yahonda/diag26774Rafael França2016-10-141-1/+1
|\ | | | | Support index.length for MySQL 8.0.0-dmr
| * Support index.length for MySQL 8.0.0-dmrYasuo Honda2016-10-131-1/+1
| | | | | | | | | | | | | | MySQL 8.0.0-dmr `SUB_PART` column of `information_schema.statistics` changed to varbinary(12), which is bigint(3) in MySQL 5.6. Addresses #26774
* | Merge pull request #26788 from Jesus/masterRafael França2016-10-141-2/+2
|\ \ | | | | | | Use built-in #transform_values when available.
| * | Use built-in #transform_values when available.Jesús Burgos2016-10-141-2/+2
|/ / | | | | | | | | | | | | | | | | | | | | | | The methods Hash#transform_values and Hash#transform_values! have been implemented in Ruby and they'll be available as part of the standard library. Here's the link to the discussion in Ruby's issue tracker: https://bugs.ruby-lang.org/issues/12512 These methods are implemented in C so they're expected to perform better.
* | Merge pull request #26787 from y-yagi/add_missing_closing_tagJon Moss2016-10-131-1/+1
|\ \ | |/ |/| add missing closing tag [ci skip]
| * add missing closing tag [ci skip]yuuji.yaginuma2016-10-141-1/+1
|/
* Merge pull request #26779 from javiercr/patch-1Guillermo Iguaran2016-10-131-3/+3
|\ | | | | Clarify default adapter in ActionCable guide [ci skip]
| * Suggested editsJavier Cuevas2016-10-131-3/+3
| |
| * Improve Action Cable Overview guideJavier Cuevas2016-10-131-3/+3
|/ | | The default adapter in development & test environments is not `redis` but `async`.
* Merge pull request #26765 from claudiob/follow-26518Claudio B2016-10-111-2/+3
|\ | | | | Docs: `tag` only accept attribute names as symbols
| * Docs: `tag` only accept attribute names as symbolsclaudiob2016-10-111-2/+3
| | | | | | | | | | | | | | | | | | | | [ci skip] See https://github.com/rails/rails/issues/26518#issuecomment-252826489 @dhh: > I'd support symbol-only keys going forward with these new APIs. > We can break with the past here since the tag proxy is new and so is form_with.
* | Merge pull request #26768 from alexcameron89/actionpack_changelogRafael França2016-10-111-1/+1
|\ \ | | | | | | [ci skip] fix typo in Actionpack Changelog
| * | [ci skip] fix typo in Actionpack ChangelogAlex Kitchens2016-10-111-1/+1
|/ /
* | Merge pull request #26767 from kamipo/fix_warningRafael França2016-10-111-4/+4
|\ \ | |/ |/| Fix `warning: ambiguous first argument`
| * Fix `warning: ambiguous first argument`Ryuta Kamizono2016-10-121-4/+4
|/ | | | | | | | | ``` test/cases/adapters/postgresql/case_insensitive_test.rb:12: warning: ambiguous first argument; put parentheses or a space even after `/' operator test/cases/adapters/postgresql/case_insensitive_test.rb:16: warning: ambiguous first argument; put parentheses or a space even after `/' operator test/cases/adapters/postgresql/case_insensitive_test.rb:20: warning: ambiguous first argument; put parentheses or a space even after `/' operator test/cases/adapters/postgresql/case_insensitive_test.rb:24: warning: ambiguous first argument; put parentheses or a space even after `/' operator ```
* Merge pull request #26757 from biow0lf/set-target-ruby-versionRafael França2016-10-111-1/+1
|\ | | | | Set target ruby version for rubocop to 2.2 instead 2.3.
| * Set target ruby version for rubocop to 2.2 instead 2.3.Igor Zubkov2016-10-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change will help to catch ruby 2.3+ syntax in code base. Right now, minimal ruby version set to 2.2.2 in gemspecs. Rubocop output before: $ rubocop Inspecting 2133 files .............................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................C............................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................CC......................................................................................................................................................................................................................................................... Offenses: activerecord/test/cases/schema_dumper_test.rb:454:32: C: Prefer double-quoted strings unless you need single quotes to avoid extra backslashes for escaping. output = dump_table_schema('infinity_defaults') ^^^^^^^^^^^^^^^^^^^ guides/bug_report_templates/active_record_migrations_gem.rb:65:4: C: Final newline missing. end guides/bug_report_templates/active_record_migrations_master.rb:64:4: C: Final newline missing. end 2133 files inspected, 3 offenses detected $ After: $ rubocop Inspecting 2133 files .............................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................C............................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................CC......................................................................................................................................................................................................................................................... Offenses: activerecord/test/cases/schema_dumper_test.rb:454:32: C: Prefer double-quoted strings unless you need single quotes to avoid extra backslashes for escaping. output = dump_table_schema('infinity_defaults') ^^^^^^^^^^^^^^^^^^^ guides/bug_report_templates/active_record_migrations_gem.rb:65:4: C: Final newline missing. end guides/bug_report_templates/active_record_migrations_master.rb:64:4: C: Final newline missing. end 2133 files inspected, 3 offenses detected $
* | ActionController::Parameters#deep_dup (#26567)Pavel Evstigneev2016-10-112-0/+29
|/ | | | | | | | | | | * ActionController::Parameters#deep_dup * Tests for ActionController::Parameters#deep_dup * Fix test for ActionController::Parameters#deep_dup * More tests for ActionController::Parameters#deep_dup [Rafael Mendonça França + Pavel Evstigneev]
* Permit same-origin connections by defaultMatthew Draper2016-10-115-8/+21
| | | | | | | | | | | | | | | | | WebSocket always defers the decision to the server, because it didn't have to deal with legacy compatibility... but the same-origin policy is still a reasonable default. Origin checks do not protect against a directly connecting attacker -- they can lie about their host, but can also lie about their origin. Origin checks protect against a connection from 3rd-party controlled script in a context where a victim browser's cookies will be passed along. And if an attacker has breached that protection, they've already compromised the HTTP session, so treating the WebSocket connection in the same way seems reasonable. In case this logic proves incorrect (or anyone just wants to be more paranoid), we retain a config option to disable it.
* Merge pull request #26568 from skateman/cable-sameorigin-as-hostMatthew Draper2016-10-114-1/+18
|\ | | | | | | Optionally allow ActionCable requests from the same host as origin
| * Optionally allow ActionCable requests from the same host as originDávid Halász2016-09-214-1/+18
| | | | | | | | | | | | | | When the `allow_same_origin_as_host` is set to `true`, the request forgery protection permits `HTTP_ORIGIN` values starting with the corresponding `proto://` prefix followed by `HTTP_HOST`. This way it is not required to specify the list of allowed URLs.
* | Merge pull request #26208 from nanaya/pg-insensitive-textMatthew Draper2016-10-113-2/+37
|\ \ | | | | | | | | | Fix case insensitive check for text column in pg
| * | Fix case insensitive check for text column in pgnanaya2016-09-012-0/+30
| | | | | | | | | | | | There's no 'text to text' casting in the cast table so the feature detection fails.
| * | Use proper castingnanaya2016-09-011-2/+2
| | |
* | | Merge pull request #26756 from kamipo/extract_format_colspecRafael França2016-10-102-12/+10
|\ \ \ | | | | | | | | Extract `format_colspec` to format column spec
| * | | Extract `format_colspec` to format column specRyuta Kamizono2016-10-112-12/+10
| | | |
* | | | Merge pull request #26531 from y-yagi/remove_unused_benchmarkRafael França2016-10-101-2/+0
|\ \ \ \ | | | | | | | | | | remove unused require `benchmark`
| * | | | remove unused require `benchmark`yuuji.yaginuma2016-09-171-2/+0
| | | | | | | | | | | | | | | | | | | | `Benchmark` was removed at 4215e9a
* | | | | Merge pull request #26577 from dharamgollapudi/add_licenseRafael França2016-10-101-0/+20
|\ \ \ \ \ | |_|/ / / |/| | | | Add top level license
| * | | | Rename `LICENSE` to `MIT-LICENSE` for consistency with sub projectsDharam Gollapudi2016-09-231-0/+0
| | | | |
| * | | | Add top level licenseDharam Gollapudi2016-09-211-0/+20
| | |_|/ | |/| | | | | | | | | | | | | | | | | | - Add top level license file so that github auto detects the license type - and displays it in the repository overview section - More info at https://github.com/blog/2252-license-now-displayed-on-repository-overview
* | | | Merge pull request #26755 from rafaelfranca/deprecationsRafael França2016-10-1012-300/+25
|\ \ \ \ | | | | | | | | | | Remove deprecations in Active Model, Action View and Active Job
| * | | | Removed deprecated :tokenizer in the length validatorRafael Mendonça França2016-10-104-74/+5
| | | | |
| * | | | Removed deprecated methods in ActiveModel::ErrorsRafael Mendonça França2016-10-103-179/+6
| | | | | | | | | | | | | | | | | | | | `#get`, `#set`, `[]=`, `add_on_empty` and `add_on_blank`.
| * | | | Removed deprecated support to passing the adapter class to .queue_adapterRafael Mendonça França2016-10-103-23/+4
| | | | |
| * | | | Removed deprecated #original_exception in ActiveJob::DeserializationErrorRafael Mendonça França2016-10-102-13/+5
| | | | |
| * | | | Removed deprecated `#original_exception` in `ActionView::Template::Error`.Rafael Mendonça França2016-10-102-11/+5
| | | | |
* | | | | Merge pull request #26753 from kamipo/fix_table_comment_dumpingRafael França2016-10-103-2/+5
|\ \ \ \ \ | | | | | | | | | | | | Fix table comment dumping
| * | | | | Fix table comment dumpingRyuta Kamizono2016-10-113-2/+5
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Follow up to #26735. If `table_options` returns `{ comment: nil }`, `create_table` line is broken. Example: ```ruby create_table "accounts", force: :cascade, do |t| ```
* | | | | Merge pull request #26747 from kamipo/name_is_not_column_optionRafael França2016-10-103-12/+8
|\ \ \ \ \ | | | | | | | | | | | | `name` is not a column option
| * | | | | `name` is not a column optionRyuta Kamizono2016-10-103-12/+8
| |/ / / / | | | | | | | | | | | | | | | `migration_keys` includes `name` but `name` is not a column option.
* | | | | Merge pull request #26750 from bogdanvlviv/docKasper Timm Hansen2016-10-101-6/+6
|\ \ \ \ \ | |/ / / / |/| | | | Add missing @, fix indents. [ci skip]
| * | | | Add missing @, fix indents. [ci skip]bogdanvlviv2016-10-101-6/+6
|/ / / /
* | | | Merge pull request #26578 from jeremy/undeprecate-plural-positional-argRafael França2016-10-102-14/+3
|\ \ \ \ | | | | | | | | | | Undeprecate plural positional argument
| * | | | Undeprecate plural positional argumentJeremy Daer2016-09-212-14/+3
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ```ruby pluralize people.count, 'person', 'people' ``` reads more naturally than ```ruby pluralize people.count, 'person', plural: 'people' ``` so let's not deprecate it. We could label both, but that's a mouthful: ```ruby pluralize people.count, singular: 'person', plural: 'people' ``` (The `plural:` kwarg shipped in 5.0.0, so we're keeping it.)
* | | | Merge pull request #26746 from rails/deprecationsRafael França2016-10-1056-1430/+298
|\ \ \ \ | | | | | | | | | | Remove all deprecations from Action Pack
| * | | | Remove deprecated support to non-keyword arguments in ↵Rafael Mendonça França2016-10-104-98/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `ActionDispatch::IntegrationTest`, `#process`, `#get`, `#post`, `#patch`, `#put`, `#delete`, and `#head`.
| * | | | Remove deprecated `ActionDispatch::IntegrationTest#*_via_redirect`.Rafael Mendonça França2016-10-103-142/+4
| | | | |
| * | | | Remove deprecated `ActionDispatch::IntegrationTest#xml_http_request`Rafael Mendonça França2016-10-103-134/+8
| | | | |
| * | | | Remove deprecated support for passing `:path` and route path as stings in ↵Rafael Mendonça França2016-10-103-17/+7
| | | | | | | | | | | | | | | | | | | | `ActionDispatch::Routing::Mapper#match`