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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge pull request #11650 from prathamesh-sonpatki/rename	Rafael Mendonça França	2014-04-04	9	-19/+37
\|\
\| *	[Active Record] Renamed private methods create_record and update_record	Prathamesh Sonpatki	2014-02-20	9	-19/+37
* \|	Declare the assets dependency	Rafael Mendonça França	2014-04-04	1	-7/+8
* \|	Use sass-rails 4.0.3	Rafael Mendonça França	2014-04-04	1	-1/+1
* \|	Make possible to use sprockets-rails 2.1	Rafael Mendonça França	2014-04-04	2	-1/+2
* \|	Merge pull request #14562 from jefflai2/collection_proxy	Rafael Mendonça França	2014-04-04	4	-0/+23
\|\ \
\| * \|	CollectionProxy uses the arel of its association's scope.	Jefferson Lai	2014-04-02	4	-0/+23
* \| \|	Merge pull request #14599 from spagalloco/patch-1	Arthur Nogueira Neves	2014-04-04	1	-1/+1
\|\ \ \
\| * \| \|	add missing parentheses to validates_with documentation [skip ci]	Steve Agalloco	2014-04-04	1	-1/+1
\|/ / /
* \| \|	Remove unused variable	Rafael Mendonça França	2014-04-04	1	-1/+1
* \| \|	Merge pull request #14598 from rajcybage/assert_dprecated_for_as_test_case	Rafael Mendonça França	2014-04-04	1	-4/+4
\|\ \ \
\| * \| \|	Active support instead of ActiveSupport::Deprecation.silence we can use asser...	Rajarshi Das	2014-04-04	1	-4/+4
* \| \| \|	Merge pull request #14597 from matthewd/kernel_y_for_1_9_option_1	Rafael Mendonça França	2014-04-04	3	-10/+29
\|\ \ \ \
\| * \| \| \|	Ensure we supply Kernel#y for 1.9 too	Matthew Draper	2014-04-04	3	-10/+29
* \| \| \| \|	Merge pull request #14593 from tgxworld/fix_postgresql_schema_test_random_order	Yves Senn	2014-04-04	1	-17/+16
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|
\| * \| \| \|	Prevent state leak in test.	Guo Xiang Tan	2014-04-03	1	-17/+16
\|/ / / /
* \| \| \|	Merge pull request #14582 from arthurnn/blacklist_ruby_methods	Rafael Mendonça França	2014-04-03	4	-1/+15
\|\ \ \ \
\| * \| \| \|	Block a few default Class methods as scope name.	Arthur Neves	2014-04-03	4	-1/+15
\|/ / / /
* \| \| \|	Merge pull request #14572 from laurocaetano/with_options_and_scope	Rafael Mendonça França	2014-04-03	6	-1/+24
\|\ \ \ \
\| * \| \| \|	Fix error when using `with_options` with lambda.	Lauro Caetano	2014-04-03	6	-1/+24
* \| \| \| \|	Merge pull request #14590 from czak/improved_kindlerb_error_message	Arthur Nogueira Neves	2014-04-03	1	-2/+2
\|\ \ \ \ \
\| * \| \| \| \|	Improve error message for guides:generate:kindle	Łukasz Adamczak	2014-04-03	1	-2/+2
* \| \| \| \| \|	Merge pull request #14588 from matthewd/kernel_y_with_spring	Rafael Mendonça França	2014-04-03	1	-0/+1
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|
\| * \| \| \| \|	Explicitly load Kernel#y when starting a console	Matthew Draper	2014-04-04	1	-0/+1
\|/ / / / /
* \| \| \| \|	Merge pull request #14569 from matthewd/sqlite_relative_deprecated	Rafael Mendonça França	2014-04-03	9	-32/+74
\|\ \ \ \ \
\| * \| \| \| \|	Complete change of `sqlite3:///` path handling	Matthew Draper	2014-04-03	3	-17/+11
\| * \| \| \| \|	Revise 'sqlite3:' URL handling for smoother upgrades	Matthew Draper	2014-04-03	9	-33/+98
* \| \| \| \| \|	Merge pull request #14570 from matthewd/uri_deprecation_warning	Rafael Mendonça França	2014-04-03	2	-24/+76
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \|
\| * \| \| \| \|	Avoid including DB details in exception messages	Matthew Draper	2014-04-03	1	-1/+1
\| * \| \| \| \|	Avoid a spurious deprecation warning for database URLs	Matthew Draper	2014-04-03	2	-23/+75
\| \|/ / / /
* \| \| \| \|	Merge pull request #14561 from tgxworld/refactor_run_without_connection	Yves Senn	2014-04-03	10	-64/+44
\|\ \ \ \ \
\| * \| \| \| \|	Add ConnectionHelper to refactor tests.	Guo Xiang Tan	2014-04-03	10	-64/+44
* \| \| \| \| \|	Merge branch 'lavrovdv-patch-1'	Yves Senn	2014-04-03	3	-1/+21
\|\ \ \ \ \ \
\| * \| \| \| \| \|	Treat blank UUID values as nil	Dmitry Lavrov	2014-04-03	3	-1/+21
\| \|/ / / / /
* \| \| \| \| \|	Merge pull request #14576 from ariabov/scope_sections_reordering	Yves Senn	2014-04-03	2	-30/+33
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|
\| * \| \| \| \|	In Active Record Querying guide, currently `Merging of scopes` section uses a...	ariabov	2014-04-02	2	-30/+33
\|/ / / / /
* \| \| \| \|	Merge pull request #14564 from killthekitten/patch-2	Rafael Mendonça França	2014-04-02	1	-5/+4
\|\ \ \ \ \
\| * \| \| \| \|	Fix default_url_options example in i18n guide [ci skip]	Nikolay Shebanov	2014-04-03	1	-5/+4
\| \| \|/ / / \| \|/\| \| \|
* \| \| \| \|	Fix cookie serializer docs	Carlos Antonio da Silva	2014-04-02	1	-3/+3
* \| \| \| \|	Move require to actual file	Carlos Antonio da Silva	2014-04-02	2	-1/+1
* \| \| \| \|	Use asert_deprecated	Rafael Mendonça França	2014-04-02	1	-3/+5
* \| \| \| \|	Merge pull request #14529 from rwz/master	Rafael Mendonça França	2014-04-02	3	-6/+37
\|\ \ \ \ \
\| * \| \| \| \|	DRY AS::SafeBuffer a bit using existing helper	Pavel Pravosud	2014-04-02	1	-5/+1
\| * \| \| \| \|	Make AS::SafeBuffer#prepend act like String#prepend	Pavel Pravosud	2014-03-31	3	-6/+41
* \| \| \| \| \|	Merge pull request #14568 from alex88/patch-1	Rafael Mendonça França	2014-04-02	1	-1/+1
\|\ \ \ \ \ \ \| \|_\|_\|/ / / \|/\| \| \| \| \|
\| * \| \| \| \|	Fixed small documentation typo	Alessandro Tagliapietra	2014-04-02	1	-1/+1
\|/ / / / /
* \| \| \| \|	Merge pull request #14565 from rajcybage/conditional_test_cases	Rafael Mendonça França	2014-04-02	1	-7/+5
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \|
\| * \| \| \|	We can conditional define the tests depending on the adapter or	Rajarshi Das	2014-04-02	1	-7/+5
\|/ / / /
* \| / /	PostgreSQL, Support for materialized views. [Dave Lee & Yves Senn]	Dave Lee	2014-04-02	4	-12/+35
\| \|/ / \|/\| \|
* \| \|	cleanup, `reset_pg_session` in range_test.rb	Yves Senn	2014-04-02	1	-2/+5