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

	Commit message (Collapse)	Author	Age	Files	Lines
...
* \| \| \|	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
\| * \| \| \| \| \| \| \| \| \| \|	fix base64 require	Sergey Nartimov	2012-01-03	1	-1/+1
\|/ / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #4252 from lest/deprecate-activesupport-base64	José Valim	2012-01-02	12	-63/+35
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \|	remove ActiveSupport::Base64 in favor of ::Base64
\| * \| \| \| \| \| \| \| \| \|	remove ActiveSupport::Base64 in favor of ::Base64	Sergey Nartimov	2012-01-02	12	-63/+35
\| \|/ / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge pull request #4253 from lest/remove-warnings	José Valim	2012-01-02	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix use of FormBuilder.field_helpers
\| * \| \| \| \| \| \| \| \| \|	fix use of FormBuilder.field_helpers	Sergey Nartimov	2012-01-02	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	it is array of symbols now
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #4263 from bogdan/local_gemfile	José Valim	2012-01-02	1	-1/+2
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed path to local gemfile.
\| * \| \| \| \| \| \| \| \| \| \|	Fixed path to local gemfile.	Bogdan Gusiev	2012-01-02	1	-1/+2
\|/ / / / / / / / / / /
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #4251 from castlerock/rename_ruby_debug_to_ruby_debug19	José Valim	2012-01-01	4	-6/+6
\|\ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \|	rename ruby-debug to ruby-debug19
\| * \| \| \| \| \| \| \| \| \|	rename ruby-debug to ruby-debug19	Vishnu Atrai	2012-01-01	4	-6/+6
\| \|/ / / / / / / / /
* / / / / / / / / /	fix a warning about grouped expressions	Vijay Dev	2012-01-01	1	-1/+1
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge pull request #4248 from andrew/2012	Vijay Dev	2011-12-31	15	-15/+15
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Updated copyright notices for 2012
\| * \| \| \| \| \| \| \| \|	Updated copyright notices for 2012	Andrew Nesbitt	2011-12-31	15	-15/+15
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	DRY up guides index page	Vijay Dev	2011-12-31	3	-48/+21
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use the list of guides available in documents.yaml to fill in the menu in the index page instead of duplicating the list again. Also, remove WIP guides from the menu.
* \| \| \| \| \| \| \| \| \|	Merge pull request #4242 from castlerock/remove_condition_for_MiniTest	Santiago Pastorino	2011-12-31	1	-9/+3
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \|	MiniTest condition removed
\| * \| \| \| \| \| \| \| \|	MiniTest condition removed	Vishnu Atrai	2011-12-31	1	-9/+3
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2011-12-31	3	-20/+18
\|\ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \|	remove wiki link	Vijay Dev	2011-12-31	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	fix a couple of formatting issues	Vijay Dev	2011-12-31	1	-3/+2
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Minor readability improvements	Sam Umbach	2011-12-30	1	-13/+13
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	SCSS processor is provided by the sass gem	Sam Umbach	2011-12-30	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Fixed documentation error in code examples from form_tag_helper.rb	Alejandro Andrés	2011-12-30	1	-2/+2
\| \| \|_\|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \|