aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ \ \
| * | | | Don't comment out config.file_watcher during Rails upgradeyuuji.yaginuma2017-03-222-16/+0
| | |/ / | |/| |
* | | | Merge pull request #28531 from yahonda/suppress_pg_warningMatthew Draper2017-03-231-0/+1
|\ \ \ \
| * | | | Suppress `WARNING: nonstandard use of \\ in a string literal` warningYasuo Honda2017-03-221-0/+1
| |/ / /
* | | | Small grammar fixJon Moss2017-03-221-2/+1
* | | | Fix a race in ActionCable stream testsMatthew Draper2017-03-231-0/+4
| |/ / |/| |
* | | Merge pull request #28522 from larskanis/replace-deprecated-pg-constantsMatthew Draper2017-03-237-21/+21
|\ \ \
| * | | [PostgreSQL]: Replace deprecated PG constants.Lars Kanis2017-03-227-21/+21
| |/ /
* | | Skip isolated test runs on older rubiesMatthew Draper2017-03-231-0/+1
* | | Stop complaining about not being able to digest dynamic template partial name...David Heinemeier Hansson2017-03-221-2/+4
|/ /
* | Merge pull request #28394 from shime/docs-action-dispatchXavier Noria2017-03-2231-96/+96
|\ \
| * | [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 store accessors in parametersSid Ngeth2017-03-212-1/+18
* | | 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
* | Merge pull request #28450 from adamgamble/bug_fix/fix_typo_in_actionviewRafael França2017-03-211-1/+1
|\ \
| * | 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 valueJohn Hawthorn2017-03-202-2/+10
* | | | Remove 5.0.0 entry from 5.1.0 CHANGELOG [ci skip]claudiob2017-03-201-4/+0
* | | | Merge pull request #28498 from Erol/fix-typo-in-caching-guideJon Moss2017-03-201-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Fix typo in Caching with Rails Guide [skip ci]Erol Fornoles2017-03-211-1/+1
|/ / /