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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #26205 from pedaling-corp/fix/active-job-resque	Rafael Mendonça França	2016-08-23	3	-2/+16
\|\
\| *	Added instance variable `@queue` to JobWrapper.	InJung Chung	2016-08-19	3	-0/+16
* \|	Merge pull request #26253 from kamipo/fix_ci_failure	Rafael França	2016-08-23	1	-2/+2
\|\ \
\| * \|	Fix CI failure caused by df84e9867219e9311aef6f4efd5dd9ec675bee5c	Ryuta Kamizono	2016-08-23	1	-2/+2
* \| \|	Merge pull request #26231 from philipqnguyen/scoped-dependent-destroy	Jon Moss	2016-08-22	1	-0/+6
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Doc on scoped has_many, dependent: :destroy	Philip Nguyen	2016-08-22	1	-0/+6
* \| \|	Include the content of the flash in the auto-generated etag (#26250)	David Heinemeier Hansson	2016-08-22	5	-0/+59
* \| \|	Merge pull request #26249 from rafamanzo/add_redis_to_development_dependencies	Rafael França	2016-08-22	1	-0/+43
\|\ \ \
\| * \| \|	[ci skip] Update docs with Action Cable Redis dependency	Rafael Reggiani Manzo	2016-08-22	1	-0/+43
* \| \| \|	Remove the SchemaDumper options and change the default behavior	Rafael Mendonça França	2016-08-22	4	-137/+17
* \| \| \|	Merge pull request #26248 from wjordan/remove-dynamic-segments-doc	प्रथमेश Sonpatki	2016-08-22	1	-25/+11
\|\ \ \ \
\| * \| \| \|	Remove `:action` and `:controller` segments from routing guide	Will Jordan	2016-08-22	1	-25/+11
\|/ / / /
* \| \| \|	Merge pull request #25750 from go2null/go2null-test-directories	Eileen M. Uchitelle	2016-08-22	1	-2/+4
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	Clearly state purpose of test directories	go2null	2016-08-22	1	-2/+4
* \| \| \|	Merge pull request #23941 from chiragsinghal/patch-1	Kasper Timm Hansen	2016-08-22	3	-1/+43
\|\ \ \ \
\| * \| \| \|	Return 307 status instead of 301 when rerouting POST requests to SSL	Chirag Singhal	2016-08-22	3	-1/+43
* \| \| \| \|	Merge pull request #26245 from danila/quering-interface-guide	Vipul A M	2016-08-22	1	-2/+2
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|
\| * \| \| \|	Change form of table name to plural in query example	Danila Ermakov	2016-08-22	1	-2/+2
\|/ / / /
* \| \| \|	Merge pull request #26240 from ojiry/fix_ad_http_url_doc	प्रथमेश Sonpatki	2016-08-22	1	-65/+21
\|\ \ \ \
\| * \| \| \|	Fix `ActionDispatch::Http::URL` docs [ci skip]	Ryoji Yoshioka	2016-08-22	1	-65/+21
* \| \| \| \|	Merge pull request #26241 from scottyantipa/query-interface-docs	Jon Moss	2016-08-21	1	-3/+3
\|\ \ \ \ \
\| * \| \| \| \|	Update docs for query interface to not declare that all methods return instan...	Scott Antipa	2016-08-21	1	-3/+3
\| \|/ / / /
* \| \| \| \|	Merge pull request #23759 from maclover7/fix-23757	Kasper Timm Hansen	2016-08-21	2	-1/+16
\|\ \ \ \ \
\| * \| \| \| \|	Prevent invocation of channel action if rejected connection	Jon Moss	2016-08-19	2	-1/+16
\| \| \|_\|/ / \| \|/\| \| \|
* \| \| \| \|	Merge pull request #26234 from y-yagi/remove_unnessary_session_store_setting	Kasper Timm Hansen	2016-08-21	1	-1/+0
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \|
\| * \| \| \|	remove unnessary `session_store` setting	yuuji.yaginuma	2016-08-20	1	-1/+0
* \| \| \| \|	Merge branch 'master' of github.com:rails/docrails	Vijay Dev	2016-08-21	5	-8/+8
\|\ \ \ \ \
\| * \| \| \| \|	When referring to Rails, be consistent in usage of capitalized form, unless i...	Vipul A M	2016-08-19	3	-4/+4
\| * \| \| \| \|	Grammar changes on getting started guide, specify where exactly the example i...	Vipul A M	2016-08-19	1	-2/+2
\| * \| \| \| \|	Fix remaining broadcasting_name example from Action Cable guide [ci skip]	Prathamesh Sonpatki	2016-08-12	1	-2/+2
* \| \| \| \| \|	Merge pull request #26227 from alexcameron89/syntax_highlighter_fix	Vijay Dev	2016-08-20	1	-1/+1
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Increase margin-bottom for doc's code syntax highlighter	Alex Kitchens	2016-08-20	1	-1/+1
\| \| \|_\|/ / / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge pull request #26232 from kamipo/fix_oid_bit_cast_value	Sean Griffin	2016-08-20	2	-4/+5
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Fix `OID::Bit#cast_value`	Ryuta Kamizono	2016-08-20	2	-4/+5
\| \|/ / / / /
* \| \| \| \| \|	Merge pull request #26233 from y-yagi/update_retry_on_example	प्रथमेश Sonpatki	2016-08-20	1	-2/+2
\|\ \ \ \ \ \ \| \|_\|_\|/ / / \|/\| \| \| \| \|
\| * \| \| \| \|	correct exception class in `retry_on` example [ci skip]	yuuji.yaginuma	2016-08-20	1	-2/+2
\|/ / / / /
* \| \| \| \|	Merge pull request #26224 from jonatack/consistent-asset-precompile-examples	Eileen M. Uchitelle	2016-08-19	5	-10/+11
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|
\| * \| \| \|	Consistent examples and template for assets#precompile	Jon Atack	2016-08-19	5	-10/+11
* \| \| \| \|	Merge pull request #26219 from kamipo/remove_unused_blob_or_text_column	Rafael França	2016-08-19	2	-9/+0
\|\ \ \ \ \
\| * \| \| \| \|	Remove unused `blob_or_text_column?` method	Ryuta Kamizono	2016-08-19	2	-9/+0
* \| \| \| \| \|	Merge pull request #26218 from kamipo/remove_unnecessary_length	Rafael França	2016-08-19	2	-12/+6
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|
\| * \| \| \| \|	Remove unnecessary `length` method for collection proxy	Ryuta Kamizono	2016-08-19	2	-12/+6
* \| \| \| \| \|	Copy edits in the documentation [ci skip]	Rafael Mendonça França	2016-08-19	2	-4/+6
* \| \| \| \| \|	Merge pull request #26212 from evmunro/as-json-sets-request-to-json-for-contr...	Rafael França	2016-08-19	3	-1/+22
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Set the request type if as: is specified	Everest Munro-Zeisberger	2016-08-18	3	-1/+22
\| \| \|_\|_\|_\|/ \| \|/\| \| \| \|
* \| \| \| \| \|	Merge pull request #25675 from TimPetricola/schema-no-standardized-column-widths	Rafael Mendonça França	2016-08-19	4	-11/+125
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Merge branch 'master' into schema-no-standardized-column-widths	Tim Petricola	2016-08-18	4	-117/+137
\| \|\\| \| \| \| \|
\| * \| \| \| \| \|	Option not to line up column types and attributes in schema.rb	Tim Petricola	2016-08-17	4	-14/+128
* \| \| \| \| \| \|	Add chengelog entry to #25976	Rafael Mendonça França	2016-08-19	1	-0/+7
* \| \| \| \| \| \|	Merge pull request #26154 from kamipo/remove_text_default_treated_as_empty_st...	Rafael Mendonça França	2016-08-19	6	-84/+70
\|\ \ \ \ \ \ \ \| \|_\|_\|/ / / / \|/\| \| \| \| \| \|