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

	Commit message (Collapse)	Author	Age	Files	Lines
...
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #16168 from greysteil/stash-path-info	Matthew Draper	2014-07-14	3	-2/+15
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Stash original path in `ShowExceptions` middleware
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	Stash original path in `ShowExceptions` middleware	Grey Baker	2014-07-14	3	-2/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	`ActionDispatch::ShowExceptions` overwrites `PATH_INFO` with the status code for the exception defined in `ExceptionWrapper`, so the path the user was visiting when an exception occurred was not previously available to any custom exceptions_app. The original `PATH_INFO` is now stashed in `env["action_dispatch.original_path"]`.
* \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #16167 from yahonda/ora972_faces	Matthew Draper	2014-07-14	3	-4/+5
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Address ORA-00972: identifier is too long when tested with Oracle
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	Address ORA-00972: identifier is too long when tested with Oracle	Yasuo Honda	2014-07-14	3	-4/+5
\|/ / / / / / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	by using shorter attribute names.
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #16127 from Envek/fix_16111	Matthew Draper	2014-07-14	3	-1/+32
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	Dump PostgreSQL primary key with custom function as a default.
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Dump PostgreSQL primary key with custom function as a default.	Andrey Novikov	2014-07-11	3	-1/+32
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	For example, if use pgcrypto extension in PostgreSQL 9.4 beta 1, where uuid-ossp extension isn't available for moment of writing, and thus to use a gen_random_uuid() method as a primary key default. In this case schema dumper wasn't able to correctly reconstruct create_table statement and lost primary key constraint on schema load. Fixes #16111.
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #16156 from mechanicles/document-improvement	Zachary Scott	2014-07-13	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip] Improve documentation consistency for ActiveModel::Errors
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip] Little bit doc code improvement.	Santosh Wadghule	2014-07-14	1	-1/+1
\| \| \|/ / / / / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Format pass on 4.2 release notes [ci skip]	Godfrey Chan	2014-07-13	1	-157/+163
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Leave two blank lines between sections/packages for readibility. * Always indent bullet points with four spaces. This allows multi-paragraph points to align properly (see #16103), and it is the same as the format we already use in CHANGELOGs. Doing this consistently sets an easy precedent for future contributors to follow. * Always put the PR/commit link on its own line in the source. If the bullet point spans multiple paragraphs, put it on its own paragraph at the end. [Godfrey Chan & Juanito Fatas]
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #16155 from mechanicles/fix-typos	Zachary Scott	2014-07-13	3	-4/+4
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip] Fix typos like `a html` to `an html` and 'an mail' to 'an email'.
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Fix typos like `a html` to `an html` and 'an mail' to 'an email'. [ci skip]	Santosh Wadghule	2014-07-14	3	-4/+4
\|/ / / / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #16150 from sferik/fix-tests	Matthew Draper	2014-07-13	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix tests broken in #16149
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Fix tests broken in https://github.com/rails/rails/pull/16149	Erik Michaels-Ober	2014-07-12	1	-1/+1
\|/ / / / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #16149 from sferik/refactor-transform_values	Guillermo Iguaran	2014-07-12	4	-2/+50
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \|	Refactor Hash#transform_values and Hash#transform_values!
\| * \| \| \| \| \| \| \| \| \| \| \|	Return an Enumerator if no block is given	Erik Michaels-Ober	2014-07-12	4	-1/+49
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Don't construct a Proc if no block is given	Erik Michaels-Ober	2014-07-12	1	-1/+1
\|/ / / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #16147 from seuros/templates	Matthew Draper	2014-07-12	2	-0/+2
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[Bug report templates] Added rack master to the Gemfile [ci skip]
\| * \| \| \| \| \| \| \| \| \| \| \|	[Bug report templates] Added rack master to the Gemfile	Abdelkader Boudih	2014-07-12	2	-0/+2
\|/ / / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'master' of github.com:rails/docrails	Vijay Dev	2014-07-12	1	-113/+93
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: activerecord/lib/active_record/base.rb
\| * \| \| \| \| \| \| \| \| \| \| \|	fix mismatched example call [ci skip]	Vijay Dev	2014-07-12	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Revert "[ci skip] Fix doc for except"	Vijay Dev	2014-07-12	1	-4/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 0f6b101e09d210cea2494c5d4225760f1951ea67. Reason: It's better to let `unscope` be documented. We can add a separate section for `except`.
\| * \| \| \| \| \| \| \| \| \| \| \|	Prefer find_by over where.first for record	Gaurish Sharma	2014-07-07	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	[ci skip] remove invalid code from docs	schneems	2014-06-28	1	-2/+0
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	[ci skip] Fix doc for except	schneems	2014-06-28	1	-5/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The example showed is `except`, however the method "documented" is `unstop`. Fix to align the docs to the example.
\| * \| \| \| \| \| \| \| \| \| \| \|	[ci skip] Doc ability to chain in `find_each`	schneems	2014-06-28	1	-1/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also use appropriate mailer syntax in the `find_each` block.
\| * \| \| \| \| \| \| \| \| \| \| \|	[ci skip] Consolidate docs for `find`	schneems	2014-06-28	1	-25/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Put all options for overloading `find` in one section
\| * \| \| \| \| \| \| \| \| \| \| \|	[ci skip] Consolidate docs for `last`	schneems	2014-06-28	1	-16/+21
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add docs on what happens when a numerical argument is provided to last. Since `last!` behaves exactly the same way but can raise an argument we can consolidate it in the `last` section.
\| * \| \| \| \| \| \| \| \| \| \| \|	[ci skip] Consolidate docs for `take`	schneems	2014-06-28	1	-35/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add docs on what happens when a numerical argument is provided to take. Since `take!` behaves exactly the same way but can raise an argument we can consolidate it in the `take` section.
\| * \| \| \| \| \| \| \| \| \| \| \|	[ci skip] Consolidate docs for `find_by`	schneems	2014-06-28	1	-19/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Since `find_by!` behaves exactly the same way but can raise an argument we can consolidate it in the `find_by` section.
\| * \| \| \| \| \| \| \| \| \| \| \|	[ci skip] Consolidate docs for `first`	schneems	2014-06-28	1	-35/+21
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add docs for `first` when provided a numerical argument. Since `first!` behaves exactly the same way but can raise an argument we can consolidate it in the `first` section.
\| * \| \| \| \| \| \| \| \| \| \| \|	[ci skip] Add return values to examples	schneems	2014-06-28	1	-1/+10
\| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	Assert the nature of the original exception	Matthew Draper	2014-07-12	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Just so it's clearer what's going on in the following assertion. /cc #11993 @robin850
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #16143 from robin850/silence-downloading-output	Rafael Mendonça França	2014-07-11	1	-1/+0
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Silence Downloader's output
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Silence the output downloading a file	Robin Dupret	2014-07-11	1	-1/+0
\| \| \|_\|_\|/ / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This output isn't used anywhere for assertions so we can simply remove it. The introducing commit was f238d495.
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #16144 from grekko/patch-1	Richard Schneeman	2014-07-11	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixing typo in comment
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Fixing typo in comment	Gregory Igelmund	2014-07-12	1	-1/+1
\|/ / / / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #11993 from razielgn/actionview-use-name-to-inspect-error	Guillermo Iguaran	2014-07-11	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \|	Use NameError#name to assert raised error.
\| * \| \| \| \| \| \| \| \| \| \| \|	Use NameError#name to assert raised error.	Federico Ravasio	2013-11-24	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This makes the test compatible with other Ruby implementations, which may implement error messages differently.
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #16136 from sgrif/sg-pg-bit-string	Matthew Draper	2014-07-12	2	-13/+33
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't rely on the column SQL type for bit string quoting
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Don't rely on the column SQL type for bit string quoting	Sean Griffin	2014-07-11	2	-13/+33
\| \| \|_\|_\|_\|_\|/ / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #16055 from sgrif/sg-refactor-sqlite3-strings	Matthew Draper	2014-07-12	2	-14/+29
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \|	Use a type object for type casting behavior on SQLite3
\| * \| \| \| \| \| \| \| \| \| \| \|	Use a type object for type casting behavior on SQLite3	Sean Griffin	2014-07-11	2	-14/+29
\| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #16135 from mgoldWork/validator-guide-sentence-break	Xavier Noria	2014-07-11	1	-2/+2
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[Guides] Sentence break for clarity [ci-skip]
\| * \| \| \| \| \| \| \| \| \| \| \| \|	[Guides] Sentence break for clarity [ci-skip]	Max Goldstein	2014-07-11	1	-2/+2
\|/ / / / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #16132 from tgxworld/fix_test_not_unsubscribing	Santiago Pastorino	2014-07-11	1	-2/+2
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix incorrect unsubscription.
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Fix incorrect unsubscription.	Guo Xiang Tan	2014-07-11	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #16133 from Agis-/cookie_overflow_check	Santiago Pastorino	2014-07-11	2	-2/+7
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use `#bytesize` instead of `#size` when checking for cookie overflow
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	Use `#bytesize` instead of `#size` when checking for cookie overflow	Agis-	2014-07-11	2	-2/+7
\|/ / / / / / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Although the cookie values happens to be ASCII strings because they are Base64 encoded, it is semantically incorrect to check for the number of the characters in the cookie, when we actually want to check for the number of the bytes it consists of. Furthermore it is unecessary coupling with the current implementation that uses Base64 for encoding the values.
* / / / / / / / / / / / / /	Synced 4.2 release notes with the latest commits.	Godfrey Chan	2014-07-11	5	-30/+85
\|/ / / / / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also reordered some of the items to put newer ones on top (same order as CHANGELOGs), which makes it easier to diff while we are still working on it.
* \| \| \| \| \| \| \| \| \| \| \| \|	Fixed borken tests in AV caused by 013c74d	Godfrey Chan	2014-07-10	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \|