aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #28570 from kamipo/rename_local_current_user_to_verified_userKasper Timm Hansen2017-03-251-2/+2
|\ | | | | Rename local variable name `current_user` to `verified_user` [ci skip]
| * Rename local variable name `current_user` to `verified_user` [ci skip]Ryuta Kamizono2017-03-251-2/+2
|/ | | | | Assigning local variable named `current_user` in the condition is confusing.
* Revert "Merge pull request #28569 from HarryCollins/patch-1"Kasper Timm Hansen2017-03-251-1/+1
| | | | | | | This reverts commit 296d024b4e91c4891ae0b010249193513e63b921, reversing changes made to e341d835070c7ef9990f41e02bbf46536be0aee7. We aren't trying to compare to current_user, we're assigning that variable.
* Merge branch 'master' of github.com:rails/docrailsVijay Dev2017-03-252-4/+4
|\
| * Update Configuring Rails Component guide exampleHendy Tanata2017-03-211-1/+1
| | | | | | | | | | | | config.time_zone is no longer in included in config/application.rb. See 28dcadc0140dfdebe87d5e691fd709c0a9ae0bae.
| * Edits to Systems testing section [ci skip]Vipul A M2017-03-091-3/+3
| |
* | Merge pull request #28569 from HarryCollins/patch-1Ryuta Kamizono2017-03-251-1/+1
|\ \ | | | | | | Update Action Cable README.md - typo fix [ci skip]
| * | Update Action Cable README.md - typo fixHarryCollins2017-03-251-1/+1
| | |
* | | Merge pull request #28568 from y-yagi/fix_doc_format_for_duplicableRyuta Kamizono2017-03-251-6/+6
|\ \ \ | |/ / |/| | Fix doc format for `duplicable?` [ci skip]
| * | Fix doc format for `duplicable?` [ci skip]yuuji.yaginuma2017-03-251-6/+6
|/ /
* | Doc cleanup for caching guide [ci skip] (#28556)Vipul A M2017-03-241-4/+4
| |
* | Merge pull request #28555 from vipulnsward/rm-commentsVipul A M2017-03-241-2/+2
|\ \ | | | | | | Remove unnecessary ruby version comments
| * | Remove unnecessary ruby version comments [ci skip]Vipul A M2017-03-241-2/+2
|/ /
* | Merge pull request #28550 from ↵Jon Moss2017-03-231-2/+2
|\ \ | | | | | | | | | | | | rachel-carvalho/update_browser_compatibility_for_http_verbs Update guide to reflect browser compatibility for HTTP verbs
| * | update guide to reflect browser compatibility for HTTP verbs [ci skip]Rachel Carvalho2017-03-231-2/+2
| | |
* | | Merge pull request #28547 from brchristian/patch-2Jon Moss2017-03-231-1/+7
|\ \ \ | |/ / |/| | Additional explanation about cache implementations
| * | Additional explanation about cache implementationsbrchristian2017-03-231-1/+7
|/ /
* | Merge pull request #28532 from maclover7/jm-ruby-241Matthew Draper2017-03-241-4/+4
|\ \ | | | | | | Bump Travis ruby version to 2.4.1
| * | Bump Travis ruby version to 2.4.1Jon Moss2017-03-221-4/+4
| | | | | | | | | | | | https://www.ruby-lang.org/en/news/2017/03/22/ruby-2-4-1-released/
* | | 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]
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 16:20:34 +0000