rails.git - Mirror of official rails repo with custom fixes.

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #28544 from vipulnsward/fix-on-ruby-master	Kasper Timm Hansen	2017-03-23	2	-13/+26
\|\
\| *	Fix duplicable? for Ratiional and Complex on ruby master, since they are now ...	Vipul A M	2017-03-23	2	-13/+26
* \|	Merge pull request #28543 from mtsmfm/move-comment-to-inside-the-method	Vipul A M	2017-03-23	1	-1/+1
\|\ \ \| \|/ \|/\|
\| *	Move comment to inside the method [ci skip]	Fumiaki MATSUSHIMA	2017-03-23	1	-1/+1
\|/
*	Merge pull request #28540 from kamipo/remove_collection_proxy_uniq	Rafael França	2017-03-23	1	-4/+0
\|\
\| *	Remove `CollectionProxy#uniq`	Ryuta Kamizono	2017-03-23	1	-4/+0
\|/
*	Merge pull request #28537 from tjschuck/doc_actioncable_reject_unauthed_connx	Rafael França	2017-03-22	1	-5/+5
\|\
\| *	Document AC::Connection::Authorization#reject_unauthorized_connection	T.J. Schuck	2017-03-22	1	-5/+5
* \|	Merge pull request #28534 from claudiob/list-webpackers	Rafael França	2017-03-22	1	-1/+2
\|\ \
\| * \|	List options for `rails new --webpack=WEBPACK`	claudiob	2017-03-22	1	-1/+2
* \| \|	No need to have an entry that was included in 5.1 in 5.2	Rafael Mendonça França	2017-03-22	1	-11/+0
* \| \|	Merge pull request #28528 from domcleal/parseerror-const-deprecation	Rafael França	2017-03-22	5	-1/+88
\|\ \ \
\| * \| \|	Use DeprecatedConstantAccessor for AD::ParamsParser::ParseError	Dominic Cleal	2017-03-22	1	-1/+2
\| * \| \|	Add AS::Deprecation::DeprecatedConstantAccessor	Dominic Cleal	2017-03-22	4	-0/+86
* \| \| \|	Merge pull request #28527 from rst/fix_runner_argv_28515	Rafael França	2017-03-22	2	-2/+11
\|\ \ \ \
\| * \| \| \|	Fixup trailing whitespace, per complaints from CodeClimate.	Robert Thau	2017-03-22	1	-1/+1
\| * \| \| \|	Correctly reset ARGV for "rails runner `CODE' arg arg arg..."	Robert Thau	2017-03-22	2	-2/+11
\| \|/ / /
* \| \| \|	Merge pull request #28513 from maclover7/jm-fix-28500	Rafael França	2017-03-22	2	-2/+12
\|\ \ \ \
\| * \| \| \|	CLI arg "host" has precedence over ENV var "host"	Jon Moss	2017-03-21	2	-2/+12
* \| \| \| \|	Merge pull request #28526 from kamipo/fix_log_subscriber_to_allow_legacy_binds	Rafael França	2017-03-22	3	-77/+77
\|\ \ \ \ \
\| * \| \| \| \|	Fix `LogSubscriber` to allow legacy `binds`	Ryuta Kamizono	2017-03-23	3	-77/+77
\| \| \|/ / / \| \|/\| \| \|
* \| \| \| \|	Merge pull request #28524 from claudiob/comment-api-key	Rafael França	2017-03-22	1	-2/+2
\|\ \ \ \ \ \| \|_\|_\|/ / \|/\| \| \| \|
\| * \| \| \|	Don't add a dummy API key to every new Rails app	claudiob	2017-03-22	1	-2/+2
\| \|/ / /
* \| \| \|	Merge pull request #28530 from kamipo/fix_ci_failure	Matthew Draper	2017-03-23	1	-2/+2
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \|
\| * \| \|	Fix `assert_logged` failure	Ryuta Kamizono	2017-03-23	1	-2/+2
* \| \| \|	Small grammar fix	Jon Moss	2017-03-22	1	-1/+1
* \| \| \|	Merge pull request #28523 from y-yagi/dont_comment_out_file_watcher_during_ra...	Matthew Draper	2017-03-23	2	-16/+0
\|\ \ \ \
\| * \| \| \|	Don't comment out config.file_watcher during Rails upgrade	yuuji.yaginuma	2017-03-22	2	-16/+0
\| \| \|/ / \| \|/\| \|
* \| \| \|	Merge pull request #28531 from yahonda/suppress_pg_warning	Matthew Draper	2017-03-23	1	-0/+1
\|\ \ \ \
\| * \| \| \|	Suppress `WARNING: nonstandard use of \\ in a string literal` warning	Yasuo Honda	2017-03-22	1	-0/+1
\| \|/ / /
* \| \| \|	Small grammar fix	Jon Moss	2017-03-22	1	-2/+1
* \| \| \|	Fix a race in ActionCable stream tests	Matthew Draper	2017-03-23	1	-0/+4
\| \|/ / \|/\| \|
* \| \|	Merge pull request #28522 from larskanis/replace-deprecated-pg-constants	Matthew Draper	2017-03-23	7	-21/+21
\|\ \ \
\| * \| \|	[PostgreSQL]: Replace deprecated PG constants.	Lars Kanis	2017-03-22	7	-21/+21
\| \|/ /
* \| \|	Skip isolated test runs on older rubies	Matthew Draper	2017-03-23	1	-0/+1
* \| \|	Stop complaining about not being able to digest dynamic template partial name...	David Heinemeier Hansson	2017-03-22	1	-2/+4
\|/ /
* \|	Merge pull request #28394 from shime/docs-action-dispatch	Xavier Noria	2017-03-22	31	-96/+96
\|\ \
\| * \|	[docs] fix ActionDispatch documentation	Hrvoje Šimić	2017-03-13	31	-96/+96
* \| \|	Update bug report templates	Matthew Draper	2017-03-22	5	-5/+5
* \| \|	Start Rails 5.2 development	Matthew Draper	2017-03-22	34	-2447/+90
\| \|/ \|/\|
* \|	Merge pull request #28056 from sngeth/wrap_store_accessors_in_params	Rafael França	2017-03-21	2	-1/+18
\|\ \
\| * \|	Wrap store accessors in parameters	Sid Ngeth	2017-03-21	2	-1/+18
* \| \|	Fix test assertion	Rafael Mendonça França	2017-03-21	1	-1/+1
* \| \|	Fix test that was asserting the wrong thing	Rafael Mendonça França	2017-03-21	1	-1/+1
\|/ /
* \|	Revert "Merge pull request #27775 from domcleal/27774-format-reset"	Rafael Mendonça França	2017-03-21	2	-15/+5
* \|	Merge pull request #28450 from adamgamble/bug_fix/fix_typo_in_actionview	Rafael França	2017-03-21	1	-1/+1
\|\ \
\| * \|	Fix typo in actionview error message	adamgamble	2017-03-17	1	-1/+1
* \| \|	Merge pull request #28497 from jhawthorn/unscope_specific_where_value	Andrew White	2017-03-21	2	-2/+10
\|\ \ \
\| * \| \|	Fix where_clause#except with specific where value	John Hawthorn	2017-03-20	2	-2/+10
* \| \| \|	Remove 5.0.0 entry from 5.1.0 CHANGELOG [ci skip]	claudiob	2017-03-20	1	-4/+0