aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* use File.basename to get the filename minus .ymlAaron Patterson2012-01-031-2/+3
|
* setup_fixture_accessors should accept symbols for table names. Fixes an ↵Jeremy Kemper2012-01-032-1/+2
| | | | unintended (and untested) regression.
* Merge pull request #2955 from dmitry/masterAaron Patterson2012-01-035-9/+19
|\ | | | | Polymorphic with optimistic lock and counter cache should be destroyed
| * Removed metaclass from the has_many dependency destroy method. Fixes #2954Dmitry Polushkin2011-12-312-8/+5
| |
| * Merge branch 'master' of git://github.com/rails/railsDmitry Polushkin2011-12-31795-28340/+35803
| |\
| * \ Merge branch 'master' of git://github.com/rails/railsDmitry Polushkin2011-10-0562-374/+686
| |\ \
| * \ \ Merge branch 'master' of git://github.com/rails/railsDmitry Polushkin2011-10-01123-668/+1492
| |\ \ \
| * \ \ \ Merge branch 'master' of git://github.com/rails/railsDmitry Polushkin2011-09-15190-825/+2362
| |\ \ \ \
| * | | | | Test polymorphic record with optimistic locking and counter cache should be ↵Dmitry Polushkin2011-09-093-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | destoyed without catching the ActiveRecord::StaleObjectError.
* | | | | | Merge pull request #4283 from lest/fix-singleton-checkingAaron Patterson2012-01-031-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | use correct variant of checking whether class is a singleton
| * | | | | | use correct variant of checking whether class is a singletonSergey Nartimov2012-01-031-1/+1
|/ / / / / /
* | | | | | Pass extensions to javascript_path and stylesheet_path helpers. Closes #3417Santiago Pastorino2012-01-032-2/+8
| | | | | |
* | | | | | Override respond_to? since we are also overriding method_missing.José Valim2012-01-032-0/+11
| | | | | |
* | | | | | Clean up routes inclusion and add some comments for the next soul that ↵José Valim2012-01-034-60/+49
| | | | | | | | | | | | | | | | | | | | | | | | decides to adventure on this code.
* | | | | | Add font_path helper methodSantiago Pastorino2012-01-036-0/+41
| | | | | |
* | | | | | actually disconnect from the database at the end of each testAaron Patterson2012-01-031-2/+2
| | | | | |
* | | | | | Merge pull request #4274 from joneslee85/changelog-fixAaron Patterson2012-01-031-114/+122
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix typos and formats for CHANGELOG
| * | | | | | Fix typos and formats for CHANGELOGTrung Lê2012-01-041-114/+122
| | | | | | |
* | | | | | | Merge pull request #4279 from lest/fix-logAaron Patterson2012-01-031-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | do not rewrite log during application bootstrap
| * | | | | | | do not rewrite log during application bootstrapSergey Nartimov2012-01-031-1/+1
| | | | | | | |
* | | | | | | | Merge pull request #4278 from kennyj/fix_rdoc_generating_problemSantiago Pastorino2012-01-031-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Use -e option instead of -c option (rake rdoc task).
| * | | | | | | Use -e option instead of -c option (rake rdoc task).kennyj2012-01-041-1/+1
|/ / / / / / /
* | | | | | | Merge pull request #4265 from laserlemon/patch-1Vijay Dev2012-01-031-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix grammatical error
| * | | | | | | Fix grammatical error in ↵Steve Richert2012-01-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ActiveModel::MassAssignmentSecurity::PermissionSet#deny? NotImplementedError message
* | | | | | | | Rails::Plugin has goneSantiago Pastorino2012-01-0337-1186/+30
| | | | | | | |
* | | | | | | | Merge pull request #4272 from apotonick/ac-process-rebaseJosé Valim2012-01-032-25/+74
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Ac process rebase
| * | | | | | | | moving test_test.rb to test_case_test.rb for consistency.Nick Sutterer2012-01-031-0/+0
| | | | | | | | |
| * | | | | | | | allow sending documents in AC::TestCase#post and friends.Nick Sutterer2012-01-032-25/+74
|/ / / / / / / /
* | | | | | | | Merge pull request #4250 from lest/range-jsonXavier Noria2012-01-022-0/+8
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | use #to_s to convert Range to json
| * | | | | | | | use #to_s to convert Range to jsonSergey Nartimov2012-01-012-0/+8
| | | | | | | | |
* | | | | | | | | Merge pull request #4266 from lest/deprecate-activesupport-base64José Valim2012-01-021-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | fix base64 require
| * | | | | | | | | fix base64 requireSergey Nartimov2012-01-031-1/+1
|/ / / / / / / / /
* | | | | | | | | Merge pull request #4252 from lest/deprecate-activesupport-base64José Valim2012-01-0212-63/+35
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | remove ActiveSupport::Base64 in favor of ::Base64
| * | | | | | | | remove ActiveSupport::Base64 in favor of ::Base64Sergey Nartimov2012-01-0212-63/+35
| |/ / / / / / /
* | | | | | | | Merge pull request #4253 from lest/remove-warningsJosé Valim2012-01-021-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | fix use of FormBuilder.field_helpers
| * | | | | | | | fix use of FormBuilder.field_helpersSergey Nartimov2012-01-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | it is array of symbols now
* | | | | | | | | Merge pull request #4263 from bogdan/local_gemfileJosé Valim2012-01-021-1/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Fixed path to local gemfile.
| * | | | | | | | | Fixed path to local gemfile.Bogdan Gusiev2012-01-021-1/+2
|/ / / / / / / / /
* | | | | | | | | Merge pull request #4251 from castlerock/rename_ruby_debug_to_ruby_debug19José Valim2012-01-014-6/+6
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | rename ruby-debug to ruby-debug19
| * | | | | | | | rename ruby-debug to ruby-debug19Vishnu Atrai2012-01-014-6/+6
| |/ / / / / / /
* / / / / / / / fix a warning about grouped expressionsVijay Dev2012-01-011-1/+1
|/ / / / / / /
* | | | | | | Merge pull request #4248 from andrew/2012Vijay Dev2011-12-3115-15/+15
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Updated copyright notices for 2012
| * | | | | | | Updated copyright notices for 2012Andrew Nesbitt2011-12-3115-15/+15
| | | | | | | |
* | | | | | | | DRY up guides index pageVijay Dev2011-12-313-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_MiniTestSantiago Pastorino2011-12-311-9/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | MiniTest condition removed
| * | | | | | | | MiniTest condition removedVishnu Atrai2011-12-311-9/+3
| | | | | | | | |
* | | | | | | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2011-12-313-20/+18
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | remove wiki linkVijay Dev2011-12-311-1/+0
| | | | | | | | | |
| * | | | | | | | | fix a couple of formatting issuesVijay Dev2011-12-311-3/+2
| | | | | | | | | |
| * | | | | | | | | Minor readability improvementsSam Umbach2011-12-301-13/+13
| | | | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-17 16:30:26 +0000