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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #24525 from tomkadwill/action-mailer-base-docs2	Vipul A M	2016-04-14	1	-3/+3
\|\
\| *	Update ActionMailer base documentation [ci skip]	Tom Kadwill	2016-04-13	1	-3/+3
* \|	Merge pull request #24539 from bogdan/diry-keyword-args	Sean Griffin	2016-04-13	1	-1/+1
\|\ \
\| * \|	Fixed bug introduced in #24519. Makes build green again	Bogdan Gusiev	2016-04-13	1	-1/+1
* \| \|	Merge pull request #24536 from vipulnsward/ruby-2-upgrading	Rafael França	2016-04-13	1	-1/+2
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Add ruby 2.2.2+ version requirement for Rails 5 apps	Vipul A M	2016-04-13	1	-1/+2
* \| \|	Merge pull request #24519 from bogdan/diry-keyword-args	Jeremy Daer	2016-04-13	1	-8/+8
\|\ \ \
\| * \| \|	Use keyword arguments to cleanup without droping performance	Bogdan Gusiev	2016-04-13	1	-8/+8
* \| \| \|	Properly serialize all JSON primitives in the AR JSON type	Sean Griffin	2016-04-13	4	-14/+30
* \| \| \|	Remove unused variable	Rafael Mendonça França	2016-04-13	1	-1/+0
* \| \| \|	Remove time calculatiosn extension	Rafael Mendonça França	2016-04-13	1	-0/+2
* \| \| \|	Merge pull request #24318 from bogdanvlviv/patch-1	Rafael Mendonça França	2016-04-12	2	-1/+5
\|\ \ \ \
\| * \| \| \|	extension synonyms yml and yaml	Bogdan	2016-03-27	2	-1/+5
* \| \| \| \|	Merge pull request #24524 from prathamesh-sonpatki/cablejs-for-channels	Rafael França	2016-04-12	3	-0/+22
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \|
\| * \| \| \|	Generate `cable.js` file if does not exist when generating channel	Prathamesh Sonpatki	2016-04-12	3	-0/+22
\| \| \|/ / \| \|/\| \|
* \| \| \|	Merge pull request #24515 from Sen-Zhang/attribute_changed_not_return_nil	Sean Griffin	2016-04-12	2	-3/+3
\|\ \ \ \
\| * \| \| \|	prevent 'attribute_changed?' from returning nil	Sen-Zhang	2016-04-11	2	-3/+3
\| \|/ / /
* \| \| \|	Merge pull request #24502 from ankit8898/freezing-dot-in-delimiter-helper	Richard Schneeman	2016-04-12	2	-4/+6
\|\ \ \ \
\| * \| \| \|	Freezing couple of more string '0' & '.' and using the string appending to do...	Ankit Gupta	2016-04-11	1	-2/+4
\| * \| \| \|	Freezing the dots as they are causing extra string initialization on every it...	Ankit Gupta	2016-04-10	2	-2/+2
* \| \| \| \|	copy edits some comments [ci skip]	Xavier Noria	2016-04-12	1	-8/+5
* \| \| \| \|	Merge pull request #24494 from vipulnsward/guides-changelog-pass	Yves Senn	2016-04-12	1	-8/+15
\|\ \ \ \ \
\| * \| \| \| \|	- Add changelog for new guide: AC overview from https://github.com/rails/rail...	Vipul A M	2016-04-10	1	-0/+5
\| * \| \| \| \|	- Fixed changelog related to i18 key changes. Added author	Vipul A M	2016-04-10	1	-8/+10
* \| \| \| \| \|	Merge pull request #24523 from BlakeMesdag/as-max_time-fix-edges	Xavier Noria	2016-04-12	2	-7/+28
\|\ \ \ \ \ \
\| * \| \| \| \| \|	No more need for an early return	Blake Mesdag	2016-04-12	1	-2/+0
\| * \| \| \| \| \|	More readable version	Blake Mesdag	2016-04-12	1	-13/+10
\| * \| \| \| \| \|	Handle max_time edge cases for epoch times and add test	Blake Mesdag	2016-04-12	2	-3/+29
* \| \| \| \| \| \|	Allow symbols using "dot notation" to be passed to where	Sean Griffin	2016-04-12	4	-7/+12
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #24520 from BlakeMesdag/activesupport-fileupdate-checker-m...	Xavier Noria	2016-04-12	1	-1/+17
\|\ \ \ \ \ \ \| \|_\|_\|/ / / \|/\| \| \| \| \|
\| * \| \| \| \|	Use Time#compare_without_coercion for super speed	Blake Mesdag	2016-04-12	1	-1/+6
\| * \| \| \| \|	Use a single memoized loop to find max mtime in ActiveSupport::FileUpdateChec...	Blake Mesdag	2016-04-12	1	-1/+12
\|/ / / / /
* \| \| \| \|	Merge pull request #24495 from vipulnsward/rails-changelog-pass	Santiago Pastorino	2016-04-11	1	-18/+18
\|\ \ \ \ \
\| * \| \| \| \|	- Fence some commands, options, gems, etc. with quotes	Vipul A M	2016-04-10	1	-18/+18
\| \|/ / / /
* \| \| \| \|	Merge pull request #24490 from prathamesh-sonpatki/add-config-to-deprecation-...	Santiago Pastorino	2016-04-11	1	-3/+3
\|\ \ \ \ \
\| * \| \| \| \|	Add `config` to the deprecation warnings of deprecated config options	Prathamesh Sonpatki	2016-04-10	1	-3/+3
* \| \| \| \| \|	Merge pull request #24511 from lihanli/activemodel-dirty-attribute-changed	Jeremy Daer	2016-04-11	1	-3/+5
\|\ \ \ \ \ \
\| * \| \| \| \| \|	set default parameter to nil to speed up attribute_changed?	Lihan Li	2016-04-11	1	-3/+5
* \| \| \| \| \| \|	Merge pull request #24504 from nickmalcolm/master	Vipul A M	2016-04-12	1	-1/+6
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	[ci skip] This modifies the HTTP Token authentication example's `authenticate...	Nick Malcolm	2016-04-12	1	-1/+6
* \| \| \| \| \| \| \|	Merge pull request #24492 from vipulnsward/pass-over-warnings	Jeremy Daer	2016-04-11	14	-20/+19
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Pass over all Rails 5 warnings, to make sure:	Vipul A M	2016-04-12	14	-20/+19
\| \| \|_\|_\|/ / / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #24508 from alexmirk/master	Vipul A M	2016-04-12	1	-5/+4
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Improved ActionView flows.rb documention [ci skip]	Alex Mirkhaydarov	2016-04-11	1	-5/+4
\|/ / / / / / / /
* \| \| / / / / /	edit pass over the RDoc of Rails::Railtie [ci skip]	Xavier Noria	2016-04-11	1	-36/+36
\| \|_\|/ / / / / \|/\| \| \| \| \| \|
* \| \| \| \| \| \|	remove explicit curlies for hash argument	Xavier Noria	2016-04-11	1	-2/+2
* \| \| \| \| \| \|	Merge pull request #24485 from prathamesh-sonpatki/protected_database_env_mes...	Richard Schneeman	2016-04-11	1	-2/+2
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Cleanup message shown while running destructive action against protected data...	Prathamesh Sonpatki	2016-04-10	1	-2/+2
\| \| \|_\|_\|_\|_\|/ \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #24497 from vipulnsward/am-changelog-pass	Yves Senn	2016-04-11	1	-4/+3
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Pass over AM changelog	Vipul A M	2016-04-10	1	-4/+3
\| \| \|/ / / / / \| \|/\| \| \| \| \|