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

	Commit message (Collapse)	Author	Age	Files	Lines
...
* \| \|	Merge pull request #19753 from jonatack/use-ruby-2-2-2	Guillermo Iguaran	2015-04-13	2	-3/+3
\|\ \ \ \| \| \| \| \| \| \| \|	Upgrade to Ruby 2.2.2
\| * \| \|	Upgrade to Ruby 2.2.2	Jon Atack	2015-04-14	2	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	and fix the grammar in the ruby_version_check.rb user message.
* \| \| \|	Merge branch 'master' of github.com:rails/docrails	Vijay Dev	2015-04-14	5	-46/+32
\|\ \ \ \
\| * \| \| \|	[ci skip] add missing file extension	Mikhail Dieterle	2015-04-10	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	[ci skip] format rake output	Mikhail Dieterle	2015-04-10	1	-5/+3
\| \| \| \| \|
\| * \| \| \|	[ci skip] fix helper name	Mikhail Dieterle	2015-04-10	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	[ci skip] Wrap with double quotation	yui-knk	2015-04-10	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	[ci skip] Remove unnecessary lines	yui-knk	2015-04-01	1	-2/+0
\| \| \| \| \|
\| * \| \| \|	[ci skip] Add `:`	yui-knk	2015-04-01	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	No need to mention unit tests in testing guide anymore	Kir Shatrov	2015-03-31	1	-2/+0
\| \| \| \| \|
\| * \| \| \|	New test runner syntax in testing guide	Kir Shatrov	2015-03-31	1	-4/+4
\| \| \| \| \|
\| * \| \| \|	Suggest new hash syntax in testing guide	Kir Shatrov	2015-03-31	1	-2/+2
\| \| \| \| \|
\| * \| \| \|	Don't suggest `bin/rails test controllers`	Kir Shatrov	2015-03-31	1	-1/+0
\| \| \| \| \|
\| * \| \| \|	Add missing "of" to testing guide.	Hendy Tanata	2015-03-30	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Merge branch 'kirs'	Matthew Draper	2015-03-30	1	-30/+23
\| \|\ \ \ \
\| \| * \| \| \|	Switch to `bin/rails test` in testing guide	Kir Shatrov	2015-03-30	1	-30/+23
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	rails/rails#18305
* \| \| \| \| \|	Merge pull request #19742 from vngrs/config_autoload_paths_wrong_doc	Carlos Antonio da Silva	2015-04-13	1	-3/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix the wrong documentation about config.autoload_paths [ci skip]
\| * \| \| \| \| \|	Fix the wrong documentation about config.autoload_paths [ci skip]	Mehmet Emin İNAÇ	2015-04-13	1	-3/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	config.autoload_paths is not changeable from environment specific configuration files.
* \| \| \| \| \| \|	Improve note about unique index and foreign key on has_one association	Carlos Antonio da Silva	2015-04-13	1	-6/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Related to f1af967e0055a33c45071848a049ff342e9c291e. [ci skip]
* \| \| \| \| \| \|	Add note wrt foreign key constraint to ensure data integrity	Zachary Scott	2015-04-12	1	-0/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Thanks for patch @sgrif :trollface: Closes #18216
* \| \| \| \| \| \|	Apply comments from @rafaelfranca: we shouldn't recommend you use scaffold css	Zachary Scott	2015-04-12	1	-9/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #19492 and fixes #19453
* \| \| \| \| \| \|	Merge pull request #19564 from jonatack/counter_cache_docs	Zachary Scott	2015-04-12	1	-3/+11
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[skip ci] Fix counter_cache in the Rails Guides
\| * \| \| \| \| \| \|	[skip ci] Fix counter_cache in the Rails Guides	Jon Atack	2015-03-28	1	-3/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In the AR Associations Guide, this PR fixes: - The counter_cache declaration is now shown only in the `belongs_to` association. - The docs stated that the counter_cache declaration needs to be on the `has_many` side; now corrected to the `belongs_to` side. - Split the custom column explanation out to a separate paragraph. - Simplify the NOTE because it is true both with and without a custom column name.
* \| \| \| \| \| \| \|	Some copy edits for modifying View Paths [ci skip]	Zachary Scott	2015-04-12	1	-5/+21
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'view_paths' of https://github.com/nishantmodak/rails into ↵	Zachary Scott	2015-04-12	1	-1/+17
\|\ \ \ \ \ \ \ \ \| \|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	nishantmodak-view_paths
\| * \| \| \| \| \| \|	view paths docs [ci skip]	Nishant Modak	2015-04-13	1	-1/+17
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #19732 from wazery/patch-2	Kasper Timm Hansen	2015-04-12	1	-2/+2
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip] Update contributing guide
\| * \| \| \| \| \| \| \|	[ci skip] Update contributing guide	Islam Wazery	2015-04-12	1	-2/+2
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Fix a few typos and wrap some lines [ci skip]	Robin Dupret	2015-04-12	1	-3/+4
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	remove reference to `register_javascript_expansion` and ↵	yuuji.yaginuma	2015-04-12	1	-26/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	`register_stylesheet_expansion` from guide [ci skip] These methods no longer exists.
* \| \| \| \| \| \| \| \|	Remove mention of super old defined_javascript_functions method [ci skip]	Carlos Antonio da Silva	2015-04-11	1	-4/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	It was removed long ago: e358b1fce8fdcbac896dde08286be020420e843e.
* \| \| \| \| \| \| \| \|	Rename railties/bin to railties/exe	Islam Wazery	2015-04-11	1	-2/+2
\|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	That will match the new Bundler executables convention. Bundler Blog Post: http://bundler.io/blog/2015/03/20/moving-bins-to-exe.html Also updated the necessary tests.
* \| \| \| \| \| \| \|	[ci skip] Remove `link_to_function` and `button_from_function` from guides	eileencodes	2015-04-11	1	-21/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	These methods were removed in cb9f7f4 and are no longer methods in the Rails codebase.
* \| \| \| \| \| \| \|	[skip ci] primay_key -> primary_key	Jon Atack	2015-04-11	1	-1/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Copy edits for primary_key documentation in association guide. [ci skip]	Zachary Scott	2015-04-10	1	-3/+4
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'belongs_to_primary_key_doc' of ↵	Zachary Scott	2015-04-10	1	-0/+19
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://github.com/girishso/rails into girishso-belongs_to_primary_key_doc
\| * \| \| \| \| \| \| \|	added primary_key option documentation for belongs_to association	Girish S	2014-09-23	1	-0/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fixes issue #16698
* \| \| \| \| \| \| \| \|	[ci skip] Downcases filter names	yui-knk	2015-04-10	1	-3/+3
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Add Active Job to Configuring Guide [ci skip]	Eliot Sykes	2015-04-09	1	-0/+56
\| \|/ / / / / / / \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Fix URL rails-framework-hooks	Nishant Modak	2015-04-07	1	-1/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	correct the directory which rake notes look by default [ci skip]	yuuji.yaginuma	2015-04-06	1	-1/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	[ci skip] Remove Extensions to `Proc` chapter section	yui-knk	2015-04-06	1	-47/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	`Proc#bind` is removed with 4.1 release
* \| \| \| \| \| \| \|	Update command_tasks source code	Szymon Madeja	2015-04-05	1	-1/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Fix a few typos [ci skip]	Robin Dupret	2015-04-05	1	-5/+7
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #19644 from y-yagi/auto_discovery_link_tag_doc	Yves Senn	2015-04-05	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	correct output of auto_discovery_link_tag [ci skip]
\| * \| \| \| \| \| \| \|	correct output of auto_discovery_link_tag [ci skip]	yuuji.yaginuma	2015-04-04	1	-1/+1
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	change REQUEST_URI to PATH_INFO	Mehmet Emin İNAÇ	2015-04-04	1	-1/+1
\|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	request.env['REQUEST_URI'] returns full URI of the resource request.env['PATH_INFO'] returns only path of the resource
* \| \| \| \| \| \| \|	[ci skip] Replace `reraised` with `not captured`	yui-knk	2015-04-02	1	-1/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	[ci skip] fix guides example on arbitrary SQL execution	Konstantinos Rousis	2015-04-01	1	-1/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	[ci skip] Fix `:having` option with `having` method	yui-knk	2015-04-01	1	-1/+1
\| \| \| \| \| \| \| \|