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

	Commit message (Expand)	Author	Age	Files	Lines
...
*	Merge pull request #9784 from vipulnsward/change_from_blank_to_empty_on_string	Carlos Antonio da Silva	2013-03-18	1	-4/+4
\|\
\| *	change from blank? to empty? on obvious string values to save extra method c...	Vipul A M	2013-03-19	1	-4/+4
* \|	Fix failing tests related to where values change to strings	Carlos Antonio da Silva	2013-03-18	1	-7/+7
* \|	Revert "instruct RDoc to only parse Ruby files under lib [Fixes #9779]"	Xavier Noria	2013-03-18	6	-6/+6
* \|	Merge pull request #9782 from vipulnsward/change_from_each_to_each_key_habtm	Rafael Mendonça França	2013-03-18	2	-3/+3
\|\ \
\| * \|	1. Change from each to each_value since we did not use key	Vipul A M	2013-03-19	2	-3/+3
\| \|/
* \|	instruct RDoc to only parse Ruby files under lib [Fixes #9779]	Xavier Noria	2013-03-18	6	-6/+6
* \|	Merge pull request #9022 from braddunbar/digest-basic-auth	Steve Klabnik	2013-03-18	3	-0/+14
\|\ \
\| * \|	Digest auth should not 500 when given a basic header.	Brad Dunbar	2013-03-18	3	-0/+14
\|/ /
* \|	Merge pull request #9778 from vipulnsward/fix_typos_in_ar_v1	Steve Klabnik	2013-03-18	9	-10/+10
\|\ \
\| * \|	fix typos in AR. lots of them.	Vipul A M	2013-03-19	9	-10/+10
\| \|/
* \|	Merge pull request #9202 from gkop/more_helpful_message_when_starting_server	Steve Klabnik	2013-03-18	2	-2/+2
\|\ \
\| * \|	More helpful message when starting server	Gabe Kopley	2013-03-18	2	-2/+2
\|/ /
* \|	Merge branch 'master-sec'	Aaron Patterson	2013-03-18	9	-18/+81
\|\ \
\| * \|	fix protocol checking in sanitization [CVE-2013-1857]	Aaron Patterson	2013-03-15	2	-2/+12
\| * \|	JDOM XXE Protection [CVE-2013-1856]	Ben Murphy	2013-03-15	5	-2/+45
\| * \|	fix incorrect ^$ usage leading to XSS in sanitize_css [CVE-2013-1855]	Charlie Somerville	2013-03-15	2	-3/+8
\| * \|	stop calling to_sym when building arel nodes [CVE-2013-1854]	Aaron Patterson	2013-03-15	2	-11/+16
* \| \|	Merge pull request #9669 from senny/rails_method_missing_call	Jeremy Kemper	2013-03-18	2	-1/+2
\|\ \ \
\| * \| \|	config.ru uses the effective Rack app	Yves Senn	2013-03-15	2	-1/+2
* \| \| \|	Merge pull request #9774 from senny/9772_reraise_no_method_error_in_proper_co...	Andrew White	2013-03-18	3	-0/+15
\|\ \ \ \
\| * \| \| \|	`TimeWithZone` raises `NoMethodError` in proper context.	Yves Senn	2013-03-18	3	-0/+15
* \| \| \| \|	Merge pull request #9753 from jbarreneche/bug/render-locale-fallbacks	Carlos Antonio da Silva	2013-03-18	3	-1/+21
\|\ \ \ \ \ \| \|_\|_\|_\|/ \|/\| \| \| \|
\| * \| \| \|	Include I18n fallbacks in :locale lookup context	Juan Barreneche	2013-03-16	3	-1/+21
* \| \| \| \|	Merge pull request #9763 from vipulnsward/fix_transliterate_test	Carlos Antonio da Silva	2013-03-18	2	-2/+2
\|\ \ \ \ \
\| * \| \| \| \|	fix repeat of test; remove unused variable by use of each_key	Vipul A M	2013-03-18	2	-2/+2
* \| \| \| \| \|	Merge pull request #9766 from senny/remove_ancient_todos	Carlos Antonio da Silva	2013-03-18	3	-6/+0
\|\ \ \ \ \ \
\| * \| \| \| \| \|	remove ancient TODOs [ci skip].	Yves Senn	2013-03-18	3	-6/+0
\| \| \|_\|/ / / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge pull request #9771 from vipulnsward/fix_typos_activemodel_v1	Carlos Antonio da Silva	2013-03-18	3	-4/+4
\|\ \ \ \ \ \
\| * \| \| \| \| \|	fix some typos found in activemodel	Vipul A M	2013-03-18	3	-4/+4
\| \|/ / / / /
* \| \| \| \| \|	Merge pull request #9765 from tkhr/mv-tests-out-from-base_testrb	Carlos Antonio da Silva	2013-03-18	2	-14/+14
\|\ \ \ \ \ \
\| * \| \| \| \| \|	move tests out from base_test.rb	Takehiro Adachi	2013-03-18	2	-14/+14
\| \|/ / / / /
* \| \| \| \| \|	Merge pull request #9677 from neerajdotname/update-comments-about-kotori	Carlos Antonio da Silva	2013-03-18	1	-1/+1
\|\ \ \ \ \ \
\| * \| \| \| \| \|	SQLite3 3.6.8+ supports nested transactions [ci skip]	Neeraj Singh	2013-03-18	1	-1/+1
* \| \| \| \| \| \|	Merge pull request #9773 from senny/how_to_report_an_issue	Xavier Noria	2013-03-18	1	-3/+5
\|\ \ \ \ \ \ \ \| \|_\|/ / / / / \|/\| \| \| \| \| \|
\| * \| \| \| \| \|	refer to the contributing guide on how to create issues.	Yves Senn	2013-03-18	1	-3/+5
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #9762 from senny/8079_do_not_grant_on_root_user	Rafael Mendonça França	2013-03-17	3	-3/+26
\|\ \ \ \ \ \
\| * \| \| \| \| \|	`rake db:create` does not change permissions of root user.	Yves Senn	2013-03-17	3	-3/+26
\|/ / / / / /
* \| / / / /	sets limit 191 for schema_migrations#version in mysql2 if the encoding is "ut...	Xavier Noria	2013-03-17	4	-5/+58
\| \|/ / / / \|/\| \| \| \|
* \| \| \| \|	Merge pull request #9754 from macksmind/fix_actionpack_warnings	Rafael Mendonça França	2013-03-17	2	-2/+3
\|\ \ \ \ \
\| * \| \| \| \|	Fix rake test warnings in actionpack	Mack Earnhardt	2013-03-17	2	-2/+3
* \| \| \| \| \|	Merge pull request #9757 from vipulnsward/remove_message_param	Carlos Antonio da Silva	2013-03-17	1	-1/+1
\|\ \ \ \ \ \
\| * \| \| \| \| \|	remove unused parameter passed to assert_query_equal method	Vipul A M	2013-03-17	1	-1/+1
\| \|/ / / / /
* \| \| \| \| \|	Merge pull request #9745 from madmax/allow_pass_multipart_to_form_for	Carlos Antonio da Silva	2013-03-17	2	-3/+3
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Allow pass multipart option to form_for	Grzegorz Derebecki	2013-03-17	2	-3/+3
* \| \| \| \| \| \|	Merge pull request #9758 from vipulnsward/remove_from_rakefile	Carlos Antonio da Silva	2013-03-17	1	-2/+0
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	extra lines from Rakefile removed, which also threw warning	Vipul A M	2013-03-17	1	-2/+0
\| \| \|/ / / / / \| \|/\| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #9759 from vipulnsward/remove_hash_from_tests	Carlos Antonio da Silva	2013-03-17	1	-16/+10
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \|
\| * \| \| \| \| \|	refactor test to drop unnecessary hash creation, test directly instead	Vipul A M	2013-03-17	1	-16/+10
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #9747 from macksmind/refactor_friend_follower	Rafael Mendonça França	2013-03-16	6	-6/+15
\|\ \ \ \ \ \