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

	Commit message (Expand)	Author	Age	Files	Lines
*	Some copy edits for modifying View Paths [ci skip]	Zachary Scott	2015-04-12	1	-5/+21
*	Merge branch 'view_paths' of https://github.com/nishantmodak/rails into nisha...	Zachary Scott	2015-04-12	1	-1/+17
\|\
\| *	view paths docs [ci skip]	Nishant Modak	2015-04-13	1	-1/+17
* \|	Merge branch 'mfazekas-action-mailer-async-doc-fixes'	Zachary Scott	2015-04-12	1	-8/+11
\|\ \
\| * \|	Since the delegator wasn't identified earlier, we should here [ci skip]	Zachary Scott	2015-04-12	1	-2/+2
\| * \|	Merge branch 'action-mailer-async-doc-fixes' of https://github.com/mfazekas/r...	Zachary Scott	2015-04-12	1	-8/+11
\|/\| \|
\| * \|	Fixes to inaccurate documentation in action_mailer [ci skip]	Miklos Fazkeas	2014-12-18	1	-8/+11
* \| \|	:scissors:	Zachary Scott	2015-04-12	1	-2/+2
* \| \|	Merge pull request #19735 from Dan-Burnette/fixSecretKeyBaseErrorMessage	Godfrey Chan	2015-04-12	1	-1/+1
\|\ \ \
\| * \| \|	Error message no longer tells you to set the (deprecated) secret_token.	Dan	2015-04-12	1	-1/+1
\|/ / /
* \| \|	Merge pull request #19732 from wazery/patch-2	Kasper Timm Hansen	2015-04-12	1	-2/+2
\|\ \ \
\| * \| \|	[ci skip] Update contributing guide	Islam Wazery	2015-04-12	1	-2/+2
* \| \| \|	Fix a few typos and wrap some lines [ci skip]	Robin Dupret	2015-04-12	2	-12/+21
* \| \| \|	Merge pull request #19734 from y-yagi/action_view_guide	Yves Senn	2015-04-12	1	-26/+0
\|\ \ \ \
\| * \| \| \|	remove reference to `register_javascript_expansion` and `register_stylesheet_...	yuuji.yaginuma	2015-04-12	1	-26/+0
\|/ / / /
* \| \| \|	Merge pull request #19733 from yuki24/speed-up-levenshtein	Richard Schneeman	2015-04-11	2	-4/+10
\|\ \ \ \
\| * \| \| \|	Speed up Levenshtein by 50% and reduce 97% of memory usage	Yuki Nishijima	2015-04-11	2	-4/+10
* \| \| \| \|	Merge pull request #19566 from aditya-kapoor/remove-dup-doc	Richard Schneeman	2015-04-11	1	-22/+10
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|
\| * \| \| \|	[ci skip] remove duplicate doc for current_page?	Aditya Kapoor	2015-04-09	1	-22/+10
* \| \| \| \|	Remove mention of super old defined_javascript_functions method [ci skip]	Carlos Antonio da Silva	2015-04-11	1	-4/+0
* \| \| \| \|	Merge pull request #19721 from vngrs/validates_presence_of_missing_note	Robin Dupret	2015-04-11	1	-0/+4
\|\ \ \ \ \
\| * \| \| \| \|	Missing note on validates_presence_of validation [ci skip]	Mehmet Emin İNAÇ	2015-04-11	1	-0/+4
* \| \| \| \| \|	Merge pull request #19731 from wazery/rename_bin_to_exe	Matthew Draper	2015-04-12	6	-6/+10
\|\ \ \ \ \ \ \| \|_\|_\|/ / / \|/\| \| \| \| \|
\| * \| \| \| \|	Rename railties/bin to railties/exe	Islam Wazery	2015-04-11	6	-6/+10
\|/ / / / /
* \| \| \| \|	Merge pull request #19727 from supercaracal/fix_wrong_test_method_name	Eileen M. Uchitelle	2015-04-11	1	-1/+1
\|\ \ \ \ \
\| * \| \| \| \|	fix a wrong feature test method name	Taishi Kasuga	2015-04-11	1	-1/+1
* \| \| \| \| \|	[ci skip] Remove `link_to_function` and `button_from_function` from guides	eileencodes	2015-04-11	1	-21/+0
* \| \| \| \| \|	Merge pull request #19728 from jonatack/patch-4	Kasper Timm Hansen	2015-04-11	1	-1/+1
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|
\| * \| \| \| \|	[skip ci] primay_key -> primary_key	Jon Atack	2015-04-11	1	-1/+1
\|/ / / / /
* \| \| \| \|	Merge branch 'girishso-belongs_to_primary_key_doc'	Zachary Scott	2015-04-10	1	-0/+20
\|\ \ \ \ \
\| * \| \| \| \|	Copy edits for primary_key documentation in association guide. [ci skip]	Zachary Scott	2015-04-10	1	-3/+4
\| * \| \| \| \|	Merge branch 'belongs_to_primary_key_doc' of https://github.com/girishso/rail...	Zachary Scott	2015-04-10	1	-0/+19
\|/\| \| \| \| \|
\| * \| \| \| \|	added primary_key option documentation for belongs_to association	Girish S	2014-09-23	1	-0/+19
* \| \| \| \| \|	Merge pull request #17512 from JackDanger/danger/use-default-view-pattern-in-...	Zachary Scott	2015-04-10	1	-1/+1
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Using the real resolver pattern in docs	Jack Danger Canty	2014-11-04	1	-1/+1
* \| \| \| \| \| \|	Copy edits for QueueAdapters docs to fix #17765 [ci skip]	Zachary Scott	2015-04-10	1	-18/+18
* \| \| \| \| \| \|	Merge branch 'queue-adapters-docs' of https://github.com/KingsleyKelly/rails ...	Zachary Scott	2015-04-10	1	-0/+56
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	[ci skip] Adds documentation explaining table labels for Active Job QueueAdap...	KingsleyKelly	2015-04-09	1	-7/+47
\| * \| \| \| \| \| \|	[ci skip] Adds rdoc for priority explaining what the labels in the table means.	KingsleyKelly	2015-04-06	1	-0/+16
* \| \| \| \| \| \| \|	Merge pull request #19722 from sikachu/remove-ar-use_transactional_fixtures	Guillermo Iguaran	2015-04-10	2	-2/+2
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Use `use_transactional_tests` in Active Record	Prem Sichanugrist	2015-04-10	2	-2/+2
\|/ / / / / / /
* \| \| \| \| \| \|	Merge pull request #19716 from yui-knk/fix/filter_name	Zachary Scott	2015-04-09	1	-3/+3
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	[ci skip] Downcases filter names	yui-knk	2015-04-10	1	-3/+3
\|/ / / / / / /
* \| \| \| \| \| \|	Merge pull request #19689 from marutosi/master-issue-19187	Rafael Mendonça França	2015-04-09	5	-4/+39
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	[Rails4 regression] prevent thin and puma cause error in Non ASCII URL on Win...	Toshi MARUYAMA	2015-04-09	2	-1/+23
\| * \| \| \| \| \| \|	wrap "require 'drb/unix'" by bgin-end at test/abstract_unit.rb	Toshi MARUYAMA	2015-04-09	1	-1/+5
\| * \| \| \| \| \| \|	Gemfile: temporay pin "bcrypt" version and run "bundle update bcrypt" on Linux	Toshi MARUYAMA	2015-04-09	2	-2/+11
\|/ / / / / / /
* \| \| \| \| \| \|	Merge pull request #19712 from eliotsykes/active-job-config-guide	Rafael Mendonça França	2015-04-09	2	-0/+60
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Add Active Job to Configuring Guide [ci skip]	Eliot Sykes	2015-04-09	2	-0/+60
* \| \| \| \| \| \| \|	Merge pull request #19682 from supercaracal/fix_force_ssl_redirection_flash_e...	Rafael Mendonça França	2015-04-09	3	-3/+31
\|\ \ \ \ \ \ \ \