aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Upgrade various Rails 5.0 references to 5.1Jon Moss2017-03-254-12/+13
* Add WIP Rails 5.1 release notes to documents.yamlJon Moss2017-03-251-0/+5
* Merge pull request #28571 from y-yagi/rename_local_current_user_to_verified_u...Kasper Timm Hansen2017-03-251-3/+3
|\
| * Rename local variable name `current_user` to `verified_user` [ci skip]yuuji.yaginuma2017-03-251-3/+3
|/
* 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]Ryuta Kamizono2017-03-251-2/+2
|/
* Revert "Merge pull request #28569 from HarryCollins/patch-1"Kasper Timm Hansen2017-03-251-1/+1
* Merge branch 'master' of github.com:rails/docrailsVijay Dev2017-03-252-4/+4
|\
| * Update Configuring Rails Component guide exampleHendy Tanata2017-03-211-1/+1
| * 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 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]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 [ci skip]Vipul A M2017-03-241-2/+2
|/ /
* | Merge pull request #28550 from rachel-carvalho/update_browser_compatibility_f...Jon Moss2017-03-231-2/+2
|\ \
| * | 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 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.1Jon Moss2017-03-221-4/+4
* | | Merge pull request #28544 from vipulnsward/fix-on-ruby-masterKasper Timm Hansen2017-03-232-13/+26
|\ \ \
| * | | Fix duplicable? for Ratiional and Complex on ruby master, since they are now ...Vipul A M2017-03-232-13/+26
* | | | 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]Fumiaki MATSUSHIMA2017-03-231-1/+1
|/ / /
* | | Merge pull request #28540 from kamipo/remove_collection_proxy_uniqRafael França2017-03-231-4/+0
|\ \ \
| * | | Remove `CollectionProxy#uniq`Ryuta Kamizono2017-03-231-4/+0
|/ / /
* | | Merge pull request #28537 from tjschuck/doc_actioncable_reject_unauthed_connxRafael França2017-03-221-5/+5
|\ \ \
| * | | Document AC::Connection::Authorization#reject_unauthorized_connectionT.J. Schuck2017-03-221-5/+5
* | | | Merge pull request #28534 from claudiob/list-webpackersRafael França2017-03-221-1/+2
|\ \ \ \
| * | | | List options for `rails new --webpack=WEBPACK`claudiob2017-03-221-1/+2
* | | | | No need to have an entry that was included in 5.1 in 5.2Rafael Mendonça França2017-03-221-11/+0
* | | | | Merge pull request #28528 from domcleal/parseerror-const-deprecationRafael França2017-03-225-1/+88
|\ \ \ \ \
| * | | | | Use DeprecatedConstantAccessor for AD::ParamsParser::ParseErrorDominic Cleal2017-03-221-1/+2
| * | | | | Add AS::Deprecation::DeprecatedConstantAccessorDominic Cleal2017-03-224-0/+86
* | | | | | Merge pull request #28527 from rst/fix_runner_argv_28515Rafael França2017-03-222-2/+11
|\ \ \ \ \ \
| * | | | | | 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
| |/ / / / /
* | | | | | Merge pull request #28513 from maclover7/jm-fix-28500Rafael França2017-03-222-2/+12
|\ \ \ \ \ \
| * | | | | | CLI arg "host" has precedence over ENV var "host"Jon Moss2017-03-212-2/+12
* | | | | | | 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`Ryuta Kamizono2017-03-233-77/+77
| | |/ / / / / | |/| | | | |
* | | | | | | 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 appclaudiob2017-03-221-2/+2
| |/ / / / /
* | | | | | Merge pull request #28530 from kamipo/fix_ci_failureMatthew Draper2017-03-231-2/+2
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Fix `assert_logged` failureRyuta Kamizono2017-03-231-2/+2
| | |_|/ / | |/| | |
* | | | | Small grammar fixJon Moss2017-03-221-1/+1
* | | | | Merge pull request #28523 from y-yagi/dont_comment_out_file_watcher_during_ra...Matthew Draper2017-03-232-16/+0
|\ \ \ \ \