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

	Commit message (Collapse)	Author	Age	Files	Lines
...
\| * \| \| \| \| \| \| \|	No need to override the to_yaml method in BigDecimal	Rafael Mendonça França	2012-01-04	1	-15/+0
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	No need to use rescue block to require psych	Rafael Mendonça França	2012-01-04	9	-69/+30
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	No need to check if YAML::ENGINE is defined since ruby 1.9 does that	Rafael Mendonça França	2012-01-04	5	-5/+5
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #4299 from Karunakar/logger	Aaron Patterson	2012-01-04	1	-2/+2
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \|	using the active support logger
\| * \| \| \| \| \| \| \|	using the active support logger	Karunakar (Ruby)	2012-01-04	1	-2/+2
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge pull request #4289 from rafaelfranca/patch-1	Santiago Pastorino	2012-01-04	3	-2/+10
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \|	No need of html_safe here
\| * \| \| \| \| \| \|	Whitespaces :scissors:	Rafael Mendonça França	2012-01-04	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Make sure that check_box helper return a safe buffer	Rafael Mendonça França	2012-01-04	1	-0/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Add test to make sure that add two safe buffers always return a safe buffer	Rafael Mendonça França	2012-01-04	1	-0/+7
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	No need of html_safe here	Rafael Mendonça França	2012-01-04	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	tag helper always return a html safe string and concat two html safe strings always return a html safe string
* \| \| \| \| \| \| \|	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2012-01-04	2	-75/+112
\|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	copy edits	Vijay Dev	2012-01-04	1	-10/+7
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge branch 'master' of github.com:lifo/docrails	Pablo Ifran	2012-01-02	30	-240/+570
\| \|\ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \|	General editing pass over assets pipeline guide	Mike Gunderloy	2011-12-31	1	-56/+58
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	improve doc in number helper options	Pablo Ifran	2012-01-02	1	-19/+57
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	updates to 3.2 release notes	Vijay Dev	2012-01-04	1	-1/+8
\| \|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	create_fixtures should accept symbol keys for custom table -> class ↵	Jeremy Kemper	2012-01-03	2	-4/+14
\| \|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	mappings. Fixes an unintended regression.
* \| \| \| \| \| \| \|	Merge pull request #4286 from kennyj/fix_4285	José Valim	2012-01-03	2	-1/+7
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix GH #4285. Remove options when we record calling creat_table
\| * \| \| \| \| \| \| \|	Fix GH #4285. Remove options when we record calling creat_table	kennyj	2012-01-04	2	-1/+7
\|/ / / / / / / /
* \| \| \| \| \| \| \|	use File.basename to get the filename minus .yml	Aaron Patterson	2012-01-03	1	-2/+3
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	setup_fixture_accessors should accept symbols for table names. Fixes an ↵	Jeremy Kemper	2012-01-03	2	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	unintended (and untested) regression.
* \| \| \| \| \| \| \|	Merge pull request #2955 from dmitry/master	Aaron Patterson	2012-01-03	5	-9/+19
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Polymorphic with optimistic lock and counter cache should be destroyed
\| * \| \| \| \| \| \| \|	Removed metaclass from the has_many dependency destroy method. Fixes #2954	Dmitry Polushkin	2011-12-31	2	-8/+5
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge branch 'master' of git://github.com/rails/rails	Dmitry Polushkin	2011-12-31	795	-28340/+35803
\| \|\ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \	Merge branch 'master' of git://github.com/rails/rails	Dmitry Polushkin	2011-10-05	62	-374/+686
\| \|\ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \	Merge branch 'master' of git://github.com/rails/rails	Dmitry Polushkin	2011-10-01	123	-668/+1492
\| \|\ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \	Merge branch 'master' of git://github.com/rails/rails	Dmitry Polushkin	2011-09-15	190	-825/+2362
\| \|\ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \|	Test polymorphic record with optimistic locking and counter cache should be ↵	Dmitry Polushkin	2011-09-09	3	-1/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	destoyed without catching the ActiveRecord::StaleObjectError.
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #4283 from lest/fix-singleton-checking	Aaron Patterson	2012-01-03	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	use correct variant of checking whether class is a singleton
\| * \| \| \| \| \| \| \| \| \| \| \| \|	use correct variant of checking whether class is a singleton	Sergey Nartimov	2012-01-03	1	-1/+1
\|/ / / / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \| \|	Pass extensions to javascript_path and stylesheet_path helpers. Closes #3417	Santiago Pastorino	2012-01-03	2	-2/+8
\| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	Override respond_to? since we are also overriding method_missing.	José Valim	2012-01-03	2	-0/+11
\| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	Clean up routes inclusion and add some comments for the next soul that ↵	José Valim	2012-01-03	4	-60/+49
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	decides to adventure on this code.
* \| \| \| \| \| \| \| \| \| \| \| \|	Add font_path helper method	Santiago Pastorino	2012-01-03	6	-0/+41
\| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	actually disconnect from the database at the end of each test	Aaron Patterson	2012-01-03	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #4274 from joneslee85/changelog-fix	Aaron Patterson	2012-01-03	1	-114/+122
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix typos and formats for CHANGELOG
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Fix typos and formats for CHANGELOG	Trung Lê	2012-01-04	1	-114/+122
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #4279 from lest/fix-log	Aaron Patterson	2012-01-03	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	do not rewrite log during application bootstrap
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	do not rewrite log during application bootstrap	Sergey Nartimov	2012-01-03	1	-1/+1
\| \| \|_\|_\|_\|_\|_\|_\|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #4278 from kennyj/fix_rdoc_generating_problem	Santiago Pastorino	2012-01-03	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	Use -e option instead of -c option (rake rdoc task).
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Use -e option instead of -c option (rake rdoc task).	kennyj	2012-01-04	1	-1/+1
\|/ / / / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #4265 from laserlemon/patch-1	Vijay Dev	2012-01-03	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix grammatical error
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Fix grammatical error in ↵	Steve Richert	2012-01-02	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ActiveModel::MassAssignmentSecurity::PermissionSet#deny? NotImplementedError message
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Rails::Plugin has gone	Santiago Pastorino	2012-01-03	37	-1186/+30
\| \|_\|_\|_\|_\|_\|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #4272 from apotonick/ac-process-rebase	José Valim	2012-01-03	2	-25/+74
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ac process rebase
\| * \| \| \| \| \| \| \| \| \| \| \| \|	moving test_test.rb to test_case_test.rb for consistency.	Nick Sutterer	2012-01-03	1	-0/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \|	allow sending documents in AC::TestCase#post and friends.	Nick Sutterer	2012-01-03	2	-25/+74
\|/ / / / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #4250 from lest/range-json	Xavier Noria	2012-01-02	2	-0/+8
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	use #to_s to convert Range to json
\| * \| \| \| \| \| \| \| \| \| \| \| \|	use #to_s to convert Range to json	Sergey Nartimov	2012-01-01	2	-0/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #4266 from lest/deprecate-activesupport-base64	José Valim	2012-01-02	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix base64 require