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

	Commit message (Expand)	Author	Age	Files	Lines
*	update_url is not `get` most of the times [ci skip]	Prathamesh Sonpatki	2016-06-22	1	-1/+1
*	Revert "Merge pull request #17973 from maurogeorge/file_field_hidden_field"	eileencodes	2016-06-21	3	-53/+5
*	Change the raw template handler to render html-safe strings	eileencodes	2016-06-21	3	-1/+19
*	Merge pull request #25458 from taboularasa/taboularasa/update-docs-ActiveReco...	Jon Moss	2016-06-21	1	-0/+17
\|\
\| *	[ci skip] better docs for ActiveRecord::AttributeSet::YAMLEncoder#decode	David Elliott	2016-06-21	1	-0/+17
* \|	Merge pull request #25415 from maclover7/jm-fix-25410	Rafael França	2016-06-21	1	-0/+6
\|\ \ \| \|/ \|/\|
\| *	Add test to better demonstrate `ActiveModel::Errors#added?` behavior	Jon Moss	2016-06-21	1	-0/+6
* \|	Merge pull request #25450 from prathamesh-sonpatki/fix-testing-guide	Kasper Timm Hansen	2016-06-21	1	-7/+11
\|\ \
\| * \|	Fix the docs for supported keyword args for Rails 5 style integration control...	Prathamesh Sonpatki	2016-06-21	1	-7/+11
* \| \|	Merge pull request #25452 from taboularasa/taboularasa/update-docs-api_docume...	Kasper Timm Hansen	2016-06-20	1	-1/+1
\|\ \ \
\| * \| \|	[ci skip] correction in command for generating api documentation	David Elliott	2016-06-20	1	-1/+1
\|/ / /
* \| \|	Merge pull request #25430 from nfm/fix-rails-info-routes-for-apps-with-globbi...	Richard Schneeman	2016-06-20	3	-1/+27
\|\ \ \
\| * \| \|	Fix rails/info routes for apps with globbing route	Nicholas Firth-McCoy	2016-06-20	3	-1/+27
\| \|/ /
* \| \|	Merge pull request #25449 from alexcameron89/master	प्रथमेश Sonpatki	2016-06-20	1	-1/+1
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	[ci skip] fix typo in ActiveRecord::ConnectionHandling	Alex Kitchens	2016-06-20	1	-1/+1
\|/ /
* \|	Merge pull request #25433 from prathamesh-sonpatki/cleanup-app-generator-code	Guillermo Iguaran	2016-06-20	1	-2/+0
\|\ \
\| * \|	No need to have conditional based on api options in assets	Prathamesh Sonpatki	2016-06-20	1	-2/+0
* \| \|	Merge pull request #25420 from michaeldever/mdever_actioncable_development_ports	Guillermo Iguaran	2016-06-20	1	-1/+1
\|\ \ \ \| \|/ / \|/\| \|
\| * \|	Allow actioncable connections from any port in development	Michael Dever	2016-06-16	1	-1/+1
* \| \|	Merge pull request #25436 from prathamesh-sonpatki/fix-tests	Richard Schneeman	2016-06-19	2	-3/+3
\|\ \ \
\| * \| \|	Fix failing railties tests	Prathamesh Sonpatki	2016-06-18	2	-3/+3
\|/ / /
* \| \|	Merge pull request #25426 from Shopify/fix-activejob-logger	Rafael França	2016-06-17	3	-2/+16
\|\ \ \
\| * \| \|	Fix jobs overriding AJ::Base#logger	Jean Boussier	2016-06-17	3	-2/+16
* \| \| \|	Merge pull request #23301 from ppworks/improve_mysqldump	Arthur Nogueira Neves	2016-06-17	2	-4/+5
\|\ \ \ \ \| \|/ / / \|/\| \| \|
\| * \| \|	Skip comments when exec mysqldump	Naoto Koshikawa	2016-01-28	2	-4/+5
* \| \| \|	Merge pull request #25302 from schneems/schneems/evented-file-boot-at-check-t...	Sean Griffin	2016-06-17	2	-6/+87
\|\ \ \ \
\| * \| \| \|	Lock the whole boot step, get rid of unneeded hash	schneems	2016-06-13	1	-5/+9
\| * \| \| \|	Test how evented file checker handles forks	schneems	2016-06-08	1	-1/+42
\| * \| \| \|	Listen earlier in EventedFileUpdateChecker	schneems	2016-06-06	1	-6/+8
\| * \| \| \|	[ci skip] document EventedFileUpdateChecker	schneems	2016-06-06	1	-0/+28
\| * \| \| \|	EventedFileUpdateChecker boots once per process	schneems	2016-06-06	2	-6/+12
* \| \| \| \|	Merge pull request #25421 from maclover7/jm-mv-files	Sean Griffin	2016-06-17	2	-0/+0
\|\ \ \ \ \
\| * \| \| \| \|	Move code style configuration files to root directory	Jon Moss	2016-06-16	2	-0/+0
\|/ / / / /
* \| \| \| \|	Merge pull request #24773 from ralinc/fix-silent-fail-on-psql-command	Arthur Nogueira Neves	2016-06-16	3	-3/+18
\|\ \ \ \ \
\| * \| \| \| \|	PostgreSQL: Fix db:structure:load silent failure on SQL error	Ralin Chimev	2016-05-10	3	-3/+18
* \| \| \| \| \|	Move quiet option to development.rb	Rafael Mendonça França	2016-06-16	2	-3/+3
\| \|_\|_\|/ / \|/\| \| \| \|
* \| \| \| \|	Merge pull request #25411 from javan/fix-digesting-different-formats	Matthew Draper	2016-06-17	5	-6/+49
\|\ \ \ \ \
\| * \| \| \| \|	Add test for nested html dependencies with same logical name as templates for...	Javan Makhmali	2016-06-15	1	-2/+6
\| * \| \| \| \|	Move and rename test	Javan Makhmali	2016-06-15	1	-7/+7
\| * \| \| \| \|	Fix finding templates for digesting for / requests that render a non-defaul...	Javan Makhmali	2016-06-15	4	-3/+30
\| * \| \| \| \|	Explicity find with the rendered format to handle searching multiple view pat...	Javan Makhmali	2016-06-15	3	-4/+2
\| * \| \| \| \|	Fix digesting templates with identical logical names when requesting a format...	Javan Makhmali	2016-06-15	3	-4/+18
\| \| \|_\|_\|/ \| \|/\| \| \|
* \| \| \| \|	Merge pull request #25416 from alexcameron89/master	Rafael França	2016-06-16	1	-2/+0
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|
\| * \| \| \|	[ci skip] Remove duplicate alias documentation in ActiveModel::Validations	Alex Kitchens	2016-06-16	1	-2/+0
\|/ / / /
* \| \| \|	Merge pull request #25271 from kamipo/prevent_range_error_for_exists	Sean Griffin	2016-06-15	3	-10/+6
\|\ \ \ \
\| * \| \| \|	Prevent `RangeError` for `FinderMethods#exists?`	Ryuta Kamizono	2016-06-16	3	-6/+5
\| * \| \| \|	Avoid type casting in uniqueness validator	Ryuta Kamizono	2016-06-04	1	-5/+2
* \| \| \| \|	Merge pull request #25407 from pjscopeland/doc/correct-pg-example	Rafael França	2016-06-15	1	-2/+2
\|\ \ \ \ \
\| * \| \| \| \|	Example had results the wrong way round [ci skip]	Patrick Copeland	2016-06-16	1	-2/+2
\|/ / / / /
* \| \| \| \|	Merge pull request #25339 from prathamesh-sonpatki/reuse-validate-index-length	Rafael França	2016-06-15	1	-7/+7
\|\ \ \ \ \