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

	Commit message (Collapse)	Author	Age	Files	Lines
...
* \| \| \| \|	Merge pull request #17186 from tgxworld/header_authentication_token	Matthew Draper	2014-11-27	3	-4/+37
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow authentication header to not have to specify 'token=' key.
\| * \| \| \| \|	Allow authentication header to not have to specify 'token=' key.	Guo Xiang Tan	2014-10-10	2	-4/+30
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes: https://github.com/rails/rails/issues/17108.
* \| \| \| \| \|	Merge pull request #17786 from recursive-madman/activerecord-errors-codestyle	Rafael Mendonça França	2014-11-26	2	-3/+6
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Code style changes for various activerecord errors
\| * \| \| \| \| \|	various error classes: added newlines & removed :nodoc: flag from public ↵	Recursive Madman	2014-11-26	2	-3/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	attribute.
* \| \| \| \| \| \|	Merge pull request #17761 from pschrammel/master	Yves Senn	2014-11-26	1	-1/+1
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	be more general with adapter name
\| * \| \| \| \| \|	be more general with adapter name	Peter Schrammel	2014-11-25	1	-1/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #17674 from recursive-madman/activerecord-error-improvement	Rafael Mendonça França	2014-11-26	3	-4/+25
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add #record attribute to RecordNotFound and RecordDestroyed exceptions.
\| * \| \| \| \| \| \|	Add #record attribute to RecordNotFound and RecordDestroyed exceptions.	Recursive Madman	2014-11-26	3	-4/+25
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This allows these exceptions to be handled generically in conjunction with RecordInvalid.
* \| \| \| \| \| \| \|	Merge pull request #17782 from cheba/engine-root-master	Rafael Mendonça França	2014-11-26	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use absolute_path of caller_locations to infer engine root
\| * \| \| \| \| \| \| \|	Use absolute_path of caller_locations to infer engine root	Alexander Mankuta	2014-11-26	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	According to documentation `path` only returns file names. On MRI it's not the case but it's likely a bug in MRI.
* \| \| \| \| \| \| \| \|	Merge pull request #17781 from jonatack/patch-8	Rafael Mendonça França	2014-11-26	1	-38/+40
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Active Record change log pass [skip ci]
\| * \| \| \| \| \| \| \| \|	Active Record change log pass [skip ci]	Jon Atack	2014-11-26	1	-38/+40
\| \|/ / / / / / / /
* \| \| \| \| \| \| \| \|	Merge pull request #17785 from jipumarino/dbconsole-for-sqlserver	Rafael Mendonça França	2014-11-26	1	-0/+15
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Provide support for SQL Server connections with dbconsole using sqsh
\| * \| \| \| \| \| \| \| \|	Provide support for SQL Server connections with dbconsole using sqsh	Juan Ignacio Pumarino	2014-11-26	1	-0/+15
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge pull request #17784 from bruno-/refactor-nested-ifs	Rafael Mendonça França	2014-11-26	1	-5/+3
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \|	Refactor nested if
\| * \| \| \| \| \| \| \|	Refactor nested if	Bruno Sutic	2014-11-26	1	-5/+3
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge pull request #17780 from arcz/patch-1	José Valim	2014-11-26	1	-1/+0
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove extra empty line
\| * \| \| \| \| \| \| \|	Remove extra empty line	Artur Cygan	2014-11-26	1	-1/+0
\|/ / / / / / / /
* \| \| \| \| \| \| \|	:scissors:	Rafael Mendonça França	2014-11-26	1	-1/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #17779 from dilpreet92/server_location	Rafael Mendonça França	2014-11-26	1	-2/+2
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Getting the location of the server
\| * \| \| \| \| \| \| \|	getting the location of the server	dilpreet92	2014-11-26	1	-2/+2
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Clarify where result goes, and supported formats of generate task.	Zachary Scott	2014-11-25	1	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \| \| \|	Use jquery-rails 4.0.0	Rafael Mendonça França	2014-11-25	2	-9/+3
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #17773 from gsamokovarov/mention-web-console-2.0-rc1	Sean Griffin	2014-11-25	2	-2/+2
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use web_console 2.0 for 4.2.0.rc1 release
\| * \| \| \| \| \| \| \|	Use web_console 2.0 for 4.2.0.rc1 release	Genadi Samokovarov	2014-11-26	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This one replaces the notable web-console mentions in guide and the default Gemfile.
* \| \| \| \| \| \| \| \|	Merge pull request #17728 from jcutrell/jcutrell/docs-to_session_value-for-pr	Rafael Mendonça França	2014-11-25	1	-3/+6
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adding simple docs for ActionDispatch::Flash::FlashHash#to_session_value
\| * \| \| \| \| \| \| \| \|	adding nodoc to private methods	Jonathan Cutrell	2014-11-23	1	-2/+2
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Adding simple docs for ActionDispatch::Flash::FlashHash#to_session_value	Jonathan Cutrell	2014-11-23	1	-1/+4
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Fix warning in AV tests	Sean Griffin	2014-11-25	1	-2/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Originally caused by #17771
* \| \| \| \| \| \| \| \| \|	Merge branch 'derekprior-dp-add-foreign-keys-with-generators'	Rafael Mendonça França	2014-11-25	5	-1/+60
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #17759
\| * \| \| \| \| \| \| \| \| \|	Generators add foreign keys on references	Derek Prior	2014-11-25	5	-1/+60
\|/ / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	If you run a generator such as: ``` rails generate model accounts supplier:references ``` The resulting migration will now add the corresponding foreign key constraint unless the reference was specified to be polymorphic.
* \| \| \| \| \| \| \| \| \|	Fix syntax error :bomb:	Rafael Mendonça França	2014-11-25	1	-2/+2
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge pull request #17697 from sgrif/sg-remove-is-a-check-when-ignoring-tables	Sean Griffin	2014-11-25	2	-16/+1
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove is_a? check when ignoring tables
\| * \| \| \| \| \| \| \| \| \|	Remove is_a? check when ignoring tables	Sean Griffin	2014-11-20	2	-16/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Technically changes the API, as it will allow any object which responds to `===`. Personally, I think this is more flexible.
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #17771 from agis-/issue-17373	Sean Griffin	2014-11-25	2	-2/+9
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \|	Local vars should exist in partials for falsy `:object:` values too
\| * \| \| \| \| \| \| \| \| \|	Local vars should exist in partials for falsy `:object:` values too	Agis-	2014-11-25	2	-2/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	c67005f221f102fe2caca231027d9b11cf630484 made the local var in partials available only if what passed to `:object` was truthy. For example this would not make the local variable `foo` available inside the partial: render partial: 'foo', object: false Fixes #17373.
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #17733 from yuki24/do-not-rescue-exception-in-params-parser	Rafael Mendonça França	2014-11-25	2	-1/+11
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Do not rescue Exception in ActionDispatch::ParamsParser
\| * \| \| \| \| \| \| \| \| \| \|	Do not rescue Exception in ParamsParser	Yuki Nishijima	2014-11-23	2	-1/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Unlike ShowExceptions or PublicExceptions, ParamsParser shouldn't transform exceptions like Interrupt and NoMemoryError into ParserError.
* \| \| \| \| \| \| \| \| \| \| \|	Use released arel	Rafael Mendonça França	2014-11-25	2	-2/+1
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Use released rails-dom-testing	Rafael Mendonça França	2014-11-25	5	-6/+3
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #17768 from bruno-/router-visualizer-css-fix	Rafael Mendonça França	2014-11-25	1	-4/+0
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Small fix for the router visualizer
\| * \| \| \| \| \| \| \| \| \| \| \|	CSS fix for the router visualizer	Bruno Sutic	2014-11-25	1	-4/+0
\| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	Move PG float quoting to the correct location	Sean Griffin	2014-11-25	1	-16/+6
\| \|_\|/ / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Not sure how we missed this case when we moved everything else to the `_quote` method.
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #17769 from gsamokovarov/remove-slash-console-references	Rafael Mendonça França	2014-11-25	2	-14/+4
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove Web Console /console references in the guides
\| * \| \| \| \| \| \| \| \| \| \| \|	Remove Web Console /console references in the guides	Genadi Samokovarov	2014-11-25	2	-14/+4
\|/ / / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #17739 from rails/bring_back_db_test_prepare	Yves Senn	2014-11-25	6	-17/+120
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	bring back `db:test:prepare`.
\| * \| \| \| \| \| \| \| \| \| \| \|	bring back `db:test:prepare`.	Yves Senn	2014-11-25	5	-15/+120
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts deprecations added in #13528. The task is brought back for two reasons: 1. Give plugins a way to hook into the test database initialization process 2. Give the user a way to force a test database synchronization While `test:prepare` is still a dependency of every test task, `db:test:prepare` no longer hooks into it. This means that `test:prepare` runs before the schema is synchronized. Plugins, which insert data can now hook into `db:test:prepare`. The automatic schema maintenance can't detect when a migration is rolled-back, modified and reapplied. In this case the user has to fall back to `db:test:prepare` to force the synchronization to happen.
\| * \| \| \| \| \| \| \| \| \| \| \|	do not trigger AR lazy load hook before initializers ran.	Yves Senn	2014-11-25	1	-2/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[Rafael Mendonça França & Yves Senn] This require caused the `active_record.set_configs` initializer to run immediately, before `config/initializers`. This means that setting any configuration on `Rails.application.config.active_record` inside of an initializer had no effects when rails was loaded through `rake`. Introduced by #6518 /cc @rafaelfranca
* \| \| \| \| \| \| \| \| \| \| \| \|	Setting an association replaces records with the same id in memory	Sean Griffin	2014-11-25	2	-2/+82
\| \|/ / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The records weren't being replaced since equality in Active Record is defined in terms of `id` only. It is reasonable to expect that the references would be replaced in memory, even if no queries are actually executed. This change did not appear to affect any other parts of the code base. I chose not to execute callbacks since we're not actually modifying the association in a way that will be persisted. Fixes #17730
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #17767 from javiervidal/fixing_documentation	Rafael Mendonça França	2014-11-25	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixing wrong link in 'Ruby on Rails 3.0 Release Notes' [ci skip]