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

	Commit message (Expand)	Author	Age	Files	Lines
*	add field ids when generating a scaffold form.	Yves Senn	2017-03-26	1	-4/+4
*	Merge pull request #28527 from rst/fix_runner_argv_28515	Rafael França	2017-03-22	1	-0/+8
\|\
\| *	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	1	-0/+8
* \|	Merge pull request #28513 from maclover7/jm-fix-28500	Rafael França	2017-03-22	1	-0/+8
\|\ \
\| * \|	CLI arg "host" has precedence over ENV var "host"	Jon Moss	2017-03-21	1	-0/+8
\| \|/
* /	Don't comment out config.file_watcher during Rails upgrade	yuuji.yaginuma	2017-03-22	1	-14/+0
\|/
*	Default to yielding a `form` variable.	Kasper Timm Hansen	2017-03-20	1	-4/+4
*	Add `app:update` task to engines	yuuji.yaginuma	2017-03-20	1	-0/+16
*	Merge pull request #28481 from y-yagi/fix_warning	Kasper Timm Hansen	2017-03-20	1	-3/+3
\|\
\| *	Fix `warning: character class has duplicated range`	yuuji.yaginuma	2017-03-20	1	-3/+3
* \|	Correctly check whether key is defined in configuration	yuuji.yaginuma	2017-03-19	2	-1/+13
\|/
*	Track the version-compatible config settings inside railties	Matthew Draper	2017-03-18	2	-22/+8
*	Merge pull request #28368 from y-yagi/add_test_for_secrets_command	Kasper Timm Hansen	2017-03-15	1	-0/+13
\|\
\| *	Add secrets edit test	yuuji.yaginuma	2017-03-12	1	-0/+13
* \|	Merge pull request #28409 from y-yagi/make_destroy_command_work_within_engines	Eileen M. Uchitelle	2017-03-15	1	-0/+55
\|\ \
\| * \|	Make destroy command work within engines	yuuji.yaginuma	2017-03-14	1	-0/+55
\| \|/
* /	Rename test of `app:update` to more appropriate name	yuuji.yaginuma	2017-03-15	1	-7/+7
\|/
*	Merge pull request #28182 from y-yagi/show_correct_rails_commands	Kasper Timm Hansen	2017-03-09	1	-0/+11
\|\
\| *	Show correct commands in help	yuuji.yaginuma	2017-03-03	1	-0/+11
* \|	Use appropriate type in generators test	yuuji.yaginuma	2017-03-08	1	-1/+1
* \|	Avoid running system tests by default	Robin Dupret	2017-03-05	1	-0/+46
* \|	Fix random failure on system test with ajax	Fumiaki MATSUSHIMA	2017-03-03	1	-0/+28
* \|	Move key packing into encryptor.	Kasper Timm Hansen	2017-03-02	1	-3/+2
* \|	Merge pull request #28139 from stouset/update-secrets-to-use-modern-crypto	Kasper Timm Hansen	2017-03-02	1	-2/+3
\|\ \
\| * \|	Default Secrets to AES-128-GCM, using ActiveSupport::MessageEncryptor	Stephen Touset	2017-03-01	1	-2/+3
* \| \|	Tell users how to assign a $EDITOR.	Kasper Timm Hansen	2017-03-01	1	-0/+24
* \| \|	Set correct host except development environment	yuuji.yaginuma	2017-02-27	1	-0/+18
\| \|/ \|/\|
* \|	Merge pull request #28137 from schneems/schneems/fix-default-puma-port	Richard Schneeman	2017-02-24	1	-0/+8
\|\ \
\| * \|	[close #24435] Send user_supplied_options to server	schneems	2017-02-24	1	-0/+8
\| \|/
* \|	Merge pull request #28150 from y-yagi/do_not_display_hidden_namespaces_in_gen...	Rafael França	2017-02-24	1	-0/+7
\|\ \
\| * \|	does not show hidden namespaces in generator's help	yuuji.yaginuma	2017-02-24	1	-0/+7
* \| \|	Merge pull request #28062 from y-yagi/make_adding_gemfile_entry_work_even_if_...	Rafael França	2017-02-24	1	-0/+15
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Make adding gemfile entry work even if specify only the plugin name	yuuji.yaginuma	2017-02-24	1	-0/+15
* \| \|	Make help short-cut alias to work	yuuji.yaginuma	2017-02-24	1	-0/+23
* \| \|	Make version short-cut alias to work	yuuji.yaginuma	2017-02-24	1	-0/+24
\| \|/ \|/\|
* \|	Add back tests for test:units and test:functionals.	Kasper Timm Hansen	2017-02-23	1	-12/+16
* \|	Revert "Revert "Add encrypted secrets""	Kasper Timm Hansen	2017-02-23	4	-0/+152
* \|	Revert "Add encrypted secrets" (#28127)	David Heinemeier Hansson	2017-02-23	4	-152/+0
* \|	Add encrypted secrets (#28038)	Kasper Timm Hansen	2017-02-23	4	-0/+152
* \|	Merge pull request #27572 from matthewd/prerelease-specifier	Matthew Draper	2017-02-23	1	-4/+4
\|\ \
\| * \|	Simplify the version specifier generated by prereleases	Matthew Draper	2017-01-05	1	-4/+4
* \| \|	Merge pull request #23138 from rails/custom-url-helpers-and-polymorphic-urls	Andrew White	2017-02-21	1	-2/+185
\|\ \ \
\| * \| \|	Split direct method into two	Andrew White	2017-02-21	1	-4/+4
\| * \| \|	Prefer remove_method over undef_method	Andrew White	2017-02-21	1	-0/+58
\| * \| \|	Add custom polymorphic mapping	Andrew White	2017-02-21	1	-4/+98
\| * \| \|	Rename url_helper to direct	Andrew White	2017-02-21	1	-4/+4
\| * \| \|	Add support for defining custom url helpers in routes.rb	Andrew White	2017-02-21	1	-2/+33
* \| \| \|	Revert back to the original of using package.json in the root of the project ...	David Heinemeier Hansson	2017-02-21	2	-6/+6
\|/ / /
* \| \|	Fix run_via[]= backwards compatibility.	Kasper Timm Hansen	2017-02-21	1	-0/+10