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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #28182 from y-yagi/show_correct_rails_commands	Kasper Timm Hansen	2017-03-09	7	-18/+36
\|\
\| *	Show correct commands in help	yuuji.yaginuma	2017-03-03	7	-18/+36
* \|	[ci skip] Document read_encrypted_secrets config.	Kasper Timm Hansen	2017-03-09	1	-0/+8
* \|	Merge pull request #28257 from yahonda/app_generators_use_oracle_enhanced	Andrew White	2017-03-06	2	-5/+6
\|\ \
\| * \|	Update `database.yml` when `rails new <new_app> -d oracle` specified	Yasuo Honda	2017-03-02	2	-5/+6
* \| \|	Avoid running system tests by default	Robin Dupret	2017-03-05	3	-10/+19
* \| \|	A private method can't be called with `self.`	Akira Matsuda	2017-03-04	1	-2/+2
* \| \|	Remove unnecessary system test code	eileencodes	2017-03-03	1	-13/+0
\|/ /
* \|	Inline CIPHER constant.	Kasper Timm Hansen	2017-03-02	1	-6/+3
* \|	Move key packing into encryptor.	Kasper Timm Hansen	2017-03-02	1	-3/+2
* \|	Add back yaml require.	Kasper Timm Hansen	2017-03-02	1	-0/+1
* \|	Merge pull request #28139 from stouset/update-secrets-to-use-modern-crypto	Kasper Timm Hansen	2017-03-02	1	-15/+13
\|\ \
\| * \|	Default Secrets to AES-128-GCM, using ActiveSupport::MessageEncryptor	Stephen Touset	2017-03-01	1	-15/+13
* \| \|	Convert `ENV["EDITOR"]` to string before check	yuuji.yaginuma	2017-03-02	1	-1/+1
* \| \|	Put it to me straight: just say it.	Kasper Timm Hansen	2017-03-01	1	-3/+3
* \| \|	Tell users how to assign a $EDITOR.	Kasper Timm Hansen	2017-03-01	1	-0/+11
* \| \|	Merge pull request #28239 from y-yagi/use_appropriate_type_for_test_framework...	Kasper Timm Hansen	2017-03-01	1	-1/+1
\|\ \ \
\| * \| \|	Use appropriate type for `test_framework` option	yuuji.yaginuma	2017-03-01	1	-1/+1
* \| \| \|	Merge pull request #28230 from y-yagi/HOST_to_be_in_uppercase	Rafael França	2017-02-28	1	-1/+1
\|\ \ \ \
\| * \| \| \|	`HOST` must be all capital letters	yuuji.yaginuma	2017-03-01	1	-1/+1
\| \|/ / /
* / / /	Skip turbolinks for engine test application	Viktor Fonic	2017-02-28	1	-0/+1
\|/ / /
* \| \|	Use released webpacker in new applications	yuuji.yaginuma	2017-02-28	1	-1/+1
* \| \|	Merge pull request #28196 from y-yagi/set_correct_host_except_development_env...	Andrew White	2017-02-27	1	-3/+7
\|\ \ \
\| * \| \|	Set correct host except development environment	yuuji.yaginuma	2017-02-27	1	-3/+7
\| \| \|/ \| \|/\|
* \| \|	Merge pull request #28160 from y-yagi/only_load_systemtestcase_if_puma_is_def...	Eileen M. Uchitelle	2017-02-27	1	-2/+2
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Only load SystemTestCase if Puma is defined	yuuji.yaginuma	2017-02-27	1	-2/+2
* \| \|	Imporove docs for Rails::AppGenerator [ci skip]	dixpac	2017-02-25	1	-0/+8
* \| \|	Merge pull request #28137 from schneems/schneems/fix-default-puma-port	Richard Schneeman	2017-02-24	1	-11/+44
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	[close #24435] Send user_supplied_options to server	schneems	2017-02-24	1	-11/+44
* \| \|	Merge pull request #28150 from y-yagi/do_not_display_hidden_namespaces_in_gen...	Rafael França	2017-02-24	1	-0/+3
\|\ \ \
\| * \| \|	does not show hidden namespaces in generator's help	yuuji.yaginuma	2017-02-24	1	-0/+3
* \| \| \|	Merge pull request #28062 from y-yagi/make_adding_gemfile_entry_work_even_if_...	Rafael França	2017-02-24	1	-1/+1
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	Make adding gemfile entry work even if specify only the plugin name	yuuji.yaginuma	2017-02-24	1	-1/+1
* \| \| \|	Make help short-cut alias to work	yuuji.yaginuma	2017-02-24	1	-1/+1
* \| \| \|	Make version short-cut alias to work	yuuji.yaginuma	2017-02-24	1	-1/+1
\| \|_\|/ \|/\| \|
* \| \|	Preparing for 5.1.0.beta1 release	Rafael Mendonça França	2017-02-23	1	-1/+1
* \| \|	Fix Rakefile loading generator relatively	Rafael Mendonça França	2017-02-23	1	-1/+1
* \| \|	Use double quotes in the generated plugin test script.	Kasper Timm Hansen	2017-02-23	1	-3/+3
* \| \|	Merge pull request #28105 from y-yagi/add_wrapper_for_plugins_test_runner	Kasper Timm Hansen	2017-02-23	2	-7/+8
\|\ \ \ \| \|_\|/ \|/\| \|
\| * \|	Add wrapper for plugin's test runner	yuuji.yaginuma	2017-02-22	2	-7/+8
* \| \|	Yank the intricate immediately-exiting editor recognition.	Kasper Timm Hansen	2017-02-23	1	-16/+2
* \| \|	Fix test:units not hitting rake task.	Kasper Timm Hansen	2017-02-23	1	-1/+2
* \| \|	Revert "Revert "Add encrypted secrets""	Kasper Timm Hansen	2017-02-23	13	-27/+330
* \| \|	Revert "Add encrypted secrets" (#28127)	David Heinemeier Hansson	2017-02-23	13	-330/+27
* \| \|	Add encrypted secrets (#28038)	Kasper Timm Hansen	2017-02-23	13	-27/+330
* \| \|	Merge pull request #27572 from matthewd/prerelease-specifier	Matthew Draper	2017-02-23	1	-6/+5
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Simplify the version specifier generated by prereleases	Matthew Draper	2017-01-05	1	-6/+5
* \| \|	Use released arel	Rafael Mendonça França	2017-02-21	1	-1/+0
* \| \|	Revert back to the original of using package.json in the root of the project ...	David Heinemeier Hansson	2017-02-21	4	-6/+6
* \| \|	Only load SystemTestCase if Capybara is defined	eileencodes	2017-02-21	1	-5/+10