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

	Commit message (Collapse)	Author	Age	Files	Lines
...
* \| \| \| \| \| \| \| \| \|	Fix file name	Rafael Mendonça França	2015-05-27	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is a leftover of #19867
* \| \| \| \| \| \| \| \| \|	Merge pull request #19808 from byroot/action-parameter	Rafael Mendonça França	2015-05-27	2	-15/+32
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[PoC] Stop shadowing parameters named `action`
\| * \| \| \| \| \| \| \| \| \|	Allow to parameters named `action` or `controller` from AC::TestCase helpers	Jean Boussier	2015-04-18	2	-15/+32
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #19867 from radar/rename-app-rails-loader	Rafael Mendonça França	2015-05-27	4	-14/+14
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove redundant 'Rails' from Rails::AppRailsLoader constant
\| * \| \| \| \| \| \| \| \| \| \|	Remove redundant 'Rails' from Rails::AppRailsLoader constant	Ryan Bigg	2015-05-21	4	-14/+14
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #20327 from yoongkang/ajax	Zachary Scott	2015-05-27	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \|	[ci-skip] Replace dead link about HttpOnly cookies.
\| * \| \| \| \| \| \| \| \| \| \|	[ci skip] Replace dead link about HttpOnly cookies.	Yoong Kang Lim	2015-05-28	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #20316 from ↵	Rafael Mendonça França	2015-05-27	1	-0/+1
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	vngrs/add_assertion_for_get_method_into_request_test Add assertion for get? method into test cases
\| * \| \| \| \| \| \| \| \| \| \| \|	Add assertion for get? method into test cases	Mehmet Emin İNAÇ	2015-05-27	1	-0/+1
\| \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #20321 from vngrs/fix_indentation_warning	Rafael Mendonça França	2015-05-27	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix indentation warning on active_support ordered_options
\| * \| \| \| \| \| \| \| \| \| \| \|	Fix indentation warning on active_support ordered_options	Mehmet Emin İNAÇ	2015-05-27	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #20323 from jakegavin/initialization-guide-update	Claudio B.	2015-05-27	1	-3/+2
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove unnecessary reference to example Blog app in initialization guides
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Remove unnecessary reference to example Blog app [ci skip]	Jake Gavin	2015-05-27	1	-3/+2
\|/ / / / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #20319 from kassio/master	Rafael Mendonça França	2015-05-27	1	-2/+4
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \|	Remove web-console and spring from test group on default Gemfile.
\| * \| \| \| \| \| \| \| \| \| \| \|	Remove web-console and spring from test group on default Gemfile.	Kassio Borges	2015-05-27	1	-2/+4
\|/ / / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #20314 from vngrs/add_doc_about_form_data_method	Santiago Pastorino	2015-05-27	1	-0/+2
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \|	Documentation for ActionDispatch::Request form_data? method [ci skip]
\| * \| \| \| \| \| \| \| \| \| \|	Documentation for ActionDispatch::Request form_data? method [ci skip]	Mehmet Emin İNAÇ	2015-05-27	1	-0/+2
\|/ / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #20262 from arunagw/aa-remove-broken-unused-release-task	Yves Senn	2015-05-27	8	-60/+0
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \|	Remove broken and unused release task
\| * \| \| \| \| \| \| \| \| \|	Remove broken and unused release task	Arun Agrawal	2015-05-22	8	-60/+0
\| \| \|_\|_\|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- We do release with release.rb - There is no `rake/gemcutter`
* \| \| \| \| \| \| \| \| \|	Merge pull request #20297 from gouravtiwari/patch-9	Claudio B.	2015-05-26	1	-0/+6
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added multibyte slice! example to doc [ci skip]
\| * \| \| \| \| \| \| \| \| \|	Added multibyte slice! example to doc [ci skip]	Gourav Tiwari	2015-05-26	1	-0/+6
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #20310 from guigs/patch-1	Rafael Mendonça França	2015-05-26	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix email with name format in Guides. [ci skip]
\| * \| \| \| \| \| \| \| \| \| \|	Fix email with name format in Guides. [ci skip]	Guilherme Goettems Schneider	2015-05-26	1	-1/+1
\|/ / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #20208 from gaurish/raise_on_missing_ordered_options	Rafael Mendonça França	2015-05-26	3	-1/+39
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add bang version to OrderedOptions
\| * \| \| \| \| \| \| \| \| \| \|	Add bang version to OrderedOptions	Gaurish Sharma	2015-05-23	3	-1/+36
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	By: Aditya Sanghi(@asanghi) Gaurish Sharma(gaurish)
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #20305 from ↵	Rafael Mendonça França	2015-05-26	1	-3/+5
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	vngrs/missing_docs_and_no_docs_for_action_dispatch_request Add missing nodocs and docs for ActionDispatch::Request [ci skip]
\| * \| \| \| \| \| \| \| \| \| \|	Add missing nodocs and docs for ActionDispatch::Request [ci skip]	Mehmet Emin İNAÇ	2015-05-26	1	-3/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	add missing dot to end of the doc
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #20309 from stephen-puiszis/patch-1	Rafael Mendonça França	2015-05-26	1	-0/+2
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add info on default layout functionality 3.2 >> 4.0 upgrade
\| * \| \| \| \| \| \| \| \| \| \| \|	Add info on default layout functionality 3.2 >> 4.0 upgrade	Stephen Puiszis	2015-05-26	1	-0/+2
\|/ / / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #20027 from keepcosmos/add-extend-option-on-habtm	Yves Senn	2015-05-26	3	-1/+20
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \|	Add `extend` option on `has_and_belongs_to_many`.
\| * \| \| \| \| \| \| \| \| \| \|	add `extend` option on `has_and_belongs_to_many`.	keepcosmos	2015-05-26	3	-1/+20
\|/ / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #20303 from vngrs/remove_redundant_like_from_slice_doc	Yves Senn	2015-05-26	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove redundant 'like' from doc of slice! method [ci skip]
\| * \| \| \| \| \| \| \| \| \| \|	Remove redundant 'like' from doc of slice! method [ci skip]	Mehmet Emin İNAÇ	2015-05-26	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #20304 from arunagw/aa-remove-unused-variable	Yves Senn	2015-05-26	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove unused variable
\| * \| \| \| \| \| \| \| \| \| \| \|	Remove unused variable	Arun Agrawal	2015-05-26	1	-1/+1
\|/ / / / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Was left in adfab2dcf4003ca564d78d4425566dd2d9cd8b4f
* / / / / / / / / / / /	deprecate `Relation#uniq` use `Relation#distinct` instead.	Yves Senn	2015-05-26	12	-31/+52
\|/ / / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	See #9683 for the reasons we switched to `distinct`. Here is the discussion that triggered the actual deprecation #20198. `uniq`, `uniq!` and `uniq_value` are still around. They will be removed in the next minor release after Rails 5.
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #16938 from akshay-vishnoi/remove-deprication	Yves Senn	2015-05-26	5	-169/+5
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove `.superclass_delegating_accessor`.
\| * \| \| \| \| \| \| \| \| \|	Remove `.superclass_delegating_accessor`. Refer #14271	Akshay Vishnoi	2015-05-24	5	-169/+4
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #20296 from vngrs/use_memoization_to_minimize_memory_usage	Matthew Draper	2015-05-26	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use memoization while accessing request headers for minimizing memory usage
\| * \| \| \| \| \| \| \| \| \| \|	Use memoization while accessing request headers for minimizing memory usage	Mehmet Emin İNAÇ	2015-05-25	1	-1/+1
\|/ / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #20295 from rohandaxini/patch-1	Abdelkader Boudih	2015-05-25	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed the grammatical mistake in the sentence [ci skip]
\| * \| \| \| \| \| \| \| \| \| \|	Fixed the grammatical mistake in the sentence [ci skip]	Rohan Daxini	2015-05-25	1	-1/+1
\|/ / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #20248 from ronakjangir47/remove_mocha	Rafael Mendonça França	2015-05-25	1	-18/+34
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove use of mocha in the railties generators tests
\| * \| \| \| \| \| \| \| \| \| \|	Remove use of mocha in the railties generators tests	Ronak Jangir	2015-05-22	1	-18/+34
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #20294 from yoongkang/american_spelling	Rafael Mendonça França	2015-05-25	1	-4/+4
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix spelling mistakes
\| * \| \| \| \| \| \| \| \| \| \| \|	Fix spelling mistakes	Yoong Kang Lim	2015-05-25	1	-4/+4
\| \| \|_\|_\|_\|_\|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #20293 from davydovanton/doc-duration	Kasper Timm Hansen	2015-05-25	1	-0/+4
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \|	Update documentation for Duration#to_s
\| * \| \| \| \| \| \| \| \| \| \|	[skip ci] Update documentation for Duration#to_s	Anton Davydov	2015-05-25	1	-0/+4
\|/ / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'master' of github.com:rails/rails	Zachary Scott	2015-05-24	2	-2/+14
\|\ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \	Merge pull request #20288 from brian-davis/brian-davis	Zachary Scott	2015-05-24	1	-2/+2
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Grammar fix to Active Record Basics guide. [ci skip]