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

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| \| *	Fix error for aggregate methods with select, see issue #13648	Simon Woker	2014-04-10	3	-3/+19
\| \| \|
\| * \|	Merge pull request #14646 from deivid-rodriguez/provide_byebug_by_default	Rafael Mendonça França	2014-04-11	11	-294/+489
\| \|\ \ \| \| \| \| \| \| \| \|	Improve debugging support
\| \| * \|	Re-review the debugging guide.	David Rodríguez de Dios	2014-04-11	1	-133/+218
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Tested on a brand new app to exactly match current byebug's behaviour.
\| \| * \|	Minor fixes in the rails debugging guide	David Rodríguez de Dios	2014-04-11	1	-2/+2
\| \| \| \|
\| \| * \|	Prevent generation of extra whitespace in templates	David Rodríguez de Dios	2014-04-10	2	-6/+6
\| \| \| \|
\| \| * \|	Isolate debugger related code	David Rodríguez de Dios	2014-04-10	2	-24/+32
\| \| \| \|
\| \| * \|	Update debugging guide to use byebug	David Rodríguez de Dios	2014-04-08	1	-177/+246
\| \| \| \|
\| \| * \|	Update Gemfile templates to provide correct debugger	David Rodríguez de Dios	2014-04-08	4	-7/+21
\| \| \| \|
\| \| * \|	Keep debugger support only for rubies < 2.0.0	David Rodríguez de Dios	2014-04-08	6	-12/+31
\| \| \| \|
\| * \| \|	Fix version indicator on guides and link to Rails 4.0 [ci skip]	Rafael Mendonça França	2014-04-11	1	-1/+4
\| \| \| \|
\| * \| \|	Merge pull request #14689 from matthewd/asset_initializer	Rafael Mendonça França	2014-04-11	6	-11/+24
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \|	Move assets precompile (and version) to an initializer
\| \| * \| \|	Move assets precompile (and version) to an initializer	Matthew Draper	2014-04-11	6	-11/+24
\| \| \| \|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	sprockets-rails 2.1 needs the precompile list to be available in all environments.
\| * \| \|	Add CHANGELOG entry for #14619 [ci skip]	Rafael Mendonça França	2014-04-11	1	-0/+4
\| \| \| \|
\| * \| \|	Merge pull request #14619 from winston/enhance-routing-error-html	Rafael Mendonça França	2014-04-11	1	-63/+119
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Enhance routing error html page
\| \| * \| \|	Split search results into 'exact matches' and 'fuzzy matches'.	Winston	2014-04-11	1	-60/+96
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- also refactored the javascript.
\| \| * \| \|	Improve CSS styling for routing error html page.	Winston	2014-04-11	1	-7/+25
\| \| \| \| \|
\| \| * \| \|	Implement fuzzy matching for route search on routing error html page.	Winston	2014-04-11	1	-8/+10
\| \| \| \| \|
\| * \| \| \|	Merge pull request #14707 from minio-sk/fix-issue-14702	Rafael Mendonça França	2014-04-11	1	-0/+2
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Be explicit about allowed constraint values, fixes #14702
\| \| * \| \| \|	Be explicit about allowed constraint values, fixes #14702	Jano Suchal	2014-04-11	1	-0/+2
\| \| \| \| \| \|
\| * \| \| \| \|	Merge pull request #14692 from senny/pg/reload_type_map_for_unknown_types	Yves Senn	2014-04-11	8	-16/+74
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	PostgreSQL automatic type map reload
\| \| * \| \| \| \|	PostgreSQL, warn once per connection per missing OID. Closes #14275.	Yves Senn	2014-04-11	3	-2/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[Yves Senn & Matthew Draper]
\| \| * \| \| \| \|	PostgreSQL, adapter automatically reloads it's type map. Closes #14678.	Yves Senn	2014-04-11	8	-16/+57
\| \| \| \|/ / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[Yves Senn & Matthew Draper]
\| * \| \| \| \|	Merge pull request #14705 from akshay-vishnoi/doc_changes	Rafael Mendonça França	2014-04-11	4	-0/+8
\| \|\ \ \ \ \ \| \| \|_\|/ / / \| \|/\| \| \| \|	Add more test case for #demodulize, Improve documentation
\| \| * \| \| \|	Add more test case for #demodulize, Improve documentation	Akshay Vishnoi	2014-04-11	4	-0/+8
\| \| \| \| \| \|
\| * \| \| \| \|	Merge pull request #14684 from Futurelearn/jc-deep-nested-shallow-url-helper-bug	Andrew White	2014-04-11	3	-3/+40
\| \|\ \ \ \ \ \| \| \|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \|	Add a failing test for a URL helper that was broken by a6b9ea2.
\| \| * \| \| \|	Only make deeply nested routes shallow when parent is shallow	Andrew White	2014-04-11	2	-3/+22
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Since `:shallow` may be set at any point in the resource nesting we should only make the new and collection routes shallow when the parent is shallow. This is a bit of a hack but until the mapper is refactored to an object graph instead of a hash of merged values it's the best we can do. Fixes #14684.
\| \| * \| \| \|	Add a failing test for a URL helper that was broken by a6b9ea2.	James Coglan	2014-04-10	1	-0/+18
\| \| \| \|/ / \| \| \|/\| \|
\| * \| \| \|	docs, make association `autosave: true` examples runnable. Closes #14700	Yves Senn	2014-04-11	1	-6/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip] The examples are written in a way you expect them to be executable. However one snippet assumed there to be two comments when only one was created above. The defined models did not extend `ActiveRecord::Base` The example used `comments.last.mark_for_destruction`. This does no longer load the whole collection but just the last record. It is then refetcht on subsequent calls to `last`. This breaks the example.
\| * \| \| \|	Merge pull request #12829 from iantropov/issue_insert_via_hmt_scope_3548	Rafael Mendonça França	2014-04-10	6	-4/+32
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix insertion of records for hmt association with scope Conflicts: activerecord/CHANGELOG.md
\| \| * \| \| \|	Fix insertion of records for hmt association with scope, fix #3548	Ivan Antropov	2013-11-17	6	-4/+32
\| \| \| \| \| \|
\| * \| \| \| \|	Merge pull request #14694 from heironimus/callback_guide	Rafael Mendonça França	2014-04-10	1	-0/+3
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add after_commit/after_rollback to callback list
\| \| * \| \| \| \|	Add after_commit/after_rollback to callback list	Kyle Heironimus	2014-04-10	1	-0/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adding after_commit/after_rollback to list of callbacks in order helps explain the callback order as well as making it consistent with the API docs at http://api.rubyonrails.org/classes/ActiveRecord/Callbacks.html
\| * \| \| \| \| \|	Merge pull request #14695 from akshay-vishnoi/doc_changes	Rafael Mendonça França	2014-04-10	1	-14/+1
\| \|\ \ \ \ \ \ \| \| \|/ / / / / \| \|/\| \| \| / / \| \| \| \|_\|/ / \| \| \|/\| \| \|	[ci skip] Remove false documentation
\| \| * \| \| \|	[ci skip] Remove false documentation	Akshay Vishnoi	2014-04-11	1	-14/+1
\| \|/ / / /
\| * \| \| \|	Remove warning of unused variable	Rafael Mendonça França	2014-04-10	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Merge branch 'rm-uuid-fixtures'	Rafael Mendonça França	2014-04-10	13	-10/+149
\| \|\ \ \ \
\| \| * \| \| \|	No need to call send	Rafael Mendonça França	2014-04-10	1	-1/+1
\| \| \| \| \| \|
\| \| * \| \| \|	Merge branch 'master' into rm-uuid-fixtures	Rafael Mendonça França	2014-04-10	79	-287/+783
\| \| \|\ \ \ \ \| \| \|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: activerecord/CHANGELOG.md activesupport/CHANGELOG.md
\| * \| \| \| \|	Require action_controller before any other action_controller file	Rafael Mendonça França	2014-04-10	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This will load properly the loading hooks. Closes rails/sass-rails#205
\| * \| \| \| \|	Merge pull request #11656 from emre-basala/xml_mini_test	Rafael Mendonça França	2014-04-10	1	-1/+58
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add tests to ActiveSupport:XmlMini to_tag method
\| \| * \| \| \| \|	Add tests to ActiveSupport:XmlMini to_tag method	emre-basala	2013-08-07	1	-1/+58
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge pull request #14677 from JuanitoFatas/update-initialization-code-snippets	Rafael Mendonça França	2014-04-10	1	-53/+102
\| \|\ \ \ \ \ \ \| \| \|_\|_\|_\|/ / \| \|/\| \| \| \| \|	[ci skip] Update code snippets to latest master (initialization.md).
\| \| * \| \| \| \|	[ci skip] Update code snippets to latest master (initialization.md).	Juanito Fatas	2014-04-10	1	-53/+102
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also update the `server.run` example (Replace Mongrel with Puma).
\| * \| \| \| \| \|	Merge pull request #14679 from pbharadiya/master	Yves Senn	2014-04-10	1	-1/+1
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Correct factual error for page not found [ci skip]
\| \| * \| \| \| \| \|	Correct factual error for page not found	Parth Bharadiya	2014-04-10	1	-1/+1
\| \|/ / / / / /
\| * / / / / /	+EOL	Akira Matsuda	2014-04-10	1	-1/+1
\| \|/ / / / /
\| * \| \| \| \|	Merge pull request #11411 from dscataglini/master	Aaron Patterson	2014-04-09	1	-6/+12
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Active support callback's before/after/around filters are not correctly making their singleton methods private
\| \| * \| \| \| \|	private method doesn't work for singleton methods defined this way	Diego Scataglini	2013-07-12	1	-6/+12
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Only call uniq on the conditional that actually needs it	Carlos Antonio da Silva	2014-04-09	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Remove extra collect call	Carlos Antonio da Silva	2014-04-09	1	-1/+1
\| \| \| \| \| \| \|