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

	Commit message (Collapse)	Author	Age	Files	Lines
...
* \| \| \| \| \| \|	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]
* \| \| \| \| \| \| \|	Merge pull request #19741 from greysteil/add-note-about-partial-index-support	Yves Senn	2015-04-13	1	-0/+2
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Document that partial indexes are only supported by Postgres and SQLite.
\| * \| \| \| \| \| \| \|	Document that partial indexes are only supported by Postgres and SQLite.	Grey Baker	2015-04-13	2	-0/+8
\|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #18106
* \| \| \| \| \| \| \|	Merge branch 'feature/doc_request_forgery_protection_for_api'	Zachary Scott	2015-04-12	1	-7/+17
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Add note regarding CSRF for APIs, as a use-case for skipping it [ci skip]	Zachary Scott	2015-04-12	1	-0/+4
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Apply comments from @jeremy regarding why HTML and Javascript requests	Zachary Scott	2015-04-12	1	-0/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	specifically are checked for CSRF, when dealing with the browser. [ci skip]
\| * \| \| \| \| \| \| \|	update request_forgery_protection docs [ci skip]	Vladimir Lyzo	2015-04-12	1	-7/+8
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Add a note regarding add_column restricted API [ci skip]	Zachary Scott	2015-04-12	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We should document current behavior, and this is design of API for now. Closes #17597
* \| \| \| \| \| \| \|	Merge branch 'master' of github.com:rails/rails	Zachary Scott	2015-04-12	3	-31/+3
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Revert "Merge pull request #19682 from ↵	Santiago Pastorino	2015-04-12	3	-31/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	supercaracal/fix_force_ssl_redirection_flash_error" This reverts commit d215620340be7cb29e2aa87aab22da5ec9e6e6a7, reversing changes made to bbbbfe1ac02162ecb5e9a7b560134a3221f129f3.
* \| \| \| \| \| \| \| \|	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 edits from @senny to close #19397 [ci skip]	Zachary Scott	2015-04-12	1	-4/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	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 branch 'patch-1'	Zachary Scott	2015-04-12	1	-3/+5
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Enhance documentation of pluck with a hint to ids [ci skip]	wingfire	2015-04-12	1	-3/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Documentation is giving an example that can be replaced by a more dry command. Give a hint that ids can be used instead of pluck(:id).
* \| \| \| \| \| \| \| \|	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.
* \| \| \| \| \| \| \| \| \|	Fix (intermittent?) test failure	Matthew Draper	2015-04-13	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We don't actually need to enumerate the possible types here any more; that dates back to before e105e599e706780905d4c348394da989de3b200f, when they were symbols, and indistinguishable from other options.
* \| \| \| \| \| \| \| \| \|	Merge pull request #19738 from ojab/squish	Xavier Noria	2015-04-12	1	-2/+1
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Speedup String#squish
\| * \| \| \| \| \| \| \| \| \|	Speedup String#squish	ojab	2015-04-12	1	-2/+1
\| \| \|_\|/ / / / / / / \| \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'nishantmodak-view_paths'	Zachary Scott	2015-04-12	1	-1/+33
\|\ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \|	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 branch 'mfazekas-action-mailer-async-doc-fixes'	Zachary Scott	2015-04-12	1	-8/+11
\|\ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \|	Since the delegator wasn't identified earlier, we should here [ci skip]	Zachary Scott	2015-04-12	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Merge branch 'action-mailer-async-doc-fixes' of ↵	Zachary Scott	2015-04-12	1	-8/+11
\|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://github.com/mfazekas/rails into mfazekas-action-mailer-async-doc-fixes Conflicts: actionmailer/lib/action_mailer/base.rb
\| * \| \| \| \| \| \| \| \| \| \|	Fixes to inaccurate documentation in action_mailer [ci skip]	Miklos Fazkeas	2014-12-18	1	-8/+11
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	:scissors:	Zachary Scott	2015-04-12	1	-2/+2
\| \|_\|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #19735 from Dan-Burnette/fixSecretKeyBaseErrorMessage	Godfrey Chan	2015-04-12	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \|	Error message no longer tells you to set the (deprecated) secret_token.
\| * \| \| \| \| \| \| \| \| \|	Error message no longer tells you to set the (deprecated) secret_token.	Dan	2015-04-12	1	-1/+1
\|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \|	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	2	-12/+21
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #19734 from y-yagi/action_view_guide	Yves Senn	2015-04-12	1	-26/+0
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	remove reference to `register_javascript_expansion` and `register_stylesheet_expansion` from guide [ci skip]
\| * \| \| \| \| \| \| \| \| \| \|	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.
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #19733 from yuki24/speed-up-levenshtein	Richard Schneeman	2015-04-11	2	-4/+10
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Speed up Levenshtein by 50% and reduce 97% of memory usage
\| * \| \| \| \| \| \| \| \| \| \|	Speed up Levenshtein by 50% and reduce 97% of memory usage	Yuki Nishijima	2015-04-11	2	-4/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Calculating ------------------------------------- each_char 924.000 i/100ms each_codepoint 1.381k i/100ms ------------------------------------------------- each_char 9.320k (¡Þ 5.1%) i/s - 47.124k each_codepoint 13.857k (¡Þ 3.6%) i/s - 70.431k Comparison: each_codepoint: 13857.4 i/s each_char: 9319.5 i/s - 1.49x slower The full report can be found here: https://gist.github.com/yuki24/a80988f35aceac76f1d5
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #19566 from aditya-kapoor/remove-dup-doc	Richard Schneeman	2015-04-11	1	-22/+10
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \|	[ci skip] remove duplicate doc for current_page?
\| * \| \| \| \| \| \| \| \| \| \|	[ci skip] remove duplicate doc for current_page?	Aditya Kapoor	2015-04-09	1	-22/+10
\| \| \|_\|_\|/ / / / / / / \| \|/\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	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.
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #19721 from vngrs/validates_presence_of_missing_note	Robin Dupret	2015-04-11	1	-0/+4
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Missing note on validates_presence_of validation [ci skip]
\| * \| \| \| \| \| \| \| \| \| \|	Missing note on validates_presence_of validation [ci skip]	Mehmet Emin İNAÇ	2015-04-11	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Without this note, someone can misunderstand the usage of validates_presence_of method add missing note for the validates_presence_of
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #19731 from wazery/rename_bin_to_exe	Matthew Draper	2015-04-12	6	-6/+10
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \|	Rename railties/bin to railties/exe to match the new Bundler convention
\| * \| \| \| \| \| \| \| \| \| \|	Rename railties/bin to railties/exe	Islam Wazery	2015-04-11	6	-6/+10
\|/ / / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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.
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #19727 from supercaracal/fix_wrong_test_method_name	Eileen M. Uchitelle	2015-04-11	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix a wrong feature test method name
\| * \| \| \| \| \| \| \| \| \| \|	fix a wrong feature test method name	Taishi Kasuga	2015-04-11	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	[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.