aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #28544 from vipulnsward/fix-on-ruby-masterKasper Timm Hansen2017-03-232-13/+26
|\ | | | | Fix duplicable? for Rational and Complex on ruby master, since they are now duplicable
| * Fix duplicable? for Ratiional and Complex on ruby master, since they are now ↵Vipul A M2017-03-232-13/+26
| | | | | | | | duplicable
* | Merge pull request #28543 from mtsmfm/move-comment-to-inside-the-methodVipul A M2017-03-231-1/+1
|\ \ | |/ |/| Move comment to inside the method [ci skip]
| * Move comment to inside the method [ci skip]Fumiaki MATSUSHIMA2017-03-231-1/+1
|/ | | | | | Because this comment is not document for `supports_ranges?` ref: https://github.com/rails/rails/pull/27636#discussion_r107560081
* Merge pull request #28540 from kamipo/remove_collection_proxy_uniqRafael França2017-03-231-4/+0
|\ | | | | Remove `CollectionProxy#uniq`
| * Remove `CollectionProxy#uniq`Ryuta Kamizono2017-03-231-4/+0
|/ | | | | Since #28473 `uniq` is delegated to `records`, so `CollectionProxy#uniq` is unnecessary.
* Merge pull request #28537 from tjschuck/doc_actioncable_reject_unauthed_connxRafael França2017-03-221-5/+5
|\ | | | | Document AC::Connection::Authorization#reject_unauthorized_connection
| * Document AC::Connection::Authorization#reject_unauthorized_connectionT.J. Schuck2017-03-221-5/+5
| | | | | | | | | | | | | | This method is repeatedly used throughout the docs (in the [AC::Connection docs](https://github.com/rails/rails/blob/12b684985837bc8ee9ad15c174cf4e07ca82d7c4/actioncable/lib/action_cable/connection/base.rb#L28), the [AC README](https://github.com/rails/rails/blob/12b684985837bc8ee9ad15c174cf4e07ca82d7c4/actioncable/README.md#a-full-stack-example), the [AC Guides](https://github.com/rails/rails/blob/12b684985837bc8ee9ad15c174cf4e07ca82d7c4/guides/source/action_cable_overview.md#connection-setup)), but not actually documented itself and seemingly not supported for public use based on its current `private` status. This actually makes the method public and documents it. The actual behavior that’s documented here is implemented [here](https://github.com/rails/rails/blob/12b684985837bc8ee9ad15c174cf4e07ca82d7c4/actioncable/lib/action_cable/connection/base.rb#L213-L219), via [this rescuing of the UnauthorizedError](https://github.com/rails/rails/blob/3dd1de8ba4d5862b01e7f5dd3878b21fd98b443b/actioncable/lib/action_cable/connection/base.rb#L172). The method is [already tested here](https://github.com/rails/rails/blob/25473baf409185638073fe2f016f4b9dda284e50/actioncable/test/connection/authorization_test.rb#L17-L29).
* | Merge pull request #28534 from claudiob/list-webpackersRafael França2017-03-221-1/+2
|\ \ | | | | | | List options for `rails new --webpack=WEBPACK`
| * | List options for `rails new --webpack=WEBPACK`claudiob2017-03-221-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When you type `rails new -h`, the `--database=DATABASE` options display this useful message: > Preconfigure for selected database (options: mysql/postgresql/sqlite3/oracle/frontbase/ibm_db/sqlserver/jdbcmysql/jdbcsqlite3/jdbcpostgresql/jdbc) However, the `--webpack=WEBPACK` option only displays this: > Preconfigure for app-like JavaScript with Webpack so it's hard to know *which* values are valid for `WEBPACK`. This commit improves the help message to display: > Preconfigure for app-like JavaScript with Webpack (options: react/vue/angular) The implication of this commit is that the list needs to be manually updated whenever rails/webpacker adds support for a new framework. However, I don't imagine this list to change very frequently, and I think that the benefit of display the list to the users is greater than the hustle of updating the list when needed.
* | | No need to have an entry that was included in 5.1 in 5.2Rafael Mendonça França2017-03-221-11/+0
| | | | | | | | | | | | [ci skip]
* | | Merge pull request #28528 from domcleal/parseerror-const-deprecationRafael França2017-03-225-1/+88
|\ \ \ | | | | | | | | Change AD::ParamsParser::ParseError deprecation so it can be rescued
| * | | Use DeprecatedConstantAccessor for AD::ParamsParser::ParseErrorDominic Cleal2017-03-221-1/+2
| | | | | | | | | | | | | | | | Fixes #28525
| * | | Add AS::Deprecation::DeprecatedConstantAccessorDominic Cleal2017-03-224-0/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | | An alternative to DeprecatedConstantProxy which works more transparently with exceptions because it returns the object that the new constant refers to rather than a proxy. This is then compatible with `rescue OldException`.
* | | | Merge pull request #28527 from rst/fix_runner_argv_28515Rafael França2017-03-222-2/+11
|\ \ \ \ | | | | | | | | | | Correctly reset ARGV for "rails runner `CODE' arg arg arg..."
| * | | | Fixup trailing whitespace, per complaints from CodeClimate.Robert Thau2017-03-221-1/+1
| | | | |
| * | | | Correctly reset ARGV for "rails runner `CODE' arg arg arg..."Robert Thau2017-03-222-2/+11
| |/ / / | | | | | | | | | | | | | | | | | | | | The code itself should not be in the ARGV vector. Fixes #28515
* | | | Merge pull request #28513 from maclover7/jm-fix-28500Rafael França2017-03-222-2/+12
|\ \ \ \ | | | | | | | | | | CLI arg "host" has precedence over ENV var "host"
| * | | | CLI arg "host" has precedence over ENV var "host"Jon Moss2017-03-212-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a regression from when the server command switched to its own argument parser, as opposed to Rack's. Rack's argument parser, when provided with a "host" argument, gives that value precedence over environment variables.
* | | | | Merge pull request #28526 from kamipo/fix_log_subscriber_to_allow_legacy_bindsRafael França2017-03-223-77/+77
|\ \ \ \ \ | | | | | | | | | | | | Fix `LogSubscriber` to allow legacy `binds`
| * | | | | Fix `LogSubscriber` to allow legacy `binds`Ryuta Kamizono2017-03-233-77/+77
| | |/ / / | |/| | | | | | | | | | | | | Follow up of #27939.
* | | | | Merge pull request #28524 from claudiob/comment-api-keyRafael França2017-03-221-2/+2
|\ \ \ \ \ | |_|_|/ / |/| | | | Don't add a dummy API key to every new Rails app
| * | | | Don't add a dummy API key to every new Rails appclaudiob2017-03-221-2/+2
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Every new Rails app is currently generated with `Rails.application.secrets[:api_key]` set to `123`. This comes from a line in `config/secrets.yml` that, in my opinion, should be left commented out to only serve as a syntax example, rather than being actually set in every Rails app. Additionally, we might want to give a better example than `123`, since in the same file we are suggesting to > Make sure the secret is at least 30 characters and all random, > no regular words or you'll be exposed to dictionary attacks. The result of this commit is that `config/secrets.yml` will include something like: ```yaml # Shared secrets are available across all environments. # shared: # api_key: f56930851993982510d5bd9236f4108f6fe7c15448f1c6923a51872e0dbae1a24d274b318abb6518b540dfb51079c61640885f607467e5ed1053849be7587d61 ``` rather than this: ```yaml # Shared secrets are available across all environments. shared: api_key: 123 ```
* | | | Merge pull request #28530 from kamipo/fix_ci_failureMatthew Draper2017-03-231-2/+2
|\ \ \ \ | |_|_|/ |/| | | Fix `assert_logged` failure
| * | | Fix `assert_logged` failureRyuta Kamizono2017-03-231-2/+2
| | | | | | | | | | | | | | | | | | | | `'#{name}' file doesn't exist, so no dependencies` was removed in bb04814.
* | | | Small grammar fixJon Moss2017-03-221-1/+1
| | | | | | | | | | | | | | | | [ci skip]
* | | | Merge pull request #28523 from ↵Matthew Draper2017-03-232-16/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | y-yagi/dont_comment_out_file_watcher_during_rails_upgrade_process Don't comment out config.file_watcher during Rails upgrade
| * | | | Don't comment out config.file_watcher during Rails upgradeyuuji.yaginuma2017-03-222-16/+0
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | This is necessary only when updating to Rails 5.0, it is not necessary for updating to 5.1. Related #24243
* | | | Merge pull request #28531 from yahonda/suppress_pg_warningMatthew Draper2017-03-231-0/+1
|\ \ \ \ | | | | | | | | | | Suppress `WARNING: nonstandard use of \\ in a string literal` warning
| * | | | Suppress `WARNING: nonstandard use of \\ in a string literal` warningYasuo Honda2017-03-221-0/+1
| |/ / / | | | | | | | | | | | | by setting `escape_string_warning = off`
* | | | Small grammar fixJon Moss2017-03-221-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | Tried to make the sentence read more clearly. [ci skip]
* | | | Fix a race in ActionCable stream testsMatthew Draper2017-03-231-0/+4
| |/ / |/| | | | | | | | | | | These tests double-stub connection.pubsub, so we need to ensure the first call's completed before we set up for the second.
* | | Merge pull request #28522 from larskanis/replace-deprecated-pg-constantsMatthew Draper2017-03-237-21/+21
|\ \ \ | | | | | | | | [PostgreSQL] Replace deprecated PG constants.
| * | | [PostgreSQL]: Replace deprecated PG constants.Lars Kanis2017-03-227-21/+21
| |/ / | | | | | | | | | | | | The old top level classes PGconn, PGresult and PGError were deprecated since pg-0.13.0: https://github.com/ged/ruby-pg/blob/master/History.rdoc#v0130-2012-02-09-michael-granger-gedfaeriemudorg
* | | Skip isolated test runs on older rubiesMatthew Draper2017-03-231-0/+1
| | |
* | | Stop complaining about not being able to digest dynamic template partial ↵David Heinemeier Hansson2017-03-221-2/+4
|/ / | | | | | | names and simplify error logging to a single line when not
* | Merge pull request #28394 from shime/docs-action-dispatchXavier Noria2017-03-2231-96/+96
|\ \ | | | | | | [docs] fix ActionDispatch documentation
| * | [docs] fix ActionDispatch documentationHrvoje Šimić2017-03-1331-96/+96
| | |
* | | Update bug report templatesMatthew Draper2017-03-225-5/+5
| | |
* | | Start Rails 5.2 developmentMatthew Draper2017-03-2234-2447/+90
| |/ |/|
* | Merge pull request #28056 from sngeth/wrap_store_accessors_in_paramsRafael França2017-03-212-1/+18
|\ \ | | | | | | Wrap stored accessors in parameters
| * | Wrap store accessors in parametersSid Ngeth2017-03-212-1/+18
| | | | | | | | | | | | Modified params wrapper to account for model's stored_attributes
* | | Fix test assertionRafael Mendonça França2017-03-211-1/+1
| | |
* | | Fix test that was asserting the wrong thingRafael Mendonça França2017-03-211-1/+1
|/ /
* | Revert "Merge pull request #27775 from domcleal/27774-format-reset"Rafael Mendonça França2017-03-212-15/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit c6f9f8c28a720ad4ec7cf3613dddfa451d5968e2, reversing changes made to c309073c7476f50dfb1e796d058580f176101c36. Reason: This is fixing the behavior in the wrong place. Now the request path after the request is nil and there is no way to assert that. Also the test that was added in that PR also fails in 4.2 where the reporter says it was passing. The reason the bahavior changed between Rails 4.2 and Rails 5 is that the format in the path is now respected. The correct way to fix the problem is not doign two requests in the same controller test and use integrations tests. This change caused a regression between Rails 5.0.1 and 5.0.2.
* | Merge pull request #28450 from adamgamble/bug_fix/fix_typo_in_actionviewRafael França2017-03-211-1/+1
|\ \ | | | | | | Fix typo in actionview error message in to_form_params helper method
| * | Fix typo in actionview error messageadamgamble2017-03-171-1/+1
| | |
* | | Merge pull request #28497 from jhawthorn/unscope_specific_where_valueAndrew White2017-03-212-2/+10
|\ \ \ | | | | | | | | Fix where_clause#except with specific where value
| * | | Fix where_clause#except with specific where valueJohn Hawthorn2017-03-202-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes a regression introduced in 22ca710f20c3c656811df006cbf1f4dbc359f7a6 where Relation#unscope with a specific where value (vs unscoping the entire where clause) could result in the wrong binds being left on the query. This was caused by an index variable not being incremented properly.
* | | | Remove 5.0.0 entry from 5.1.0 CHANGELOG [ci skip]claudiob2017-03-201-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The entry for PR #25430 is currently present both in the CHANGELOG for Rails 5.0 and for Rails 5.1: https://github.com/rails/rails/blame/9d3a352777c2594123583b0bc02d0dd80f1e385b/railties/CHANGELOG.md#L61-L72 Since the PR was backported to 5-0-stable in #25499, I believe it should be removed from the CHANGELOG of 5.1, otherwise it looks like something changed from 5.0 to 5.1
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-15 05:25:31 +0000