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

	Commit message (Collapse)	Author	Age	Files	Lines
...
* \| \| \| \| \| \| \|	Update `bin/rake about` [ci skip]	Arun Agrawal	2014-11-05	1	-6/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	As we are no more displaying frameworks
* \| \| \| \| \| \| \|	Add skip-turbolinks entry to 4.2 release notes and improve changelog	Carlos Antonio da Silva	2014-11-05	2	-1/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \| \| \|	Merge pull request #17519 from prathamesh-sonpatki/rm-skip-gems	Carlos Antonio da Silva	2014-11-05	1	-4/+0
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove skip-gems from 4-2 release notes [ci skip]
\| * \| \| \| \| \| \| \|	Remove skip-gems from 4-2 release notes	Prathamesh Sonpatki	2014-11-05	1	-4/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- This option was removed in https://github.com/rails/rails/commit/bf17c8a531bc80. - [ci skip]
* \| \| \| \| \| \| \| \|	tests, add note about the usage of a specific timezone. Closes #17448.	Yves Senn	2014-11-05	1	-1/+1
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #17510 from pda/ar-create-database-error-message	Carlos Antonio da Silva	2014-11-05	1	-0/+1
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	rake db:create shows underlying error message.
\| * \| \| \| \| \| \| \| \|	activerecord: rake db:create shows underlying error message.	Paul Annesley	2014-11-04	1	-0/+1
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge pull request #17473 from vipulnsward/rm-unused-method	Yves Senn	2014-11-05	1	-8/+0
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove unused duplicated method `add_column_position` from AbstractMysqlAdapter.
\| * \| \| \| \| \| \| \| \| \|	- Remove unused duplicated method `add_column_position` from ↵	Vipul A M	2014-11-01	1	-8/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	AbstractMysqlAdapter
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #17515 from prathamesh-sonpatki/rm-require	Yves Senn	2014-11-05	2	-2/+0
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Removed the unused require of proxy_object
\| * \| \| \| \| \| \| \| \| \| \|	Removed the unused require of proxy_object and test related to it	Prathamesh Sonpatki	2014-11-05	2	-2/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Reference : https://github.com/rails/rails/pull/17493#issuecomment-61739359 - Duration stopped inheriting from ProxyObject in https://github.com/rails/rails/pull/16574
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #17518 from prathamesh-sonpatki/fix-activesupport	Yves Senn	2014-11-05	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \|	Fix broken string_ext_test due to change in timezone
\| * \| \| \| \| \| \| \| \| \| \|	Fix broken string_ext_test due to change in timezone	Prathamesh Sonpatki	2014-11-05	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Russian time was changed to UTC+3 from UTC+4 recently. This broke the string_to_ext test.
* \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #17514 from y-yagi/configuring_guide	Abdelkader Boudih	2014-11-05	1	-1/+1
\|\\| \| \| \| \| \| \| \| \| \| \| \| \|/ / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \|	[ci skip] fix `config.assets.digest` default value
\| * \| \| \| \| \| \| \| \| \|	[ci skip] fix `config.assets.digest` default value	yuuji.yaginuma	2014-11-05	1	-1/+1
\|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge pull request #17513 from eileencodes/cleanup-rails-4.2-release-notes	Zachary Scott	2014-11-04	1	-11/+11
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixup spelling and grammar in 4.2 guides
\| * \| \| \| \| \| \| \| \| \|	[ci skip] Fixup spelling and grammar in 4.2 guides	eileencodes	2014-11-04	1	-11/+11
\|/ / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Capitalize CSS, SQL Change spelling of favour to favor - updated for consistency, the rest of the document uses "favor". Grammar / spelling pass
* \| \| \| \| \| \| \| \| \|	Merge branch '17106'	Aaron Patterson	2014-11-04	4	-8/+37
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* 17106: add lib to $LOAD_PATH on application inhertence. fixes #17106 add a test for #17106
\| * \| \| \| \| \| \| \| \|	add lib to $LOAD_PATH on application inhertence. fixes #17106	Aaron Patterson	2014-11-04	3	-9/+16
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	add a test for #17106	Aaron Patterson	2014-11-04	2	-0/+22
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge pull request #17508 from ↵	Zachary Scott	2014-11-04	1	-4/+4
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	prathamesh-sonpatki/mention-adding-resources-to-routes Mention that articles resource should be added by user in getting started guide Fixes #17507 [ci skip]
\| * \| \| \| \| \| \| \| \| \|	Mention that articles resource should be added by user in getting started guide	Prathamesh Sonpatki	2014-11-05	1	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #17443 from tomeara/added_jsonb_to_postgres_database_types	Yves Senn	2014-11-04	5	-18/+17
\|\ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \|	Added SchemaDumper support for tables with jsonb columns
\| * \| \| \| \| \| \| \| \| \|	Added SchemaDumper support for tables with jsonb columns.	Ted O'Meara	2014-11-04	5	-18/+17
\|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge pull request #17480 from gsamokovarov/exception-wrapper-traces	Rafael Mendonça França	2014-11-04	2	-29/+23
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move DebugExceptions#traces_from_wrapper to ExceptionWrapper
\| * \| \| \| \| \| \| \| \| \|	Move DebugExceptions#traces_from_wrapper to ExceptionWrapper	Genadi Samokovarov	2014-11-03	2	-29/+23
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ActionDispatch::ExceptionWrapper seems to be the more natural place for this method to live in.
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'master' of github.com:rails/rails	Vijay Dev	2014-11-04	171	-453/+1388
\|\ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \|	fix typo [ci skip]	Vijay Dev	2014-11-04	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Merge pull request #17504 from Gaurav2728/gaurav-update_edgeguide	Zachary Scott	2014-11-04	1	-1/+1
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	update rails version for earlier releases in edgeguides [ci skip]
\| \| * \| \| \| \| \| \| \| \| \| \|	update rails version for earlier releases in edgeguides	Gaurav Sharma	2014-11-04	1	-1/+1
\| \|/ / / / / / / / / / /
\| * \| \| \| \| \| \| \| \| \| \|	Merge pull request #17488 from rishijain/update_docs_3	Zachary Scott	2014-11-03	1	-2/+2
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	minor docs change [ci skip]
\| \| * \| \| \| \| \| \| \| \| \| \|	minor docs change [ci skip]	Rishi Jain	2014-11-03	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #17500 from rishijain/update_docs_4	Zachary Scott	2014-11-03	1	-2/+8
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	added example for hash slice method [ci skip]
\| \| * \| \| \| \| \| \| \| \| \| \| \|	fixed typo [ci skip]	Rishi Jain	2014-11-04	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \|	added example for hash slice method [ci skip]	Rishi Jain	2014-11-04	1	-2/+8
\| \|/ / / / / / / / / / / /
\| * \| \| \| \| \| \| \| \| \| \| \|	Correct fixed-width doc syntax, thanks to @sikachu for pointing it out!	Zachary Scott	2014-11-03	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	From dc5854f and c07c0b2 [ci skip]
\| * \| \| \| \| \| \| \| \| \| \| \|	Document included ability of AJ::QueueName module for class methods [ci skip]	Zachary Scott	2014-11-03	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Add documentation of AJ::QueueAdapter class methods module [ci skip]	Zachary Scott	2014-11-03	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Document AJ::Execution class methods module [ci skip]	Zachary Scott	2014-11-03	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Document the module which includes `perform_later` for AJ::Enqueuing [ci skip]	Zachary Scott	2014-11-03	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Add documentation for class methods module included for AJ::Core used	Zachary Scott	2014-11-03	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	for serialization and deserialization of jobs. [ci skip]
\| * \| \| \| \| \| \| \| \| \| \| \|	Document the class methods include module for AJ::Callbacks [ci skip]	Zachary Scott	2014-11-03	1	-0/+2
\| \| \|_\|/ / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Merge pull request #17498 from rochefort/remove-redundant-to_s	Rafael Mendonça França	2014-11-03	1	-1/+1
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove redundant `to_s` in interpolation
\| \| * \| \| \| \| \| \| \| \| \| \|	Remove redundant `to_s` in interpolation	rochefort	2014-11-04	1	-1/+1
\| \|/ / / / / / / / / / /
\| * \| \| \| \| \| \| \| \| \| \|	Remove unneeded autoload	Rafael Mendonça França	2014-11-03	1	-4/+1
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Merge pull request #17494 from craftsmen/issue-17484	Zachary Scott	2014-11-03	0	-0/+0
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \|	Change `rails` to `bin/rails` in getting started, fix #1748 [ci skip]
\| \| * \| \| \| \| \| \| \| \| \|	Change `rails` to `bin/rails` in getting started, fix #1748 [ci skip]	kevcha	2014-11-03	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Merge pull request #17487 from pabloh/avoid_allocations	Rafael Mendonça França	2014-11-03	5	-5/+5
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Avoid unnecessary allocations and method calls
\| \| * \| \| \| \| \| \| \| \| \| \|	Avoid unnecessary allocations/calls	Pablo Herrero	2014-11-02	5	-5/+5
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #17383 from rwz/string-remove	Rafael Mendonça França	2014-11-03	3	-8/+26
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|/ / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make `String#remove` and `String#remove!` accept multiple arguments Conflicts: activesupport/CHANGELOG.md