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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Revert change on ActiveRecord::Relation#order method that prepends new	Rafael Mendonça França	2013-07-29	8	-21/+34
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	order on the old ones The previous behavior added a major backward incompatibility since it impossible to have a upgrade path without major changes on the application code. We are taking the most conservative path to be consistent with the idea of having a smoother upgrade on Rails 4. We are reverting the behavior for what was in Rails 3.x and, if needed, we will implement a new API to prepend the order clauses in Rails 4.1.
*	only calculate the klass once	Aaron Patterson	2013-07-29	1	-1/+2
\|
*	Merge pull request #11358 from Alamoz/asset_pipeline	Xavier Noria	2013-07-29	1	-229/+537
\|\ \| \| \| \|	Update of 'The Asset Pipeline' guide for Rails 4.
\| *	Update of 'The Asset Pipeline' guide for Rails 4. [ci skip]	Adrien Lamothe	2013-07-26	1	-229/+537
\| \|
* \|	Merge pull request #10879 from makaroni4/master	Andrew White	2013-07-29	6	-0/+50
\|\ \ \| \| \| \| \| \|	Added Time#middle_of_day method
\| * \|	Added Time#middle_of_day	Anatoli Makarevich	2013-07-28	6	-1/+51
\| \| \| \| \| \| \| \| \| \| \| \|	Added middle_of_day method to Date and DateTime
* \| \|	Merge pull request #11654 from robin850/freebsd	Xavier Noria	2013-07-29	1	-0/+28
\|\ \ \ \| \| \| \| \| \| \| \|	Add installation instructions for FreeBSD [ci skip]
\| * \| \|	Add installation instructions for FreeBSD [ci skip]	Robin Dupret	2013-07-29	1	-0/+28
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add packages required to setup the rails environment on FreeBSD.
* \| \| \|	Merge pull request #11651 from ↵	Carlos Antonio da Silva	2013-07-29	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	neerajdotname/log_should_mimick_original_log_method interceptor should mimick original method
\| * \| \| \|	interceptor should mimick original method	Neeraj Singh	2013-07-29	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This fix also makes the test order independent.
* \| \| \| \|	Merge pull request #11653 from ankit8898/typo	Carlos Antonio da Silva	2013-07-29	1	-1/+1
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \|	Fixing the broken URL [skip ci]
\| * \| \| \|	Fixing the broken URL [skip ci]	Ankit Gupta	2013-07-29	1	-1/+1
\|/ / / /
* \| \| \|	Fix handling of offsets with Time#to_s(:iso8601)	Andrew White	2013-07-29	7	-4/+21
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use a lambda to ensure that the generated string respects the offset of the time value. Also add DateTime#to_s(:iso8601) and Date#to_s(:iso8601) for completeness.
* \| \| \|	Merge pull request #11649 from ↵	Carlos Antonio da Silva	2013-07-29	1	-30/+20
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	neerajdotname/use_method_with_active_record_default_timezone use method with_active_record_default_timezone
\| * \| \| \|	use method with_active_record_default_timezone	Neeraj Singh	2013-07-29	1	-30/+20
\| \|/ / /
* \| \| \|	Move changelog entry to the top [ci skip]	Carlos Antonio da Silva	2013-07-29	1	-5/+7
\| \| \| \|
* \| \| \|	Merge pull request #11648 from prathamesh-sonpatki/doc-fix	Yves Senn	2013-07-29	1	-0/+2
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Improved the doc about showing posts in getting started guide [ci skip]
\| * \| \| \|	Improved the doc about showing posts in getting started guide [ci skip]	Prathamesh Sonpatki	2013-07-29	1	-0/+2
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \|	- Reference #11644
* \| \| \|	Merge pull request #11646 from neerajdotname/remove_duplicate_method	Yves Senn	2013-07-29	1	-7/+0
\|\ \ \ \ \| \|/ / / \|/\| \| \|	remove duplicate method
\| * \| \|	remove duplicate method	Neeraj Singh	2013-07-29	1	-7/+0
\|/ / / \| \| \| \| \| \| \| \| \|	This method is already present in helper.rb
* \| \|	Add Time#to_s(:iso8601) for easy conversion of times to the iso8601 format ↵	David Heinemeier Hansson	2013-07-28	3	-1/+7
\| \| \| \| \| \| \| \| \| \| \| \|	for easy Javascript date parsing
* \| \|	Merge pull request #11608 from arunagw/ruby-from-rubygems	Aaron Patterson	2013-07-28	6	-12/+6
\|\ \ \ \| \| \| \| \| \| \| \|	grab executable from rubygems
\| * \| \|	grab executable from rubygems	Arun Agrawal	2013-07-26	6	-12/+6
\| \| \| \| \| \| \| \| \| \| \| \|	As done here d7fc97d3f90c0e30865d32ce202658f03248cacc
* \| \| \|	Avoid "uninitialized constant ActiveRecord::PendingMigrationError::Rails"	Akira Matsuda	2013-07-29	1	-1/+1
\| \| \| \|
* \| \| \|	Revert "fix order dependent test related to migration"	Akira Matsuda	2013-07-29	1	-4/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 10259c3e906da2191ef0d43cd664a3b5504d9f8c. reason: this causes rake test_mysql and test_mysql2 fail
* \| \| \|	Properly repair validations when dynamically added	Akira Matsuda	2013-07-29	1	-24/+30
\| \| \| \|
* \| \| \|	Clear class ivar before testing	Akira Matsuda	2013-07-29	1	-0/+2
\| \| \| \|
* \| \| \|	Unneeded assertion	Akira Matsuda	2013-07-29	1	-1/+1
\| \| \| \|
* \| \| \|	Don't rewrite AR connection#commit_db_transaction method globally	Akira Matsuda	2013-07-29	1	-4/+4
\| \| \| \|
* \| \| \|	Merge pull request #11640 from pawel2105/manifest_fix	David Heinemeier Hansson	2013-07-28	3	-6/+14
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Changed stylesheet load order in the stylesheet manifest generator.
\| * \| \| \|	Changed stylesheet load order in the stylesheet manifest generator.	Pawel Janiak	2013-07-28	3	-6/+14
\| \| \| \| \|
* \| \| \| \|	Merge pull request #11641 from ankit8898/test_cleanup	Rafael Mendonça França	2013-07-28	2	-2/+2
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Cleanup of class_name
\| * \| \| \| \|	Cleanup of class_name	Ankit Gupta	2013-07-28	2	-2/+2
\| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't think class name is needed as by default belongs_to :select will be linked to Select class.
* \| \| \| \|	Merge pull request #11634 from ↵	Rafael Mendonça França	2013-07-28	1	-0/+4
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	neerajdotname/fix_order_dependent_test_for_migration fix order dependent test related to migration
\| * \| \| \| \|	fix order dependent test related to migration	Neeraj Singh	2013-07-28	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	If the order in which tests are executed is changed then test fails. This commit ensures that all migrations are run before ensuring that there are no pending migration.
* \| \| \| \| \|	Merge pull request #11635 from ↵	Rafael Mendonça França	2013-07-28	1	-0/+2
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	neerajdotname/make_test_order_independent_by_resetting_timezone make test order independent by resetting timezone
\| * \| \| \| \| \|	make test order independent by resetting timezone	Neeraj Singh	2013-07-28	1	-0/+2
\| \|/ / / / /
* \| \| \| \| \|	Merge pull request #11637 from neerajdotname/make_test_not_depend_on_order	Rafael Mendonça França	2013-07-28	1	-0/+4
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	reset default timezone and make test order independent
\| * \| \| \| \| \|	reset default timezone and make test order independent	Neeraj Singh	2013-07-28	1	-0/+4
\| \|/ / / / /
* \| \| \| \| \|	Merge pull request #11638 from ↵	Rafael Mendonça França	2013-07-28	1	-0/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	neerajdotname/make_order_independent_association_test make test not depend on order
\| * \| \| \| \| \|	make test not depend on order	Neeraj Singh	2013-07-28	1	-0/+1
\| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	`NestedThroughAssociationsTest` adds records to `member_details` table. When test performs `@member_details[0]` then the order of record is not guaranteed. Hence it is best to start with a clean slate by deleting unwanted records.
* \| \| \| \| \|	Merge branch 'master' of github.com:rails/docrails	Vijay Dev	2013-07-28	5	-55/+44
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \|
\| * \| \| \| \|	Typo fix	Mikhail Dieterle	2013-07-28	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Using markdown-style code quotes	Mikhail Dieterle	2013-07-28	1	-2/+2
\| \| \| \| \| \|
\| * \| \| \| \|	Fix lixml2 to libxml2 [ci skip]	Robin Dupret	2013-07-28	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Fixes typo in Object#try!	Jay Hayes	2013-07-26	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Use hyphenated version of assert_url [ci skip]	Robin Dupret	2013-07-26	1	-1/+1
\| \| \| \| \| \|
\| * \| \| \| \|	Add a SQL example for `not` [ci skip]	Robin Dupret	2013-07-26	1	-1/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	To share a certain logic across other examples, let's add a sample SQL code generated by the given Ruby code
\| * \| \| \| \|	Refix my misreading of the diff	Damien Mathieu	2013-07-26	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	sorry @robin850. Thanks @fxn
\| * \| \| \| \|	Revert "Fix the SQLite gem name"	Damien Mathieu	2013-07-26	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 700c6c65bcce17d4c61423ceaef031bcbe203337. Bot the `sqlite3` and `sqlite3-ruby` gems exist. https://rubygems.org/gems/sqlite3 https://rubygems.org/gems/sqlite3-ruby In fact, they both point to the same github repository. https://github.com/luislavena/sqlite3-ruby However, the last one hasn't been released since 2011, while the first one keeps getting regular releases.