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

	Commit message (Collapse)	Author	Age	Files	Lines
...
* \| \| \| \| \| \| \|	Merge pull request #5690 from nertzy/remove_naming_deprecation_include	José Valim	2012-04-01	1	-1/+0
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't include deprecation in ActiveModel::Naming anymore
\| * \| \| \| \| \| \| \|	Don't include deprecation in AM::Naming anymore	Grant Hutchins	2012-03-31	1	-1/+0
\| \|/ / / / / / /
* \| \| \| \| \| \| \|	Merge pull request #5692 from avakhov/force-ssl-if-test	José Valim	2012-04-01	1	-0/+23
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \|	Tests :if option of force_ssl method
\| * \| \| \| \| \| \|	Tests :if option of force_ssl method	Alexey Vakhov	2012-04-01	1	-0/+23
\|/ / / / / / /
* \| \| \| \| \| \|	use undef_method to avoid NameError exceptions all the time	Aaron Patterson	2012-03-31	1	-5/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Remove not needed requires	Santiago Pastorino	2012-03-31	2	-2/+0
\| \|/ / / / / \|/\| \| \| \| \|
* \| \| \| \| \|	Merge pull request #5683 from arunagw/buffered_logger_test	Santiago Pastorino	2012-03-31	1	-3/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	No more BufferedLogger so it can be LoggerTest
\| * \| \| \| \| \|	no more deprecation required.	Arun Agrawal	2012-03-31	1	-2/+0
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	No more BufferedLogger so it can be LoggerTest	Arun Agrawal	2012-03-31	1	-1/+1
\|/ / / / / /
* \| \| \| \| \|	Merge pull request #5679 from arunagw/warning_removed_master	Vijay Dev	2012-03-31	1	-1/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	warning removed: (...) interpreted as grouped expression
\| * \| \| \| \| \|	warning removed: (...) interpreted as grouped expression	Arun Agrawal	2012-03-31	1	-1/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #5664 from lest/patch-1	Piotr Sarnacki	2012-03-31	1	-2/+2
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	use `symbolize_keys` instead of `dup.symbolize_keys!`
\| * \| \| \| \| \| \|	use `symbolize_keys` instead of `dup.symbolize_keys!`	Sergey Nartimov	2012-03-30	1	-2/+2
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #5674 from avakhov/ac-exception-remove-obsolete-member	Santiago Pastorino	2012-03-31	1	-2/+0
\|\ \ \ \ \ \ \ \ \| \|_\|/ / / / / / \|/\| \| \| \| \| \| \|	Remove obsolete reader from AC::MethodNotAllowed exception class
\| * \| \| \| \| \| \|	Remove obsolete reader from AC::MethodNotAllowed exception class	Alexey Vakhov	2012-03-31	1	-2/+0
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	use tsort_each to avoid intermediary array	Aaron Patterson	2012-03-30	1	-1/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #4911 from Floppy/master	Aaron Patterson	2012-03-30	2	-1/+11
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \|	Reduce FILENAME_MAX_SIZE in ActiveSupport::Cache::FileStore
\| * \| \| \| \| \| \|	Change FILENAME_MAX_SIZE in FileStore to 228.	James Smith	2012-02-06	2	-1/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In order that temp filenames generated from it will fit in 255 chars. See https://github.com/rails/rails/issues/4907
* \| \| \| \| \| \| \|	Merge pull request #5673 from avakhov/ac-render-exception	Piotr Sarnacki	2012-03-30	1	-3/+0
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove AC::RenderError class second declaration
\| * \| \| \| \| \| \| \|	Remove AC::RenderError class second declaration	Alexey Vakhov	2012-03-31	1	-3/+0
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Fix #5667. Preloading should ignore scoping.	Jon Leighton	2012-03-30	2	-2/+14
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Remove the leading \n added by textarea on assert_select	Santiago Pastorino	2012-03-30	3	-0/+10
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	clear up duplication between Persistence#destroy and Locking#destroy	Jon Leighton	2012-03-30	2	-27/+34
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	fix test	Jon Leighton	2012-03-30	1	-1/+2
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	whitespace :scissors:	Jon Leighton	2012-03-30	2	-5/+4
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #5334 from courtland/master	Jon Leighton	2012-03-30	5	-1/+27
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix deleting from a HABTM join table upon destroying an object of a model with optimistic locking enabled.
\| * \| \| \| \| \| \| \|	Tests for removing a HABTM association when optimistic locking is enabled.	Nick Rogers	2012-03-07	4	-1/+25
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Fix deleting from a HABTM join table upon destroying an object of a model ↵	Nick Rogers	2012-03-07	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	with optimistic locking enabled. Issue #5332.
* \| \| \| \| \| \| \| \|	Merge pull request #5668 from ↵	José Valim	2012-03-30	4	-0/+32
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	plashchynski/validate_attribute_name_in_class_and_module_attribute_accessors validate attribute names in class and module attribute accessors
\| * \| \| \| \| \| \| \| \|	validate attribute names in class and module attribute accessors	Dmitry Plashchynski	2012-03-30	4	-0/+32
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	fix typo. thanks @nertzy	Jon Leighton	2012-03-30	1	-1/+1
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Update guides to reflect 0a12a5f8169685915cbb7bf4d0a7bb482f7f2fd2	Jon Leighton	2012-03-30	1	-20/+10
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	remove irrelevant references to ARel	Jon Leighton	2012-03-30	1	-2/+2
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Add Relation#find_by and Relation#find_by!	Jon Leighton	2012-03-30	6	-0/+114
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #2945 from Casecommons/nested_attributes_module	Jon Leighton	2012-03-30	3	-1/+15
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Nested attribute setters can be overridden.
\| * \| \| \| \| \| \| \| \|	Nested attribute setters can be overridden.	Jonathan Mukai & Peter Jaros	2012-03-28	3	-1/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Overriding implementation can call super.
* \| \| \| \| \| \| \| \| \|	recurse in read_attribute we get caching / don't duplicate code	Jon Leighton	2012-03-30	1	-3/+2
\| \|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #5661 from carlosantoniodasilva/ar-pk-typecast	Aaron Patterson	2012-03-29	3	-5/+8
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Typecast 'id' attribute in read_attribute when using custom pks
\| * \| \| \| \| \| \| \| \|	Deprecate Column#type_cast_code	Carlos Antonio da Silva	2012-03-29	2	-4/+4
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Properly typecast id attribute when using custom primary key	Carlos Antonio da Silva	2012-03-29	1	-1/+4
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge pull request #5345 from guilleiguaran/ar-slice	Jeremy Kemper	2012-03-29	3	-0/+23
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	post.slice(:title, :content) # => { title: "Hello", content: "World" }
\| * \| \| \| \| \| \| \| \|	CHANGELOG entry for AR#slice	Guillermo Iguaran	2012-03-29	1	-0/+5
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Add ActiveRecord::Base#slice to slice method calls	Guillermo Iguaran	2012-03-29	2	-0/+18
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge pull request #5617 from Empact/paths	Aaron Patterson	2012-03-29	2	-9/+1
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Spring cleaning in Rails::Paths
\| * \| \| \| \| \| \| \| \|	Define Paths::Root#[]= in terms of #add.	Ben Woosley	2012-03-29	1	-2/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Drop Paths::Root initializer check of #path as it isn't checked in the ↵	Ben Woosley	2012-03-29	2	-5/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	#path= or anywhere else
\| * \| \| \| \| \| \| \| \|	Drop unnecessary require in Rails::Paths	Ben Woosley	2012-03-29	1	-2/+0
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge pull request #5625 from ↵	José Valim	2012-03-28	7	-15/+88
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	nertzy/prefix_partial_path_with_controller_namespace Add config option to turn off prefixing partial path with controller namespace
\| * \| \| \| \| \| \| \| \|	Make controller namespace partial prefix optional	Grant Hutchins	2012-03-28	7	-11/+84
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	config.action_view.prefix_partial_path_with_controller_namespace This allows you to choose to render @post using /posts/_post.erb instead of /admin/posts/_post.erb inside Admin::PostsController.
\| * \| \| \| \| \| \| \| \|	Test that render gets correct exact template name	Grant Hutchins	2012-03-28	1	-4/+4
\| \| \|_\|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \|