aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of github.com:rails/docrailsVijay Dev2016-10-202-4/+4
|\
| * Corrected comments referring to documentation inIain Beeston2016-10-031-3/+3
| | | | | | | | | | | | | | | | `ActiveRecord::Type::Value` This is now defined in `ActiveModel::Type::Value` (`ActiveRecord::Type::Value` still exists but it's effectively an alias)
| * Corrected comments referring to ActiveModel::AttributesIain Beeston2016-10-031-1/+1
| | | | | | | | Should be ActiveRecord::Attributes (ActiveModel::Attributes does not exist)
* | Use old typecasting method if no type casted binds are passed inAaron Patterson2016-10-202-2/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | Query cache doesn't type cast bind parameters since it isn't actually querying the database, so it can't pass those values in. Type casting in the query cache method would cause the values to be type cast twice in the case that there is a cache miss (since the methods it calls will type cast *again*). If logging is disabled, then adding the type cast code to the query cache method will needlessly typecast the values (since the only reason those values are type cast is for display in the logs). Fixes #26828.
* | Merge pull request #26830 from headius/mask_forking_fsevent_test_on_jrubyRafael Mendonça França2016-10-201-0/+2
| | | | | | | | Mask forking filesystem event on JRuby.
* | render_bind should be privateAaron Patterson2016-10-191-10/+10
| |
* | Merge pull request #26829 from headius/wait_for_events_in_listen_testsAaron Patterson2016-10-191-0/+18
| | | | | | | | Wait for file events to propagated for slower Listen backends.
* | Merge pull request #26825 from orhantoy/fix-doc-code-indentationJon Moss2016-10-191-4/+4
|\ \ | | | | | | [ci skip] Fix indentation of code examples
| * | Fix indentation of code examplesOrhan Toy2016-10-191-4/+4
|/ / | | | | | | This commit fixes the generated HTML of the two code examples.
* | Merge pull request #26821 from y-yagi/update_doc_about_change_column_defaultप्रथमेश Sonpatki2016-10-191-2/+4
|\ \ | | | | | | update doc about `change_column_default` [ci skip]
| * | update doc about `change_column_default` [ci skip]yuuji.yaginuma2016-10-191-2/+4
|/ / | | | | | | Follow up to #20018.
* | Merge pull request #26809 from alexcameron89/contributing_guide_typoJon Moss2016-10-171-1/+1
|\ \ | | | | | | [ci skip] Fix typo in Guides: Contributing
| * | [ci skip] Fix typo in Guides: ContributingAlex Kitchens2016-10-171-1/+1
|/ /
* | /s/integrations/integration [ci skip] (#26801)प्रथमेश Sonpatki2016-10-161-1/+1
| |
* | Merge pull request #26800 from prathamesh-sonpatki/bump-bundlerGuillermo Iguaran2016-10-161-0/+1
|\ \ | | | | | | Bump bundler version in the before_install hook of travis
| * | Bump bundler version in the before_install hook of travisPrathamesh Sonpatki2016-10-161-0/+1
|/ / | | | | | | | | | | | | | | - We were running into issues with old bundler versions on 4.2 builds. So we bumped the bundler version on 4-2-stable branch in https://github.com/rails/rails/pull/26592. - This commit applies same change to master as per discussion in https://github.com/rails/rails/pull/26592#issuecomment-254026755.
* | Merge pull request #26786 from codeodor/patch-1Eileen M. Uchitelle2016-10-153-1/+16
|\ \ | | | | | | Allow any key in Renderer environment hash
| * | Allow any key in Renderer environment hashSammy Larbi2016-10-153-1/+16
| | | | | | | | | | | | | | | | | | When rendering arbitrary templates, it is helpful to not overwrite `env` keys with nil if they don't match any found in the `RACK_KEY_TRANSLATION` This allows the developer to set the environment to exactly what is needed for rendering.
* | | Copy-edit the documentationRafael Mendonça França2016-10-151-4/+4
| | | | | | | | | | | | [ci skip]
* | | Merge pull request #26793 from zachaysan/masterRafael França2016-10-151-98/+100
|\ \ \ | | | | | | | | Make `process` a non-private method and update documentation.
| * | | Make `process` a non-private method and update documentation.Zach Aysan2016-10-151-98/+100
| | | |
* | | | Merge pull request #26598 from ↵Eileen M. Uchitelle2016-10-151-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | rutaka-n/raise_record_not_found_with_correct_params initialize errors with name of class and other params
| * | | | initialize errors with name of class and other paramsv.promzelev2016-09-231-2/+2
| | | | |
* | | | | Pull request for ticket 26769 (#26770)rmarone2016-10-151-1/+1
| |/ / / |/| | | | | | | | | | | | | | | | | | | * Clarify the default behavior of log_formatter Updates language to remove reference to production.rb and fix quoting
* | | | Merge pull request #26792 from rails/benchmark-templateGodfrey Chan2016-10-152-27/+67
|\ \ \ \ | | | | | | | | | | Introduce a benchmark template
| * | | | Introduce a benchmark template [ci skip]Godfrey Chan2016-10-152-27/+67
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This replaces boilerplate in the “benchmark your code” section of the contributors’ guide with an executable template. I also amended the text to encourage best practices and codified it in the template. For now this is only good for relatively self-contained changes that can be inlined into a simple script. In the future, this can be expanded to cover how to measure the difference between two commits. The output looks like this: ``` ==================================== Empty ===================================== Warming up -------------------------------------- blank? 225.963k i/100ms fast_blank? 238.147k i/100ms Calculating ------------------------------------- blank? 8.825M (± 6.4%) i/s - 44.063M in 5.014824s fast_blank? 9.311M (± 6.3%) i/s - 46.439M in 5.009153s Comparison: fast_blank?: 9310694.8 i/s blank?: 8824801.7 i/s - same-ish: difference falls within error ================================= Single Space ================================= Warming up -------------------------------------- blank? 56.581k i/100ms fast_blank? 232.774k i/100ms Calculating ------------------------------------- blank? 813.985k (±16.7%) i/s - 4.017M in 5.076576s fast_blank? 9.547M (± 5.2%) i/s - 47.719M in 5.013204s Comparison: fast_blank?: 9547414.0 i/s blank?: 813985.0 i/s - 11.73x slower ================================== Two Spaces ================================== Warming up -------------------------------------- blank? 58.265k i/100ms fast_blank? 244.056k i/100ms Calculating ------------------------------------- blank? 823.343k (±16.2%) i/s - 4.020M in 5.014213s fast_blank? 9.484M (± 4.9%) i/s - 47.347M in 5.005339s Comparison: fast_blank?: 9484021.6 i/s blank?: 823343.1 i/s - 11.52x slower =============================== Mixed Whitspaces =============================== Warming up -------------------------------------- blank? 53.919k i/100ms fast_blank? 237.103k i/100ms Calculating ------------------------------------- blank? 763.435k (±16.8%) i/s - 3.720M in 5.018029s fast_blank? 9.672M (± 5.8%) i/s - 48.369M in 5.019356s Comparison: fast_blank?: 9672467.2 i/s blank?: 763435.4 i/s - 12.67x slower =============================== Very Long String =============================== Warming up -------------------------------------- blank? 34.037k i/100ms fast_blank? 240.366k i/100ms Calculating ------------------------------------- blank? 409.731k (± 8.9%) i/s - 2.042M in 5.028235s fast_blank? 9.794M (± 4.3%) i/s - 49.035M in 5.016328s Comparison: fast_blank?: 9794225.2 i/s blank?: 409731.4 i/s - 23.90x slower ```
* | | | Merge pull request #26784 from kamipo/quote_table_name_properlyRafael França2016-10-145-24/+35
|\ \ \ \ | | | | | | | | | | Quote table name properly
| * | | | Quote table name properlyRyuta Kamizono2016-10-145-24/+35
| | |/ / | |/| | | | | | | | | | If does not quote table name properly, invalid SQL is generated.
* | | | Add comment to remove code when we are in Ruby 2.4Rafael Mendonça França2016-10-141-0/+1
| | | |
* | | | 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.
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-21 10:46:22 +0000