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

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| * \| \| \|	Merge remote-tracking branch 'origin/master' into guides-template-inheritance	ecoologic	2014-10-07	16	-71/+522
\| \|\ \ \ \
\| * \| \| \| \|	2.2.14.5 Template Inheritance (new in guide, feature in since 3.1)	erik	2014-08-29	1	-0/+36
\| \| \| \| \| \|
* \| \| \| \| \|	fix bug in Levenshtein distance calculation	schneems	2015-02-25	1	-2/+0
\| \|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bug was discovered and discussed in #18395.
* \| \| \| \|	Tiny documentation edits [ci skip]	Robin Dupret	2015-02-24	1	-1/+2
\| \| \| \| \|
* \| \| \| \|	[ci skip] Fix `Object-Relational` to `Object Relational`	yui-knk	2015-02-24	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Require `belongs_to` by default.	Josef Šimánek	2015-02-21	2	-0/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Deprecate `required` option in favor of `optional` for belongs_to.
* \| \| \| \|	Minor guides edits [ci skip]	Robin Dupret	2015-02-21	2	-24/+23
\| \| \| \| \|
* \| \| \| \|	Improve wording on find_by note regarding returning only one record [ci skip]	Konstantinos Rousis	2015-02-21	1	-2/+3
\| \| \| \| \|
* \| \| \| \|	[ci skip] Use explicit module namespace in guide	Kasper Timm Hansen	2015-02-21	1	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The Engines guide used an inline namespace, `Blorgh::ApplicationController`, which caused problems for users using an explicit module namespace because the `ApplicationController` inherited from wasn't fully qualified. The controller qualification was fixed in 661479324d573d419d8e15a1ea257e01856084af. This ditches the inline namespace and makes the example more consistent with others in the guide.
* \| \| \| \|	guides, fully qualify `ApplicationController`. Closes #19024.	Yves Senn	2015-02-21	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Oops :bomb:	Rafael Mendonça França	2015-02-20	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Change the deprecation messages to show the preferred way to work with	Rafael Mendonça França	2015-02-20	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ActiveModel::Errors
* \| \| \| \|	Prefer request_id over uuid and test the alias	Rafael Mendonça França	2015-02-20	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Use sentence case for consistency in comments	Marcel Morgan	2015-02-20	1	-5/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \|	use `messages` instead of deprecated `ActiveModel::Errors#[]=` method [ci skip]	yuuji.yaginuma	2015-02-20	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Fix code sample for custom exception handler [ci skip]	Bart	2015-02-19	1	-2/+2
\| \| \| \| \|
* \| \| \| \|	Merge pull request #18411 from todd/extract_record_tag_helper	Rafael Mendonça França	2015-02-18	1	-77/+0
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Remove RecordTagHelper
\| * \| \| \| \|	Remove RecordTagHelper, add extraction notices	Todd Bealmear	2015-02-16	1	-77/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Per DHH in #18337, ActionView::Helpers::RecordTagHelper has been extracted to an external gem (source currently lives at todd/record_tag_helper). Removal notices have also been added for anyone upgrading that use the extracted methods.
* \| \| \| \| \|	Merge pull request #15700 from maurogeorge/guides-local_assigns	Rafael Mendonça França	2015-02-18	1	-0/+30
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add docs about local_assigns on guides
\| * \| \| \| \| \|	Add docs about local_assigns on guides	Mauro George	2014-06-13	1	-0/+30
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \| \|	Talk about Gemfile.lock in the contributing guide	Rafael Mendonça França	2015-02-18	1	-3/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \| \|	Merge pull request #18984 from rousisk/master	Carlos Antonio da Silva	2015-02-18	1	-3/+2
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replace deprecated readonly option with scope blocks in docs and guide
\| * \| \| \| \| \| \|	Replace deprecated readonly option with scope blocks in docs and guide	Konstantinos Rousis	2015-02-18	1	-3/+2
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	constants guide: adds a step to a resolution algorithm	Xavier Noria	2015-02-18	1	-1/+3
\|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Not sure how this one slipped, maybe deleted by accident while editing or something. Anyway, fixed.
* \| \| \| \| \| \|	fix type in guide - missing word	Nicolas Maloeuvre	2015-02-18	1	-1/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #18843 from yuki24/guides-add-guide-for-mail-preview	Zachary Scott	2015-02-17	1	-0/+33
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add guide for Action Mailer Previews
\| * \| \| \| \| \| \|	Add guide for Action Mailer Previews	Yuki Nishijima	2015-02-08	1	-0/+33
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \| \| \|	Merge pull request #18961 from vipulnsward/deprecate-start-value	Yves Senn	2015-02-17	1	-9/+9
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Deprecated passing of `start` value to `find_in_batches` and `find_each`
\| * \| \| \| \| \| \| \|	Deprecated passing of `start` value to `find_in_batches` and `find_each` in ↵	Vipul A M	2015-02-17	1	-9/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	favour of `begin_at` value.
* \| \| \| \| \| \| \| \|	Revert c732a66:	Zachary Scott	2015-02-16	1	-0/+4
\|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* "rm docs for dependency_loading and disable_dependency_loading config" It was added back in a71350cae0082193ad8c66d65ab62e8bb0b7853b by @tenderlove See also #13142
* \| \| \| \| \| \| \|	Merge pull request #18960 from ctaintor/remove_dependency_doc	Zachary Scott	2015-02-16	1	-4/+0
\|\ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / \|/\| \| \| \| \| \| \|	removes documentation that is no longer relevant
\| * \| \| \| \| \| \|	removes docs for dependency_loading config option and ↵	Case Taintor	2015-02-16	1	-4/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	disable_dependency_loading initializer because it was removed by commit a8bf12979e5fa15282b39c8cfa315e663f613539
* \| \| \| \| \| \| \|	Merge pull request #18485 from andreynering/robots.txt	Zachary Scott	2015-02-16	2	-0/+22
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adding 'Search Engines Indexing' Section [ci skip]
\| * \| \| \| \| \| \| \|	Adding 'Search Engines Indexing' Section [ci skip]	Andrey Nering	2015-01-14	2	-0/+22
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #18679 from adipra3n/master	Zachary Scott	2015-02-16	1	-0/+52
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add web console in debugging rails applications guide [ci skip]
\| * \| \| \| \| \| \| \| \|	document web console in debugging guide [ci skip]	Adi Pradhan	2015-01-26	1	-0/+52
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	document web console in debugging guide [ci skip] document web console in debugging guide [ci skip]
* \| \| \| \| \| \| \| \| \|	Merge pull request #18815 from tmingos/patch-1	Zachary Scott	2015-02-16	1	-3/+2
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Correct pluralization error
\| * \| \| \| \| \| \| \| \| \|	Edit text on optional db constraints for uniqueness validations [ci skip]	Taylor Mingos	2015-02-04	1	-3/+2
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Improving remote forms guides [ci skip]	Andrey Nering	2015-02-16	1	-0/+28
\| \|_\|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Tiny documentation edits [ci skip]	Robin Dupret	2015-02-15	4	-28/+32
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	fix syntax error in render partial example [ci skip]	yuuji.yaginuma	2015-02-15	1	-2/+2
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge pull request #18938 from tchandy/updating_query_tracer_link	Arthur Nogueira Neves	2015-02-14	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updating Query Tracer github repository
\| * \| \| \| \| \| \| \| \| \|	Updating Query Tracer github repository	Thiago Pradi	2015-02-14	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'master' of github.com:rails/docrails	Vijay Dev	2015-02-14	1	-6/+6
\|\ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	[ci skip] Add some more code highlights.	Juanito Fatas	2015-02-10	1	-5/+5
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	[ci skip] Add a missing space in t.belongs_to argument.	Juanito Fatas	2015-01-29	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	[ci skip] escape under score	yui-knk	2015-02-13	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #18844 from ↵	Zachary Scott	2015-02-12	1	-0/+15
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	yuki24/guides-add-render-example-without-partial-and-locals Add tip for skipping `partial` and `locals` options for `render`
\| * \| \| \| \| \| \| \| \| \| \|	Add tip for skipping `partial` and `locals` options for `render`	Yuki Nishijima	2015-02-08	1	-0/+15
\| \| \|_\|_\|_\|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \| \| \| \| \| \|	guides, various testing guide changes. [ci skip]	Yves Senn	2015-02-11	1	-7/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	/cc @zzak