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

	Commit message (Expand)	Author	Age	Files	Lines
*	Fix formatting of `credentials` and `encrypted` [ci skip]	yuuji.yaginuma	2017-11-19	1	-8/+8
*	Fix "warning: assigned but unused variable - key"	yuuji.yaginuma	2017-11-18	1	-1/+1
*	Deprecate an `after_bundle` callback in Rails plugin templates	yuuji.yaginuma	2017-11-18	3	-0/+40
*	Merge pull request #31035 from BrentWheeldon/bmw-db-load-deadlock	Matthew Draper	2017-11-18	3	-1/+74
\|\
\| *	Prevent deadlocks with load interlock and DB lock.	Brent Wheeldon	2017-11-09	3	-1/+74
* \|	Merge pull request #28742 from quixoten/stack_conn_pool	Matthew Draper	2017-11-17	2	-6/+11
\|\ \
\| * \|	Fix typos	Devin Christensen	2017-04-13	2	-2/+2
\| * \|	Improve documentation and add test	Devin Christensen	2017-04-13	2	-7/+12
\| * \|	Switch to LIFO for the connection pool	Devin Christensen	2017-04-12	1	-2/+2
* \| \|	Merge pull request #28869 from eugeneius/query_cache_all_pools	Matthew Draper	2017-11-17	2	-6/+18
\|\ \ \
\| * \| \|	Enable query cache on all connection pools	Eugene Kenny	2017-04-24	2	-6/+18
* \| \| \|	Merge pull request #30100 from kirs/doc-reloader	Matthew Draper	2017-11-17	1	-0/+3
\|\ \ \ \
\| * \| \| \|	Document public hooks in AS::Reloader [ci skip]	Kir Shatrov	2017-08-14	1	-0/+3
* \| \| \| \|	Move back to resque-scheduler mainline now that https://github.com/resque/res...	Jeremy Daer	2017-11-16	2	-12/+11
* \| \| \| \|	Merge pull request #31169 from ydakuka/patch-1	Ryuta Kamizono	2017-11-17	1	-2/+2
\|\ \ \ \ \
\| * \| \| \| \|	Fix links [ci skip]	Yauheni Dakuka	2017-11-16	1	-2/+2
\|/ / / / /
* \| \| \| \|	Avoid creating extra `relation` and `build_arel` in `_create_record` and `_up...	Ryuta Kamizono	2017-11-17	2	-63/+41
* \| \| \| \|	Merge pull request #27494 from matthewd/executor-guide	Matthew Draper	2017-11-17	2	-0/+329
\|\ \ \ \ \
\| * \| \| \| \|	Add more detail on how the framework is actually configured by default	Matthew Draper	2017-11-17	1	-5/+67
\| * \| \| \| \|	Start on a guide for the Executor & Load Interlock	Matthew Draper	2017-11-16	2	-0/+267
\|/ / / / /
* \| \| \| \|	Merge pull request #31166 from freeletics/fix-example	Kasper Timm Hansen	2017-11-16	1	-1/+1
\|\ \ \ \ \
\| * \| \| \| \|	Fixed example of `Rails.application.encrypted` method usage	Wojciech Wnętrzak	2017-11-16	1	-1/+1
\|/ / / / /
* \| \| \| \|	Add master key to `gitignore` on `rails new`	yuuji.yaginuma	2017-11-16	4	-1/+19
* \| \| \| \|	Bump resque-scheduler ahead of a new gem release	Jeremy Daer	2017-11-15	1	-2/+2
* \| \| \| \|	Pass options onto key file generator.	Kasper Timm Hansen	2017-11-15	1	-1/+1
* \| \| \| \|	Merge branch 'freeletics-manage-multiple-credential-files'	Kasper Timm Hansen	2017-11-15	9	-41/+337
\|\ \ \ \ \
\| * \| \| \| \|	Add CLI to manage encrypted files/configs.	Wojciech Wnętrzak	2017-11-15	10	-50/+347
* \| \| \| \| \|	Go through a single credentials instance.	Kasper Timm Hansen	2017-11-15	1	-9/+10
* \| \| \| \| \|	Merge pull request #31160 from yahonda/ignored_column_case_insensitive	Rafael França	2017-11-15	1	-1/+1
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Allow test_ignored_columns_not_included_in_SELECT column names case	Yasuo Honda	2017-11-15	1	-1/+1
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #31128 from rails/handle-ambigious-times	Andrew White	2017-11-15	4	-1/+66
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Handle `TZInfo::AmbiguousTime` errors	Andrew White	2017-11-15	4	-1/+66
* \| \| \| \| \| \|	Merge pull request #29776 from mrj/fix-idlw-timezone	Matthew Draper	2017-11-15	1	-1/+1
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \|
\| * \| \| \| \| \|	Change the "International Date Line West" TZInfo timezone from "Pacific/Midwa...	Mark James	2017-07-13	1	-1/+1
* \| \| \| \| \| \|	These strings should already be frozen where ruby accepts the magic-comment	Akira Matsuda	2017-11-15	1	-2/+2
* \| \| \| \| \| \|	Merge pull request #31156 from kwstannard/patch-1	Rafael França	2017-11-14	1	-1/+1
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Update configuring.md	Kelly Stannard	2017-11-14	1	-1/+1
* \| \| \| \| \| \| \|	Use released arel	yuuji.yaginuma	2017-11-15	6	-6/+0
\|/ / / / / / /
* \| \| \| \| \| \|	Fix asset url examples [ci skip]	Ryuta Kamizono	2017-11-15	1	-6/+6
* \| \| \| \| \| \|	Fix CI failure due to invalid `up_only` for MySQL	Ryuta Kamizono	2017-11-15	1	-5/+7
* \| \| \| \| \| \|	Fix typo s/only_up/up_only/ [ci skip]	Ryuta Kamizono	2017-11-15	1	-1/+1
* \| \| \| \| \| \|	Merge pull request #30004 from npenzin/patch-1	Yuji Yaginuma	2017-11-15	2	-2/+3
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Ensure plugin_generator adds to new line in Gemfile	Nikita Penzin	2017-11-14	2	-2/+3
* \| \| \| \| \| \| \|	Merge pull request #31155 from bogdanvlviv/fix-activesupport-changelog	Rafael França	2017-11-14	1	-27/+29
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Fix activesupport/CHANGELOG.md [ci skip]	bogdanvlviv	2017-11-14	1	-27/+29
* \| \| \| \| \| \| \| \|	Merge pull request #31154 from bogdanvlviv/fix-migration-version-in-doc-of-up...	Rafael França	2017-11-14	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Fix migration version in doc of #up_only	bogdanvlviv	2017-11-14	1	-1/+1
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Use released sass-rails	Rafael Mendonça França	2017-11-14	2	-15/+9
* \| \| \| \| \| \| \|	Use released arel	Rafael Mendonça França	2017-11-14	4	-17/+9
* \| \| \| \| \| \| \|	Merge pull request #30963 from q-centrix/performance-improvements-add_method_...	Rafael França	2017-11-14	1	-1/+14
\|\ \ \ \ \ \ \ \