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

	Commit message (Expand)	Author	Age	Files	Lines
...
\| * \| \| \| \| \|	RouteSet should be in charge of constructing the dispather	Aaron Patterson	2014-07-15	1	-2/+2
\| * \| \| \| \| \|	Merge pull request #16168 from greysteil/stash-path-info	Matthew Draper	2014-07-14	1	-1/+2
\| \|\ \ \ \ \ \
\| \| * \| \| \| \| \|	Stash original path in `ShowExceptions` middleware	Grey Baker	2014-07-14	1	-1/+2
\| * \| \| \| \| \| \|	Fix typos like `a html` to `an html` and 'an mail' to 'an email'. [ci skip]	Santosh Wadghule	2014-07-14	1	-2/+2
\| \|/ / / / / /
\| * \| \| \| \| \|	Removed single space padding from empty response body.	Godfrey Chan	2014-07-10	4	-16/+16
* \| \| \| \| \| \|	Remove more unneeded include	Rafael Mendonça França	2014-07-15	1	-3/+0
* \| \| \| \| \| \|	We don't need loofah for the assertions	Rafael Mendonça França	2014-07-15	1	-3/+3
* \| \| \| \| \| \|	Merge pull request #11218 from kaspth/loofah-integration	Rafael Mendonça França	2014-07-10	7	-1175/+8
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \|
\| * \| \| \| \| \|	Remove unneeded comment in test.	Timm	2014-06-16	1	-1/+1
\| * \| \| \| \| \|	Exchanged requiring of action view assertions with rails dom testing assertions.	Timm	2014-06-16	1	-2/+3
\| * \| \| \| \| \|	Moved ActionView::Assertions dependency from Action Pack's lib to abstract_un...	Timm	2014-06-16	1	-0/+2
\| * \| \| \| \| \|	Nokogiri leaves '<' unescaped, so the assert_select looking for '<' will n...	Timm	2014-06-16	1	-2/+3
\| * \| \| \| \| \|	Removed require's for html-scanner.	Timm	2014-06-16	2	-2/+0
\| * \| \| \| \| \|	Moved Dom and Selector assertions from ActionDispatch to ActionView.	Timm	2014-06-16	1	-350/+0
\| * \| \| \| \| \|	Fixed: assert_select_encoded finds the right content. No longer uses a <encod...	Timm	2014-06-16	1	-9/+2
\| * \| \| \| \| \|	Fixed: test_nested_assert_select selects from elements instead of elements[0]...	Timm	2014-06-16	1	-2/+2
\| * \| \| \| \| \|	Changed xml_namespace test to correct syntax. However, Nokogiri won't recogni...	Timm	2014-06-16	1	-2/+3
\| * \| \| \| \| \|	Changed test methods to use new substitution syntax more in line with css sel...	Timm	2014-06-16	1	-3/+3
\| * \| \| \| \| \|	Fixed typo in method name. Fixed Nokogiri::CSS::SyntaxError.	Timm	2014-06-15	1	-2/+2
\| * \| \| \| \| \|	Changed tests to assert_kind_of Loofah::HTML::Document.	Timm	2014-06-15	1	-3/+3
\| * \| \| \| \| \|	Removed selector_test.rb since HTML::Selector will be removed. Soon.	Timm	2014-06-15	1	-629/+0
\| * \| \| \| \| \|	Fixed Nokogiri::CSS::SyntaxErrors.	Timm	2014-06-15	1	-2/+2
\| * \| \| \| \| \|	Removed tag.rb since it has been deprecated.	Timm	2014-06-15	2	-184/+0
* \| \| \| \| \| \|	Merge branch 'rosetta_flash' of https://github.com/gcampbell/rails into gcamp...	Aaron Patterson	2014-07-10	2	-2/+2
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Address CVE-2014-4671 (JSONP Flash exploit)	Greg Campbell	2014-07-09	2	-2/+2
* \| \| \| \| \| \| \|	Force encoding of US-ASCII to UTF-8 in unescape_uri.	Karl Entwistle	2014-07-10	1	-0/+5
\|/ / / / / / /
* \| \| \| \| \| \|	Merge pull request #13999 from jamox/update_rack	Aaron Patterson	2014-07-08	2	-7/+17
\|\ \ \ \ \ \ \ \| \|_\|/ / / / / \|/\| \| \| \| \| \|
\| * \| \| \| \| \|	Upgraded rack	Jarmo Isotalo	2014-05-19	2	-7/+17
* \| \| \| \| \| \|	always test against a routed rack app so there are always url_helpers	Aaron Patterson	2014-07-07	4	-35/+65
* \| \| \| \| \| \|	Generate shallow paths for all children of shallow resources.	Seb Jacobs	2014-07-06	1	-0/+22
* \| \| \| \| \| \|	Merge pull request #16013 from tgxworld/remove_symbolized_path_parameters	Rafael Mendonça França	2014-07-04	2	-5/+5
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Remove symbolized_path_parameters.	Guo Xiang Tan	2014-07-02	2	-5/+5
* \| \| \| \| \| \| \|	Merge pull request #16011 from xjlu/token_and_options	Rafael Mendonça França	2014-07-04	1	-2/+22
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Improve token_and_options regex and test	Xinjiang Lu	2014-07-01	1	-2/+22
* \| \| \| \| \| \| \| \|	Change the JSON renderer to enforce the 'JS' Content Type	Lucas Mazza	2014-07-02	1	-0/+13
\| \|/ / / / / / / \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Fix typo	Rafael Mendonça França	2014-07-02	1	-1/+1
\|/ / / / / / /
* \| \| \| \| \| \|	Merge pull request #15933 from rafael/master	Rafael Mendonça França	2014-06-27	1	-0/+29
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Improvements per code review.	Rafael Chacón	2014-06-27	1	-0/+29
* \| \| \| \| \| \| \|	Merge pull request #15537 from tgxworld/fix_state_leak	Matthew Draper	2014-06-20	3	-4/+5
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Remove redundant code.	Guo Xiang Tan	2014-06-05	1	-4/+0
\| * \| \| \| \| \| \| \|	Prevent state leak.	Guo Xiang Tan	2014-06-05	3	-0/+5
* \| \| \| \| \| \| \| \|	Fix request's path_info when a rack app mounted at '/'.	Larry Lv	2014-06-14	1	-0/+7
* \| \| \| \| \| \| \| \|	Merge pull request #15692 from sromano/falseClass	Matthew Draper	2014-06-14	1	-1/+17
\|\ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	ActionController::Parameters#require now accepts FalseClass values	Sergio Romano	2014-06-13	1	-1/+17
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Fix parsed token value with header `Authorization token=`.	Larry Lv	2014-06-13	1	-6/+23
* \| \| \| \| \| \| \| \|	use Ruby for mocking	Aaron Patterson	2014-06-12	1	-1/+1
* \| \| \| \| \| \| \| \|	remove warnings	Kuldeep Aggarwal	2014-06-12	2	-3/+0
\| \|_\|_\|/ / / / / \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #15545 from zuhao/refactor_actionpack_assert_select_test	Yves Senn	2014-06-08	1	-1/+4
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Restore test deliveries for ActionMailer.	Zuhao Wan	2014-06-07	1	-1/+4
\| \|/ / / / / / /
* \| \| \| \| \| \| \|	Handle client disconnect during live streaming	Matthew Draper	2014-06-08	1	-0/+89