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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Add collation support for string and text columns in SQLite3	Akshay Vishnoi	2015-05-28	6	-9/+139
\|
*	Merge pull request #20329 from EduardoBautista/json-api-support	Rafael Mendonça França	2015-05-27	1	-1/+1
\|\ \| \| \| \|	Add application/vnd.api+json alias to the JSON MIME Type.
\| *	Add application/vnd.api+json alias to the JSON MIME Type.	Eduardo Bautista	2015-05-27	1	-1/+1
\| \|
* \|	Merge pull request #20171 from georgeclaghorn/enums-in-fixtures	Rafael Mendonça França	2015-05-27	6	-32/+64
\|\ \ \| \| \| \| \| \| \| \| \|	Allow the use of symbols or strings to specify enum values in test fixtures
\| * \|	Resolve enums in test fixtures	George Claghorn	2015-05-27	6	-32/+64
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Currently, values for columns backing Active Record enums must be specified as integers in test fixtures: awdr: title: "Agile Web Development with Rails" status: 2 rfr: title: "Ruby for Rails" status: <%= Book.statuses[:proposed] %> This is potentially confusing, since enum values are typically specified as symbols or strings in application code. To resolve the confusion, this change permits the use of symbols or strings to specify enum values: awdr: status: :published It is compatible with fixtures that specify enum values as integers.
* \| \|	Merge pull request #19886 from henders/henders/reload_wipe_query_cache	Rafael Mendonça França	2015-05-27	3	-1/+34
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Cause ActiveRecord::Base::reload to also ignore the QueryCache.
\| * \| \|	Cause ActiveRecord::Base::reload to also ignore the QueryCache.	Shane Hender	2015-04-28	2	-1/+30
\| \| \| \|
* \| \| \|	Merge pull request #17654 from kamipo/strict_mode_explicitly	Rafael Mendonça França	2015-05-27	3	-2/+22
\|\ \ \ \ \| \|_\|/ / \|/\| \| \|	If specify `strict: :default` explicitly, do not set sql_mode.
\| * \| \|	If specify `strict: :default` explicitly, do not set sql_mode.	Ryuta Kamizono	2015-05-26	3	-2/+22
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Related with #17370.
* \| \| \|	Merge pull request #20269 from wojobucco/master	Rafael Mendonça França	2015-05-27	3	-4/+9
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Changed mysqldump to include sprocs and functions
\| * \| \| \|	Changed mysqldump to include sprocs and functions	Jonathan Worek	2015-05-22	2	-4/+5
\| \| \| \| \|
* \| \| \| \|	Merge pull request #20326 from hderms/dh/fix_task_bug	Rafael Mendonça França	2015-05-27	2	-16/+66
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix rake method definition leaking onto Object
\| * \| \| \| \|	add fixed file	Dermot Haughey	2015-05-27	2	-16/+66
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	add framework_test add another test
* \| \| \| \| \|	:bomb: Fix another leftover	Rafael Mendonça França	2015-05-27	1	-1/+1
\| \| \| \| \| \|
* \| \| \| \| \|	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.