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

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| * \| \| \| \| \| \| \| \| \|	Use the type object for quoting PG Ranges	Sean Griffin	2014-07-05	6	-54/+40
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Only reference time specific methods in the time section [ci skip]	Sean Griffin	2014-07-05	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Remove all references to `Time.yesterday` [ci skip]	Sean Griffin	2014-07-05	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	`Time.today` -> `Date.today` in guides. [ci skip]	Sean Griffin	2014-07-05	1	-1/+1
\|/ / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removed mentions of non-existent methods, also added a mention for `Date.current`, which is analagous to `Time.current`. Closes #16061.
* \| \| \| \| \| \| \| \| \|	Add release notes entry for #15819 [ci skip]	Sean Griffin	2014-07-04	1	-0/+5
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	CHANGELOG and release notes entry for #16056	Sean Griffin	2014-07-04	2	-0/+9
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge pull request #16056 from sgrif/sg-required-associations	David Heinemeier Hansson	2014-07-04	4	-1/+105
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add a `required` option to singular associations
\| * \| \| \| \| \| \| \| \| \|	Add a `required` option to singular associations	Sean Griffin	2014-07-04	4	-1/+105
\|/ / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In addition to defining the association, a `required` association will also have its presence validated. Before: ```ruby belongs_to :account validates_presence_of :account ``` After: ```ruby belongs_to :account, required: true ``` This helps to draw a distinction between types of validations, since validations on associations are generally for data integrity purposes, and aren't usually set through form inputs.
* \| \| \| \| \| \| \| \| \|	Merge pull request #16054 from rails/revert-16003-sg-refactor-sqlite3-strings	Matthew Draper	2014-07-05	1	-37/+13
\|\ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \|	Revert "Use a type object for type casting behavior on SQLite3"
\| * \| \| \| \| \| \| \| \|	Revert "Use a type object for type casting behavior on SQLite3"	Matthew Draper	2014-07-05	1	-37/+13
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Don't fail if unicode.org isn't talking to us	Matthew Draper	2014-07-05	1	-1/+3
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Fix typo	Rafael Mendonça França	2014-07-04	1	-1/+1
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #16013 from tgxworld/remove_symbolized_path_parameters	Rafael Mendonça França	2014-07-04	5	-10/+10
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove symbolized_path_parameters.
\| * \| \| \| \| \| \| \| \|	Remove symbolized_path_parameters.	Guo Xiang Tan	2014-07-02	5	-10/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This pull request is a continuation of https://github.com/rails/rails/commit/925bd975 and https://github.com/rails/rails/commit/8d8ebe3d.
* \| \| \| \| \| \| \| \| \|	Merge pull request #16003 from sgrif/sg-refactor-sqlite3-strings	Matthew Draper	2014-07-05	1	-13/+37
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use a type object for type casting behavior on SQLite3
\| * \| \| \| \| \| \| \| \| \|	Use a type object for type casting behavior on SQLite3	Sean Griffin	2014-07-01	1	-13/+37
\| \| \|_\|_\|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Note: I'm not sure we actually need to be logging when this happens. This code would be a fair bit cleaner if we didn't need to log it.
* \| \| \| \| \| \| \| \| \|	Merge pull request #16028 from ↵	Rafael Mendonça França	2014-07-04	3	-1/+16
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	cade/fix_counter_cache_count_with_association_selects Add `:all` argument to `count` in `reset_counters` Conflicts: activerecord/CHANGELOG.md
\| * \| \| \| \| \| \| \| \| \|	Add `:all` argument to `count` in `reset_counters`	Cade Truitt	2014-07-02	3	-1/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prior to this fix, if an association had a scope with a `select`, calls to `reset_counters` would generate invalid SQL and throw: ActiveRecord::StatementInvalid: [$DB_ADAPTER]: wrong number of arguments to function COUNT() References #10710, #13648
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #16011 from xjlu/token_and_options	Rafael Mendonça França	2014-07-04	2	-3/+23
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve token_and_options regex and test
\| * \| \| \| \| \| \| \| \| \| \|	Improve token_and_options regex and test	Xinjiang Lu	2014-07-01	2	-3/+23
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	add a test case to test the regex for the helper method raw_params
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #16040 from seuros/patch-1	Matthew Draper	2014-07-05	1	-0/+1
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add arel to the controller template [ci skip]
\| * \| \| \| \| \| \| \| \| \| \| \|	Add arel to the controller template	Abdelkader Boudih	2014-07-03	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #14005 from dmitry/test_coverage_for_actionmailer	Rafael Mendonça França	2014-07-04	6	-38/+16
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add test coverage for the action mailer
\| * \| \| \| \| \| \| \| \| \| \| \| \|	add test coverage for the action mailer	Dmitry Polushkin	2014-07-04	6	-38/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #16042 from akshay-vishnoi/doc_change	Matthew Draper	2014-07-05	3	-5/+5
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|_\|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \|	[ci skip] /javascript/ -> JavaScript - cover whole app
\| * \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip] /javascript/ -> JavaScript - cover whole app	Akshay Vishnoi	2014-07-04	3	-5/+5
\| \| \|/ / / / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #16049 from matthewd/find-via-reload	Matthew Draper	2014-07-05	3	-0/+19
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	After find-via-reload, the record is not new
\| * \| \| \| \| \| \| \| \| \| \| \| \|	After find-via-reload, the record is not new	Matthew Draper	2014-07-05	3	-0/+19
\| \| \|/ / / / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #16046 from grosser/grosser/cleangen	Rafael Mendonça França	2014-07-04	1	-2/+1
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Do not load rails without loading bundler
\| * \| \| \| \| \| \| \| \| \| \| \| \|	remove bundler magic	grosser	2014-07-03	1	-2/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #16037 from sgrif/sg-money-quoting	Rafael Mendonça França	2014-07-04	3	-11/+28
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	Remove unneccessary special case for money in quoting
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Remove unneccessary special case for money in quoting	Sean Griffin	2014-07-03	3	-11/+28
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #16048 from arunagw/aa-added-notice-index-page	Rafael Mendonça França	2014-07-04	3	-1/+11
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	Display notice in index.html pages in scaffolded generated views
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Display notice in index.html pages in scaffolded generated views	Arun Agrawal	2014-07-04	3	-1/+11
\|/ / / / / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	As we are setting notice in destroy action we should display that For more information see https://github.com/rails/rails/pull/14044 And https://github.com/rails/jbuilder/pull/191 closes #14044
* \| \| / / / / / / / / / /	:fire: these are lambdas now [ci skip]	Godfrey Chan	2014-07-03	1	-9/+2
\| \|_\|/ / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This has changed since around 2b1500d6
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #16038 from tbpgr/fix_guide_active_record_validations	Rafael Mendonça França	2014-07-03	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix guide. sample code syntax error.[ci skip]
\| * \| \| \| \| \| \| \| \| \| \| \|	Fix guide. sample code syntax error.[ci skip]	tbpgr	2014-07-04	1	-1/+1
\| \|/ / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #16036 from sgrif/sg-datetime-infinity	Rafael Mendonça França	2014-07-03	3	-3/+46
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Do not rely on the column type when quoting infinity
\| * \| \| \| \| \| \| \| \| \| \| \|	Do not rely on the column type when quoting infinity	Sean Griffin	2014-07-03	3	-3/+46
\| \|/ / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #16034 from sgrif/sg-hstore-type-object	Rafael Mendonça França	2014-07-03	4	-66/+39
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \|	Use the type object for type casting HStore columns
\| * \| \| \| \| \| \| \| \| \| \|	Use the type object for type casting HStore columns	Sean Griffin	2014-07-03	4	-66/+39
\|/ / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #15941 from variousred/docrails-changes	Vijay Dev	2014-07-03	1	-8/+10
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \|	[ci skip] Changes some wording to better foreshadow what is coming up later
\| * \| \| \| \| \| \| \| \| \|	[ci skip] Changes some wording to better foreshadow what is coming up later.	Michael Mitchell	2014-07-02	1	-8/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This should prevent some anxiety readers may experience when the doc goes into something different than what it just explained. Also clarifies a statement about priority in engines and application environments [ci skip] fixes double `the` [ci skip] more clarifications [ci skip] changes from tics to quotes
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #16029 from cade/fix_typo_in_comment	Vijay Dev	2014-07-03	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \|	Fix typo in comment
\| * \| \| \| \| \| \| \| \| \|	Fix typo in comment	Cade Truitt	2014-07-02	1	-1/+1
\|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge pull request #16026 from lucasmazza/lm-respond-to-jsonp-fix	Rafael Mendonça França	2014-07-02	3	-1/+24
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change the JSON renderer to enforce the 'JS' Content Type
\| * \| \| \| \| \| \| \| \| \|	Change the JSON renderer to enforce the 'JS' Content Type	Lucas Mazza	2014-07-02	3	-1/+24
\| \| \|_\|_\|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The controller can set the response format as 'JSON' before the renderer code be evaluated, so we must replace it when necessary. Fixes #15081
* \| \| \| \| \| \| \| \| \|	Add CHANGELOG for c803b90	Godfrey Chan	2014-07-02	1	-0/+4
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	The hex escape sequence can be of any length	Godfrey Chan	2014-07-02	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Fix escape_once double-escaping hex-encoded entities	John F. Douthat	2014-07-02	3	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(This is a manual merge of #9102)