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

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| * \| \| \| \| \| \| \|	More docs on tagged logging [ci skip]	sshaw	2015-03-06	2	-1/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Mention that tags can also come from a Proc that accepts the request object or something's to_s method
* \| \| \| \| \| \| \| \|	Merge pull request #19888 from imtayadeway/tw/attribute-methods-docs	Claudio B.	2015-04-24	1	-7/+7
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix grammar/style in attribute methods docs
\| * \| \| \| \| \| \| \| \|	Fix grammar/style: assigns/declares -> assignments/declarations.	Tim Wade	2015-04-24	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \| \| \| \| \| \| \|	Fix grammar/style: use (v) fall back (on).	Tim Wade	2015-04-24	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \| \| \| \| \| \| \|	Fix grammar/style: break up long sentence.	Tim Wade	2015-04-24	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	A conjunction was needed to make these sentences correct. Breaking them up seemed like a better option. [ci skip]
\| * \| \| \| \| \| \| \| \|	Fix grammar/style: pluralize 'each of its method'	Tim Wade	2015-04-24	1	-1/+1
\| \| \|/ / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \| \| \| \|	use a more descriptive example. [ci skip]	Yves Senn	2015-04-24	1	-6/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	follow up to 107526e809ea2b6de8b2775ecf83e55d60833206
* \| \| \| \| \| \| \| \|	docs for `create_table` and non-int primary keys. [ci skip]	Yves Senn	2015-04-24	1	-0/+17
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge pull request #19881 from sikachu/silence-mysql-errno-warning	Rafael Mendonça França	2015-04-23	1	-1/+3
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Silence warning from MySQL::Error object in test
\| * \| \| \| \| \| \| \|	Silence warning from MySQL::Error object in test	Prem Sichanugrist	2015-04-23	1	-1/+3
\|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When running Active Record MySQL test, this warning is printed in the console: warning: instance variable errno not initialized It turns out that this is a warning from `mysql` gem in MySQL::Error object. However, since the `mysql` gem is no longer maintained, and there won't be a newer version, it make sense for us to just silence this warning to make the output cleaner.
* \| \| \| \| \| \| \|	Merge pull request #19879 from bboe/RedirectTestCleanup	Rafael Mendonça França	2015-04-23	1	-3/+0
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove unused WorkshopsController class in redirect_test.
\| * \| \| \| \| \| \| \|	Remove unused WorkshopsController class in redirect_test.	Bryce Boe	2015-04-23	1	-3/+0
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Remove nonexistent adapter	Rafael Mendonça França	2015-04-23	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #19866 [ci skip]
* \| \| \| \| \| \| \| \|	Add nodoc to some private constants [ci skip]	Rafael Mendonça França	2015-04-23	1	-3/+3
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #19823 from sbhatore/doc_fix_1	Rafael Mendonça França	2015-04-23	1	-0/+8
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \|	[ci skip] Description inside Signed and Encrypted CookieJars added
\| * \| \| \| \| \| \| \|	Squashed commit of the following:	Siddharth Bhatore	2015-04-23	1	-0/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	commit a88875ac6abaa4d8116b42af8cd71189ce3d44d3 Author: Siddharth Bhatore <sbhatore95@gmail.com> Date: Thu Apr 23 12:26:08 2015 +0530 [ci skip] Update doc fix cookies commit f175eaa7a21db898fc6c66334f770831028f9d00 Author: Siddharth Bhatore <sbhatore95@gmail.com> Date: Mon Apr 20 12:58:04 2015 +0530 Description inside Signed and Encrypted CookieJars added
* \| \| \| \| \| \| \| \|	Merge pull request #18880 from mudge/timestamp-index-bug	Rafael Mendonça França	2015-04-23	3	-0/+20
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix missing index when using timestamps with index
\| * \| \| \| \| \| \| \| \|	Fix missing index when using timestamps with index	Paul Mucur	2015-04-15	3	-0/+24
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The `index` option used with `timestamps` should be passed to both `column` definitions for `created_at` and `updated_at` rather than just the first. This was happening because `Hash#delete` is used to extract the `index` option passed to `timestamps`, thereby mutating the `options` hash in-place. Now take a copy of the `options` before deleting so that the original is not modified.
* \| \| \| \| \| \| \| \| \|	Merge pull request #19875 from cllns/fix-css-formatting-in-welcome-index	Rafael Mendonça França	2015-04-23	1	-3/+10
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \|	Fix CSS formatting in welcome#index.html.erb
\| * \| \| \| \| \| \| \| \|	Fix CSS formatting in welcome#index.html.erb	Sean Collins	2015-04-23	1	-3/+10
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge pull request #19872 from Ecco/master	Yves Senn	2015-04-23	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix a minor grammatical issue in the doc [ci skip]
\| * \| \| \| \| \| \| \| \|	Fix a minor grammatical issue in the doc	Romain Goyet	2015-04-23	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge pull request #19870 from thenickcox/action_dispatch_mw_docs	Richard Schneeman	2015-04-23	1	-6/+13
\|\ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \|	[ci skip] Add, clean up docs in ActionDispatch ActionDispatch middleware
\| * \| \| \| \| \| \| \| \|	[ci skip] Add, clean up docs in ActionDispatch ActionDispatch middleware	Nick Cox	2015-04-22	1	-6/+13
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Queue Classic runs a second earlier than scheduled	Matthew Draper	2015-04-23	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	That seems to be a bug, but as we don't actually care about the precision for our test, we'll just give it a bit longer. [Matthew Draper & Cristian Bica]
* \| \| \| \| \| \| \| \|	Require yaml before trying to rescue its exception class	Rafael Mendonça França	2015-04-22	1	-1/+1
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Remove sqlite support from `rails dbconsole`	Andrew White	2015-04-22	3	-9/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Support for versions of SQLite less than 3 was removed in #6011 as part of the Rails 4.0 release. Therefore there is no need to have support for it in the `rails dbconsole` command anymore.
* \| \| \| \| \| \| \| \|	Merge pull request #19862 from piton4eg/patch-2	Rafael Mendonça França	2015-04-22	1	-2/+2
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix find_each options [ci skip]
\| * \| \| \| \| \| \| \| \|	Fix find_each options [ci skip]	Alexey Markov	2015-04-22	1	-2/+2
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Don't ask something that we don't want to	Rafael Mendonça França	2015-04-22	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We only want to support adapters that we officially support through the entire framework so it is better to not ask patches for adapters that we may not support
* \| \| \| \| \| \| \| \|	Merge pull request #17333 from rails/encode-twz-tzinfo-in-yaml	Andrew White	2015-04-22	5	-8/+76
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve ActiveSupport::TimeWithZone conversion to YAML
\| * \| \| \| \| \| \| \| \|	Improve ActiveSupport::TimeWithZone conversion to YAML	Andrew White	2015-04-22	5	-8/+76
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Previously when converting AS::TimeWithZone to YAML it would be output as a UTC timestamp. Whilst this preserves the time information accurately it loses the timezone information. This commit changes that so that it is saved along with the time information. It also provides nicer encoding of AS::TimeZone instances themselves which previously embedded all of the data from the TZInfo records. Fixes #9183.
* \| \| \| \| \| \| \| \| \|	Merge pull request #19858 from cllns/fix-scaffolding-css-formatting	Rafael Mendonça França	2015-04-22	1	-7/+20
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix formatting of scaffold css
\| * \| \| \| \| \| \| \| \| \|	Fix formatting of scaffold css	Sean Collins	2015-04-22	1	-7/+20
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #19857 from sikachu/remove-alias-method-chain-doc	Rafael Mendonça França	2015-04-22	1	-0/+3
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \|	Clearify that alias_method_chain is deprecated
\| * \| \| \| \| \| \| \| \| \|	Clearify that alias_method_chain is deprecated	Prem Sichanugrist	2015-04-22	1	-0/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This was not clear on the API documentation that the method was deprecated in a982a42d766169c2170d7f100c2a5ceb5430efb1.
* \| \| \| \| \| \| \| \| \| \|	Refactor ActiveSupport::Timezone#strptime	Andrew White	2015-04-22	2	-28/+44
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make strptime behave more like parse when components are missing and share behavior between the two methods.
* \| \| \| \| \| \| \| \| \| \|	Add ActiveSupport::TimeZone#strptime.	Paul A Jungwirth	2015-04-22	3	-0/+90
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This makes it easier to parse user-inputted times as from a given time zone.
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #19856 from sikachu/silence-mathn-warning	Rafael Mendonça França	2015-04-22	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Silence warning from requiring mathn
\| * \| \| \| \| \| \| \| \| \| \|	Silence warning from requiring mathn	Prem Sichanugrist	2015-04-22	1	-1/+1
\| \|/ / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Running Action View test case currently printing out this warning: lib/mathn.rb is deprecated This should silence the warning since we really want to require this file in this test.
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #19852 from sbhatore/doc_fix_cookies	Santiago Pastorino	2015-04-22	1	-2/+2
\|\ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \|	[ci skip] UpgradeLegacySignedCookieJar Doc fix
\| * \| \| \| \| \| \| \| \| \|	[ci skip] UpgradeLegacySignedCookieJar Doc fix	Siddharth Bhatore	2015-04-22	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	pass over CHANGELOGs. [ci skip]	Yves Senn	2015-04-22	6	-20/+24
\|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge pull request #19819 from gazay/no_fork_issue	Rafael Mendonça França	2015-04-22	1	-4/+4
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	MRI compatible code for ActiveSupport::Testing::Isolation::Subprocess
\| * \| \| \| \| \| \| \| \| \|	MRI compatible code for ActiveSupport::Testing::Isolation::Subprocess	Alexey Gaziev	2015-04-19	1	-4/+4
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #19833 from cllns/fix-scaffolding-spacing	Rafael Mendonça França	2015-04-22	1	-0/+2
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add newlines between divs in form scaffolding
\| * \| \| \| \| \| \| \| \| \| \|	Add blank lines between divs in form scaffolding	Sean Collins	2015-04-20	1	-0/+2
\| \| \|/ / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #19779 from ↵	Zachary Scott	2015-04-21	1	-13/+20
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	jonatack/improve-contributing-to-ruby-on-rails-guide Improve the Contributing to Rails Guide [skip ci]
\| * \| \| \| \| \| \| \| \| \| \|	Improve the Contributing to Rails Guide [skip ci]	Jon Atack	2015-04-16	1	-13/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	First commit: This PR improves the "4.12 Commit Your Changes" section of the Contributing to Ruby on Rails Guide: - Fix formatting of the commit message example - Improve readability and clarity - Fix grammar - Wrap lines See the before and after images below in this PR. ----- Second commit: - Rewrite to remove the word "buffer" [skip ci]
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #19847 from ↵	Rafael Mendonça França	2015-04-21	3	-2/+43
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fertapric/activemodel-dirty-after-save-syntactic-sugar Activemode::Dirty attributes query methods consistency before and after saving.