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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #28417 from schneems/schneems/symlink-failures	Andrew White	2017-03-30	2	-1/+28
\|\
\| *	Raise when using a bad symlink	schneems	2017-03-14	2	-1/+28
* \|	Merge pull request #28603 from mikeastock/alias-reverse-merge	Sean Griffin	2017-03-29	5	-0/+47
\|\ \
\| * \|	Add aliases for reverse_merge to with_defaults	Matt Casper	2017-03-29	5	-0/+47
* \| \|	Small grammar fix	Jon Moss	2017-03-29	1	-1/+1
* \| \|	Merge pull request #28595 from 3wille/fw-after-action-hint	Rafael França	2017-03-29	1	-1/+1
\|\ \ \
\| * \| \|	add hint on after_action filters	Frederik Wille	2017-03-29	1	-1/+1
\| \|/ /
* \| \|	Merge pull request #28592 from htanata/ar_relation_inspect_should_not_load_al...	Rafael França	2017-03-29	3	-1/+18
\|\ \ \
\| * \| \|	Load only needed records on ActiveRecord::Relation#inspect	Hendy Tanata	2017-03-28	3	-1/+18
* \| \| \|	Merge pull request #28602 from tricknotes/fix-rails-groups-example	Rafael França	2017-03-29	1	-2/+2
\|\ \ \ \
\| * \| \| \|	Fix the example code for `Rails.groups` [ci skip]	Ryunosuke Sato	2017-03-30	1	-2/+2
\| \| \|/ / \| \|/\| \|
* \| \| \|	Merge pull request #28600 from tricknotes/ruby-2.2.7	Rafael França	2017-03-29	1	-2/+2
\|\ \ \ \
\| * \| \| \|	CI against Ruby 2.2.7	Ryunosuke Sato	2017-03-30	1	-2/+2
\| \|/ / /
* \| \| \|	Add test to make sure subclasses also get helpers	Rafael Mendonça França	2017-03-29	1	-0/+16
* \| \| \|	Merge pull request #28598 from wnadeau/patch-1	Rafael França	2017-03-29	1	-1/+1
\|\ \ \ \
\| * \| \| \|	FinderMethods#fourty_two docs cite proper source	Winfred Nadeau	2017-03-29	1	-1/+1
\| \|/ / /
* \| \| \|	Merge pull request #28601 from tricknotes/fix-link-to-rails-ujs	Rafael França	2017-03-29	5	-5/+5
\|\ \ \ \
\| * \| \| \|	Fix link to rails-ujs	Ryunosuke Sato	2017-03-30	5	-5/+5
\| \|/ / /
* / / /	Configure the days until close a stale issue	Rafael França	2017-03-29	1	-1/+3
\|/ / /
* \| \|	Merge pull request #28478 from kamipo/fix_primary_keys_across_multiple_schemas	Andrew White	2017-03-29	2	-10/+9
\|\ \ \
\| * \| \|	Fix `primary_keys` across multiple schemas	Ryuta Kamizono	2017-03-20	2	-10/+9
* \| \| \|	Remove CHANGELOG.md entry that appears in 5-1-stable	Jon Moss	2017-03-29	1	-4/+0
* \| \| \|	Merge pull request #28586 from mtsmfm/override-driver	Eileen M. Uchitelle	2017-03-29	2	-6/+13
\|\ \ \ \
\| * \| \| \|	Make `driven_by` overridable	Fumiaki MATSUSHIMA	2017-03-29	2	-6/+13
* \| \| \| \|	Merge pull request #28590 from y-yagi/remove_unnecessary_javascript_option_check	Andrew White	2017-03-29	1	-4/+1
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|
\| * \| \| \|	Remove unnecessary `javascript` option check	yuuji.yaginuma	2017-03-29	1	-4/+1
\|/ / / /
* \| \| \|	Merge pull request #28052 from kamipo/make_internal_methods_to_private	Rafael França	2017-03-28	12	-185/+181
\|\ \ \ \
\| * \| \| \|	Make internal methods to private	Ryuta Kamizono	2017-03-27	12	-185/+181
* \| \| \| \|	Use keyword arguments instead of hash	Rafael Mendonça França	2017-03-28	2	-9/+11
* \| \| \| \|	Merge pull request #28480 from mubashirhanif/add_keep_id_suffix_option_to_hum...	Rafael Mendonça França	2017-03-28	5	-21/+81
\|\ \ \ \ \
\| * \| \| \| \|	Added options hash to titleize method and keep_id_suffix option to humanize	Mubashir Hanif	2017-03-21	5	-21/+81
* \| \| \| \| \|	starts_with? is removed in Ruby 2.4	Rafael Mendonça França	2017-03-28	1	-1/+1
* \| \| \| \| \|	Merge pull request #1 from radiospiel/tickets/26955-listen-paths	Rafael Mendonça França	2017-03-28	1	-0/+5
\|\ \ \ \ \ \ \| \|_\|_\|_\|/ / \|/\| \| \| \| \|
\| * \| \| \| \|	No longer listens to dirs inside of installed gems	eno	2016-11-08	1	-0/+5
* \| \| \| \| \|	Merge pull request #28584 from bogdanvlviv/errors-keys-values-fix	Rafael França	2017-03-28	3	-11/+52
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Fix ActiveModel::Errors #keys, #values	bogdanvlviv	2017-03-28	3	-11/+52
* \| \| \| \| \| \|	Merge pull request #28514 from y-yagi/follow_up_to_28056	Andrew White	2017-03-28	1	-8/+10
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Fix store accessors in parameters test	yuuji.yaginuma	2017-03-22	1	-8/+10
* \| \| \| \| \| \| \|	Merge pull request #28549 from jess/patch-1	Rafael França	2017-03-28	1	-0/+1
\|\ \ \ \ \ \ \ \ \| \|_\|/ / / / / / \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	add proper punctuation	Jess Brown	2017-03-23	1	-1/+1
\| * \| \| \| \| \| \|	make it clear how to enable caching	Jess Brown	2017-03-23	1	-0/+1
* \| \| \| \| \| \| \|	Return unmapped timezones from `country_zones`	Andrew White	2017-03-28	2	-5/+16
* \| \| \| \| \| \| \|	No need to duplicate 5-1-stable CHANGELOG. [ci skip]	Yves Senn	2017-03-28	1	-8/+0
* \| \| \| \| \| \| \|	Fix the tests to test what they should be testing	Rafael Mendonça França	2017-03-27	1	-8/+8
* \| \| \| \| \| \| \|	Make sure that ActionController::Api can include helpers	Rafael Mendonça França	2017-03-27	1	-0/+26
* \| \| \| \| \| \| \|	Merge pull request #28557 from y-yagi/remove_unnecessary_files_to_api_applica...	Rafael França	2017-03-27	3	-1/+56
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Remove unnecessary files to API-only Applications when `app:task` task executed	yuuji.yaginuma	2017-03-24	3	-1/+56
* \| \| \| \| \| \| \| \|	Merge pull request #28546 from claudiob/drop-j-option	Rafael Mendonça França	2017-03-27	2	-16/+0
\|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	Remove -j (--javascript) option from `rails new`	claudiob	2017-03-23	3	-16/+5
* \| \| \| \| \| \| \| \| \|	Apply the log_level default	Rafael Mendonça França	2017-03-27	1	-7/+2