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

	Commit message (Expand)	Author	Age	Files	Lines
*	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
\|\ \
\| * \|	Reuse existing validate_index_length! method	Prathamesh Sonpatki	2016-06-09	1	-7/+7
* \| \|	Merge pull request #25402 from alexcameron89/master	Rafael França	2016-06-14	1	-1/+1
\|\ \ \
\| * \| \|	Change AS::Callback to ActiveSupport::Callbacks in doc [ci skip]	Alex Kitchens	2016-06-14	1	-1/+1
\|/ / /
* \| \|	Fix postgresql query_cache test	Arthur Neves	2016-06-14	1	-0/+1
* \| \|	Respect the current `connected?` method when calling `cache`	Arthur Neves	2016-06-14	2	-2/+17
* \| \|	Remove not needed line on test	Arthur Neves	2016-06-14	1	-1/+0
* \| \|	Merge pull request #25401 from jwgoh/docs/request-response	Richard Schneeman	2016-06-14	1	-2/+2
\|\ \ \
\| * \| \|	Add Rack doc link for request and response object [ci skip]	Jun Wan Goh	2016-06-14	1	-2/+2
\|/ / /
* \| \|	Merge pull request #25399 from wynksaiddestroy/fix-typo-and-simply-after-comm...	Robin Dupret	2016-06-14	1	-2/+2
\|\ \ \
\| * \| \|	[skip ci] Fix typo and simplify after_commit example	wynksaiddestroy	2016-06-14	1	-2/+2
\|/ / /
* \| \|	Fix error message to talk about the scale not precision of the type	Rafael Mendonça França	2016-06-13	1	-1/+1
* \| \|	Fix missing requires for object/blank	Rafael Mendonça França	2016-06-13	2	-1/+3
* \| \|	Merge pull request #25390 from gsamokovarov/abstact-unit-presence-require	Rafael França	2016-06-13	1	-0/+1
\|\ \ \
\| * \| \|	Require "active_support/core_ext/object/blank" for railties abstract unit	Genadi Samokovarov	2016-06-13	1	-0/+1
* \| \| \|	Remove deprecated arguments in assert_nothing_raised	Rafael Mendonça França	2016-06-13	2	-6/+5
* \| \| \|	Merge pull request #24756 from gsamokovarov/always-inherit-from-application-r...	Rafael Mendonça França	2016-06-13	1	-2/+2
\|\ \ \ \
\| * \ \ \	Merge branch 'master' into always-inherit-from-application-record	Genadi Samokovarov	2016-05-30	323	-6690/+8063
\| \|\ \ \ \
\| * \| \| \| \|	Always genererate models with ApplicationRecord parent	Genadi Samokovarov	2016-04-28	5	-29/+21
* \| \| \| \| \|	Merge pull request #25319 from morgoth/generate-application-record-first	Rafael França	2016-06-13	5	-28/+20
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Generate application_record.rb file before model file	Wojciech Wnętrzak	2016-06-08	5	-28/+20
* \| \| \| \| \| \|	Merge pull request #25374 from kamipo/fix_calculate_with_string_in_from_and_e...	Sean Griffin	2016-06-13	2	-9/+5
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Fix `calculate` with a string value in `from` and eager loading	Ryuta Kamizono	2016-06-13	2	-9/+5
* \| \| \| \| \| \| \|	Explicitly require `acts_like` in AV	Sean Griffin	2016-06-13	1	-0/+1
* \| \| \| \| \| \| \|	Merge pull request #25372 from kamipo/remove_assert_date_from_db	Sean Griffin	2016-06-13	2	-5/+1
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Remove unnecessary `assert_date_from_db`	Ryuta Kamizono	2016-06-12	2	-5/+1
* \| \| \| \| \| \| \| \|	Add codeclimate and rubocop config files	Sean Griffin	2016-06-13	2	-0/+54
\| \|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #25380 from gsamokovarov/drop-unused-blank-require	Kasper Timm Hansen	2016-06-13	1	-2/+0
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Remove an unused require in ActiveSupport::TestCase	Genadi Samokovarov	2016-06-13	1	-2/+0
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge pull request #25378 from nikhilthombare/patch-1	प्रथमेश Sonpatki	2016-06-12	1	-11/+11
\|\ \ \ \ \ \ \ \ \| \|_\|/ / / / / / \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Changed ActiveJob::Base to ApplicationJob in the Active Job guide [ci skip]	Nikhil Thombare	2016-06-13	1	-11/+11
\|/ / / / / / /
* \| \| \| \| \| \|	Merge pull request #25362 from maclover7/jm-rm-ar-require	Eileen M. Uchitelle	2016-06-12	1	-2/+0
\|\ \ \ \ \ \ \
\| * \| \| \| \| \| \|	Remove unnecessary model requires	Jon Moss	2016-06-10	1	-2/+0
* \| \| \| \| \| \| \|	Merge pull request #25371 from kamipo/remove_outdated_comment	Eileen M. Uchitelle	2016-06-12	1	-12/+0
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Remove outdated comments [ci skip]	Ryuta Kamizono	2016-06-12	1	-12/+0
\| \| \|/ / / / / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #25004 from y-yagi/generate_mailer_layout_files_if_it_does...	Eileen M. Uchitelle	2016-06-12	5	-0/+44
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	generate mailer layout files if it does not already exist	yuuji.yaginuma	2016-05-15	5	-0/+44