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

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| * \|	Fix a bug where AR::RecordNotSaved loses error messages	Yuki Nishijima	2014-11-27	5	-12/+31
\| \|/ \| \| \| \| \| \| \| \| \| \|	Since 3e30c5d, it started ignoring the given error message. This commit changes the behavior of AR::RecordNotSaved#initialize so that it no longer loses the given error message.
* \|	Merge pull request #17809 from iainbeeston/remove_ecosystem_from_guides	Xavier Noria	2014-11-28	0	-0/+0
\|\ \ \| \| \| \| \| \|	Remove ecosystem link from guides
\| * \|	Removed ecosystem link from the header of the guides pages	Iain Beeston	2014-11-28	1	-1/+0
\| \| \|
* \| \|	Merge pull request #17798 from kamipo/refactor_visit_add_column	Yves Senn	2014-11-28	2	-9/+1
\|\ \ \ \| \| \| \| \| \| \| \|	Refactor `SchemaCreation#visit_AddColumn`
\| * \| \|	Refactor `SchemaCreation#visit_AddColumn`	Ryuta Kamizono	2014-11-27	2	-9/+1
\| \| \| \|
* \| \| \|	docs, AR no longer makes use of `test:prepare`. [ci skip]	Yves Senn	2014-11-28	1	-1/+2
\| \|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change originated from https://github.com/rails/rails/pull/17739#issuecomment-64829088 /cc @metaskills
* \| \|	Merge pull request #17807 from jvperrin/correct-integer-test	Rafael Mendonça França	2014-11-27	1	-1/+1
\|\ \ \ \| \| \| \| \| \| \| \|	Correct test description for large integer test
\| * \| \|	Correct test description for large integer test	Jason Perrin	2014-11-03	1	-1/+1
\| \| \| \|
* \| \| \|	release notes: edit pass [ci skip]	Xavier Noria	2014-11-27	1	-19/+17
\| \| \| \|
* \| \| \|	release notes: iteration over the description of Global ID [ci skip]	Xavier Noria	2014-11-27	1	-4/+14
\| \| \| \|
* \| \| \|	Bump to rack 1.6.0.beta2	Santiago Pastorino	2014-11-27	1	-1/+1
\| \| \| \|
* \| \| \|	Revert "Test against rack master"	Santiago Pastorino	2014-11-27	2	-4/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 2a4e14db981e38611667d407a975600ee720ada7.
* \| \| \|	Merge pull request #17803 from sadfuzzy/patch-2	Abdelkader Boudih	2014-11-27	1	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update cookies.rb Conflicts: actionpack/lib/action_dispatch/middleware/cookies.rb
* \| \| \|	Merge pull request #17802 from aar0nTw/remove-dependent-with-through-note	Rafael Mendonça França	2014-11-27	1	-2/+0
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	[ci skip] Remove outdate note of :dependent in guide
\| * \| \| \|	[ci skip] Remove outdate note of :dependent	Aaron Huang	2014-11-28	1	-2/+0
\|/ / / /
* \| \| \|	Merge pull request #17801 from jonatack/patch-8	Rafael Mendonça França	2014-11-27	1	-2/+2
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Clarification follow-up to e2cce6c [ci skip]
\| * \| \| \|	Follow-up to e2cce6c	Jon Atack	2014-11-27	1	-2/+2
\|/ / / / \| \| \| \| \| \| \| \|	[skip ci]
* \| \| \|	Fix CHANGELOG typo introduced in e2cce6cd [ci skip]	Zachary Scott	2014-11-27	1	-1/+1
\| \| \| \|
* \| \| \|	Merge pull request #17800 from jonatack/patch-8	Zachary Scott	2014-11-27	1	-22/+21
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Action Mailer change log pass [ci skip]
\| * \| \| \|	Action Mailer change log pass	Jon Atack	2014-11-27	1	-22/+21
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[skip ci]
* \| \| \| \|	Update the StatementCache documentation	Rafael Mendonça França	2014-11-27	1	-4/+15
\|/ / / /
* \| \| \|	StatementCache is private API	Rafael Mendonça França	2014-11-27	1	-6/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	It should not be used in applications
* \| \| \|	updates some pointers in the guides welcome section [ci skip]	Xavier Noria	2014-11-27	1	-1/+1
\| \|/ / \|/\| \|
* \| \|	rails -> bin/rails in index.html	Xavier Noria	2014-11-27	1	-1/+1
\| \| \|
* \| \|	removes double mention of deliver_now	Xavier Noria	2014-11-27	1	-4/+0
\| \| \|
* \| \|	edits in the release notes for 4.2	Xavier Noria	2014-11-27	1	-12/+22
\| \| \|
* \| \|	Merge pull request #17796 from leafac/fix-format	Yves Senn	2014-11-27	1	-1/+9
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Fix format "Form Helpers" guide
\| * \| \|	Fix format "Form Helpers" guide	Leandro Facchinetti	2014-11-26	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The `"_tag"` was interpreted as the start of a italics.
* \| \| \|	Merge pull request #17794 from zavan/fix-typo	Godfrey Chan	2014-11-26	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Fix typo in Rails 4.2 release notes
\| * \| \| \|	Fix typo in Rails 4.2 release notes	Felipe Zavan	2014-11-27	1	-1/+1
\|/ / / /
* \| \| \|	pass over the release notes	Xavier Noria	2014-11-27	1	-104/+118
\| \| \| \|
* \| \| \|	Test against rack master	Rafael Mendonça França	2014-11-26	2	-2/+4
\| \| \| \|
* \| \| \|	Merge pull request #17691 from nickveys/from-json-docs	Rafael Mendonça França	2014-11-26	1	-4/+4
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Documentation regression in JSON#from_json
\| * \| \| \|	Fixing documentation in JSON#from_json	Nick Veys	2014-11-20	1	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Commit d67b289 introduced a tiny regression in the docs for #from_json, true needs to be included when the root node is present.
* \| \| \| \|	Merge pull request #17186 from tgxworld/header_authentication_token	Matthew Draper	2014-11-27	3	-4/+37
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow authentication header to not have to specify 'token=' key.
\| * \| \| \| \|	Allow authentication header to not have to specify 'token=' key.	Guo Xiang Tan	2014-10-10	2	-4/+30
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes: https://github.com/rails/rails/issues/17108.
* \| \| \| \| \|	Merge pull request #17786 from recursive-madman/activerecord-errors-codestyle	Rafael Mendonça França	2014-11-26	2	-3/+6
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Code style changes for various activerecord errors
\| * \| \| \| \| \|	various error classes: added newlines & removed :nodoc: flag from public ↵	Recursive Madman	2014-11-26	2	-3/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	attribute.
* \| \| \| \| \| \|	Merge pull request #17761 from pschrammel/master	Yves Senn	2014-11-26	1	-1/+1
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	be more general with adapter name
\| * \| \| \| \| \|	be more general with adapter name	Peter Schrammel	2014-11-25	1	-1/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #17674 from recursive-madman/activerecord-error-improvement	Rafael Mendonça França	2014-11-26	3	-4/+25
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add #record attribute to RecordNotFound and RecordDestroyed exceptions.
\| * \| \| \| \| \| \|	Add #record attribute to RecordNotFound and RecordDestroyed exceptions.	Recursive Madman	2014-11-26	3	-4/+25
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This allows these exceptions to be handled generically in conjunction with RecordInvalid.
* \| \| \| \| \| \| \|	Merge pull request #17782 from cheba/engine-root-master	Rafael Mendonça França	2014-11-26	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use absolute_path of caller_locations to infer engine root
\| * \| \| \| \| \| \| \|	Use absolute_path of caller_locations to infer engine root	Alexander Mankuta	2014-11-26	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	According to documentation `path` only returns file names. On MRI it's not the case but it's likely a bug in MRI.
* \| \| \| \| \| \| \| \|	Merge pull request #17781 from jonatack/patch-8	Rafael Mendonça França	2014-11-26	1	-38/+40
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Active Record change log pass [skip ci]
\| * \| \| \| \| \| \| \| \|	Active Record change log pass [skip ci]	Jon Atack	2014-11-26	1	-38/+40
\| \|/ / / / / / / /
* \| \| \| \| \| \| \| \|	Merge pull request #17785 from jipumarino/dbconsole-for-sqlserver	Rafael Mendonça França	2014-11-26	1	-0/+15
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Provide support for SQL Server connections with dbconsole using sqsh
\| * \| \| \| \| \| \| \| \|	Provide support for SQL Server connections with dbconsole using sqsh	Juan Ignacio Pumarino	2014-11-26	1	-0/+15
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge pull request #17784 from bruno-/refactor-nested-ifs	Rafael Mendonça França	2014-11-26	1	-5/+3
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \|	Refactor nested if
\| * \| \| \| \| \| \| \|	Refactor nested if	Bruno Sutic	2014-11-26	1	-5/+3
\|/ / / / / / / /