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

	Commit message (Collapse)	Author	Age	Files	Lines
...
* \| \| \| \| \|	Merge pull request #19222 from davydovanton/doc-delete-excess-white	Arthur Nogueira Neves	2015-03-05	1	-1/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip] Delete excess white in documentation
\| * \| \| \| \| \|	[ci skip] Delete excess white in documentation	Anton Davydov	2015-03-05	1	-1/+1
\|/ / / / / /
* \| \| \| \| \|	Revert "Allow failures with Active Job"	Jeremy Kemper	2015-03-05	1	-4/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Travis is green. Let's keep it that way rather than let AJ languish as a second-class citizen. This reverts commit 2a6b3e14cff61639978a55f47aea9ff4c8e72758.
* \| \| \| \| \|	Merge pull request #19220 from ↵	Kasper Timm Hansen	2015-03-05	1	-1/+6
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	davydovanton/doc-add-info-about-sanitize-to-highlight [ci skip] Add information about sanitize option in TextHelper#highlight
\| * \| \| \| \| \|	[ci skip] Add information about sanitize option in TextHelper#highlight	Anton Davydov	2015-03-05	1	-1/+6
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Use ruby 2.2.1 on Travis	Sean Griffin	2015-03-05	1	-1/+1
\| \|/ / / / / \|/\| \| \| \| \|
* \| \| \| \| \|	Merge pull request #19215 from ↵	Sean Griffin	2015-03-05	3	-7/+5
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	gsamokovarov/revert-ruby-2-2-0-kwarg-crash-workarounds Revert work arounds for upstream Ruby 2.2.0 kwargs bug
\| * \| \| \| \| \|	Revert work arounds for upstream Ruby 2.2.0 kwargs bug	Genadi Samokovarov	2015-03-05	3	-7/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The bug caused a segfault and you can find more info about it at: https://bugs.ruby-lang.org/issues/10685. We did a couple of work arounds, but 2.2.1 rolled out and those aren't needed anymore. Here are the reverted commits: - Revert "Work around for upstream Ruby bug #10685", commit 707a433870e9e06af688f85a4aedc64a90791a64. - Revert "Fix segmentation fault in ActionPack tests", commit 22e0a22d5f98e162290d9820891d8191e720ad3b. I'm also bumping the Ruby version check to 2.2.1 to prevent future segfaults.
* \| \| \| \| \| \|	Merge pull request #19218 from sivsushruth/doc_fix	Kasper Timm Hansen	2015-03-05	1	-1/+1
\|\ \ \ \ \ \ \ \| \| \|_\|/ / / / \| \|/\| \| \| \| \|	Added doc [ci skip]
\| * \| \| \| \| \|	nodoc filtered_location [ci skip]	Sushruth Sivaramakrishnan	2015-03-05	1	-1/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #19217 from tgxworld/run_actionpack_tests_in_random_order	Yves Senn	2015-03-05	1	-5/+0
\|\ \ \ \ \ \ \ \| \|_\|_\|/ / / / \|/\| \| \| \| \| \|	Run ActionPack test cases in random order.
\| * \| \| \| \| \|	Run ActionPack test cases in random order.	Guo Xiang Tan	2015-03-06	1	-5/+0
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #19214 from sivsushruth/doc_fix	Arthur Nogueira Neves	2015-03-05	1	-1/+1
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Doc fix [ci skip]
\| * \| \| \| \|	Doc fix [ci skip]	Sushruth Sivaramakrishnan	2015-03-05	1	-1/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Merge pull request #19180 from sivsushruth/master	Arthur Nogueira Neves	2015-03-05	1	-0/+5
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \|	If TZInfo-data is not present in windows, let the user know.
\| * \| \| \| \|	If TZInfo-data is not present in windows, let the user know.	Sushruth Sivaramakrishnan	2015-03-04	1	-0/+5
\| \| \|/ / / \| \|/\| \| \|
* \| \| \| \|	Some documentation edits [ci skip]	Robin Dupret	2015-03-05	7	-22/+30
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Fix a few typos * Wrap some lines around 80 chars * Rephrase some statements
* \| \| \| \|	Merge pull request #19212 from sivsushruth/doc_fix	Robin Dupret	2015-03-05	1	-1/+1
\|\ \ \ \ \ \| \| \|/ / / \| \|/\| \| \|	Doc fix [ci skip]
\| * \| \| \|	Doc fix [ci skip]	Sushruth Sivaramakrishnan	2015-03-05	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Merge pull request #19211 from keepcosmos/add-enum-testcase	Yves Senn	2015-03-05	1	-0/+14
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	added a testcase for ActiveRecord::Enum
\| * \| \| \| \|	add ActiveRecord::Enum testcase about multiple enums declaring at a time	keepcosmos	2015-03-05	1	-0/+14
\|/ / / / /
* \| \| \| \|	Merge pull request #19210 from sivsushruth/doc_fix	Abdelkader Boudih	2015-03-05	1	-1/+1
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Doc fix [ci skip]
\| * \| \| \|	Doc fix [ci skip]	Sushruth Sivaramakrishnan	2015-03-05	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	add regression test. Closes #18400.	Yves Senn	2015-03-05	1	-0/+6
\| \| \| \| \|
* \| \| \| \|	Merge pull request #19209 from sivsushruth/doc_fix	Abdelkader Boudih	2015-03-05	1	-1/+1
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Doc fix [ci skip]
\| * \| \| \|	Doc fix [ci skip]	Sushruth Sivaramakrishnan	2015-03-05	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Merge pull request #19207 from sivsushruth/doc_fix	Abdelkader Boudih	2015-03-05	1	-2/+2
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Doc fix [ci skip]
\| * \| \| \|	Doc fix [ci skip]	Sushruth Sivaramakrishnan	2015-03-05	1	-2/+2
\| \| \| \| \|
* \| \| \| \|	Merge pull request #19206 from sivsushruth/doc_fix	Abdelkader Boudih	2015-03-05	1	-1/+1
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Doc fix [ci skip]
\| * \| \| \|	Doc fix [ci skip]	Sushruth Sivaramakrishnan	2015-03-05	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Merge pull request #19205 from sivsushruth/doc_fix	Abdelkader Boudih	2015-03-05	1	-1/+1
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Doc fix [ci skip]
\| * \| \| \|	Doc fix [ci skip]	Sushruth Sivaramakrishnan	2015-03-05	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Merge pull request #19203 from sivsushruth/doc_fix	Richard Schneeman	2015-03-04	1	-1/+1
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Doc fix [ci skip]
\| * \| \| \|	Doc fix [ci skip]	Sushruth Sivaramakrishnan	2015-03-05	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Merge pull request #19202 from sivsushruth/doc_fix	Arthur Nogueira Neves	2015-03-04	1	-1/+1
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Doc fix [ci skip]
\| * \| \| \|	Doc fix [ci skip]	Sushruth Sivaramakrishnan	2015-03-05	1	-1/+1
\|/ / / /
* \| \| \|	Merge pull request #19144 from y-yagi/fix_streaming_buffer	Rafael Mendonça França	2015-03-04	3	-1/+13
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	fix ActionView::Template::Error when using Streaming with capture.
\| * \| \| \|	fix ActionView::Template::Error when using Streaming with capture.	yuuji.yaginuma	2015-03-01	3	-1/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	can't acquire a encoding from StreamingBuffer. fixes #12001
* \| \| \| \|	Merge pull request #19185 from kamipo/correctly_dump_serial_and_bigserial	Rafael Mendonça França	2015-03-04	8	-27/+100
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Correctly dump `serial` and `bigserial`
\| * \| \| \| \|	Remove duplicated test	Ryuta Kamizono	2015-03-04	1	-20/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	`PostgresqlLargeKeysTest` is duplicated `PrimaryKeyBigSerialTest` in `primary_keys_test.rb`.
\| * \| \| \| \|	Correctly dump `serial` and `bigserial`	Ryuta Kamizono	2015-03-04	6	-4/+93
\| \| \| \| \| \|
\| * \| \| \| \|	Add `Column#bigint?` method	Ryuta Kamizono	2015-03-04	3	-3/+7
\| \| \| \| \| \|
* \| \| \| \| \|	Merge pull request #19189 from ↵	Richard Schneeman	2015-03-04	1	-2/+5
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	mraidel/activesupport_cache_fetch_multi_documentation_fix fixes documentation for returned hash in cache.fetch_multi
\| * \| \| \| \| \|	fixes documentation for returned hash in cache.fetch_multi	Michael Raidel	2015-03-04	1	-2/+5
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Drop request class from RouteSet constructor.	Aaron Patterson	2015-03-04	3	-5/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	If you would like to use a custom request class, please subclass and implemet the `request_class` method.
* \| \| \| \| \| \|	Merge pull request #19197 from teeceepee/improve_docs	Rafael Mendonça França	2015-03-04	2	-16/+16
\|\ \ \ \ \ \ \ \| \|_\|/ / / / / \|/\| \| \| \| \| \|	Fix spelling [ci skip]
\| * \| \| \| \| \|	Fix spelling [ci skip]	Yu Haidong	2015-03-04	2	-16/+16
\|/ / / / / /
* \| \| \| \| \|	add CHANGELOG entry for #19176. [ci skip]	Yves Senn	2015-03-04	1	-0/+4
\| \| \| \| \| \|
* \| \| \| \| \|	Merge pull request #19195 from y-yagi/patch-1	Xavier Noria	2015-03-04	1	-1/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix spelling, `ERb` -> `ERB` [ci skip]
\| * \| \| \| \| \|	fix spelling, `ERb` -> `ERB` [ci skip]	yuuji.yaginuma	2015-03-04	1	-1/+1
\|/ / / / / /