Commit Graph

27200 Commits

Author SHA1 Message Date
Vijay Dev
52303019cb updates to 3.2 release notes 2012-01-04 20:10:16 +05:30
Jeremy Kemper
78372b6cbb create_fixtures should accept symbol keys for custom table -> class mappings. Fixes an unintended regression. 2012-01-03 22:50:08 -07:00
José Valim
4b81007acf Merge pull request #4286 from kennyj/fix_4285
Fix GH #4285. Remove options when we record calling creat_table
2012-01-03 20:50:58 -08:00
kennyj
28afb01fe3 Fix GH #4285. Remove options when we record calling creat_table 2012-01-04 10:25:15 +09:00
Aaron Patterson
00c5342d96 use File.basename to get the filename minus .yml 2012-01-03 14:54:29 -08:00
Jeremy Kemper
508493ca45 setup_fixture_accessors should accept symbols for table names. Fixes an unintended (and untested) regression. 2012-01-03 15:22:10 -07:00
Aaron Patterson
7985f64e25 Merge pull request #2955 from dmitry/master
Polymorphic with optimistic lock and counter cache should be destroyed
2012-01-03 14:02:47 -08:00
Aaron Patterson
d1230a8cd0 Merge pull request #4283 from lest/fix-singleton-checking
use correct variant of checking whether class is a singleton
2012-01-03 13:10:11 -08:00
Sergey Nartimov
2f8a7edadb use correct variant of checking whether class is a singleton 2012-01-03 23:44:56 +03:00
Santiago Pastorino
cbe918093b Pass extensions to javascript_path and stylesheet_path helpers. Closes #3417 2012-01-03 17:50:24 -02:00
José Valim
180edc84f1 Override respond_to? since we are also overriding method_missing. 2012-01-03 20:26:45 +01:00
José Valim
49b6b4994e Clean up routes inclusion and add some comments for the next soul that decides to adventure on this code. 2012-01-03 20:09:11 +01:00
Santiago Pastorino
439d3407ea Add font_path helper method 2012-01-03 17:08:10 -02:00
Aaron Patterson
41be0fc3df actually disconnect from the database at the end of each test 2012-01-03 11:06:27 -08:00
Aaron Patterson
29f0f254d2 Merge pull request #4274 from joneslee85/changelog-fix
Fix typos and formats for CHANGELOG
2012-01-03 09:36:24 -08:00
Aaron Patterson
632995c3e8 Merge pull request #4279 from lest/fix-log
do not rewrite log during application bootstrap
2012-01-03 09:30:50 -08:00
Sergey Nartimov
7826878620 do not rewrite log during application bootstrap 2012-01-03 20:13:24 +03:00
Santiago Pastorino
36e77fe0c2 Merge pull request #4278 from kennyj/fix_rdoc_generating_problem
Use -e option instead of -c option (rake rdoc task).
2012-01-03 08:03:47 -08:00
kennyj
2ddfbbc3b6 Use -e option instead of -c option (rake rdoc task). 2012-01-04 00:54:41 +09:00
Vijay Dev
9f76659bb8 Merge pull request #4265 from laserlemon/patch-1
Fix grammatical error
2012-01-03 06:19:52 -08:00
Trung Lê
84054a7d16 Fix typos and formats for CHANGELOG 2012-01-04 00:09:11 +11:00
Santiago Pastorino
dad7fdc573 Rails::Plugin has gone 2012-01-03 10:39:08 -02:00
José Valim
b627923b3c Merge pull request #4272 from apotonick/ac-process-rebase
Ac process rebase
2012-01-03 03:23:03 -08:00
Nick Sutterer
50d23bc2bd moving test_test.rb to test_case_test.rb for consistency. 2012-01-03 11:50:03 +01:00
Nick Sutterer
5b9708840f allow sending documents in AC::TestCase#post and friends. 2012-01-03 11:43:54 +01:00
Xavier Noria
e04232e904 Merge pull request #4250 from lest/range-json
use #to_s to convert Range to json
2012-01-02 13:53:52 -08:00
José Valim
6de1b2ad89 Merge pull request #4266 from lest/deprecate-activesupport-base64
fix base64 require
2012-01-02 13:11:37 -08:00
Sergey Nartimov
634c03403d fix base64 require 2012-01-03 00:07:50 +03:00
José Valim
44df252382 Merge pull request #4252 from lest/deprecate-activesupport-base64
remove ActiveSupport::Base64 in favor of ::Base64
2012-01-02 11:54:00 -08:00
Sergey Nartimov
0f2f8003d2 remove ActiveSupport::Base64 in favor of ::Base64 2012-01-02 22:48:15 +03:00
Steve Richert
5de4545dde Fix grammatical error in ActiveModel::MassAssignmentSecurity::PermissionSet#deny? NotImplementedError message 2012-01-02 14:45:09 -05:00
José Valim
deaa68281c Merge pull request #4253 from lest/remove-warnings
fix use of FormBuilder.field_helpers
2012-01-02 11:19:29 -08:00
Sergey Nartimov
1c0eece9eb fix use of FormBuilder.field_helpers
it is array of symbols now
2012-01-02 22:14:50 +03:00
José Valim
4d844c536f Merge pull request #4263 from bogdan/local_gemfile
Fixed path to local gemfile.
2012-01-02 11:01:37 -08:00
Bogdan Gusiev
c4ceee8316 Fixed path to local gemfile. 2012-01-02 15:08:37 +02:00
José Valim
6f44fa0a8a Merge pull request #4251 from castlerock/rename_ruby_debug_to_ruby_debug19
rename ruby-debug to ruby-debug19
2012-01-01 10:35:28 -08:00
Vijay Dev
881ca628b0 fix a warning about grouped expressions 2012-01-01 23:01:28 +05:30
Sergey Nartimov
dc05914be7 use #to_s to convert Range to json 2012-01-01 20:16:10 +03:00
Vishnu Atrai
423dd88d62 rename ruby-debug to ruby-debug19 2012-01-01 22:40:23 +05:30
Vijay Dev
f3e079e8b5 Merge pull request #4248 from andrew/2012
Updated copyright notices for 2012
2011-12-31 12:48:19 -08:00
Andrew Nesbitt
1b413510fe Updated copyright notices for 2012 2011-12-31 20:30:08 +00:00
Vijay Dev
b5927b8237 DRY up guides index page
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.
2011-12-31 22:59:16 +05:30
Santiago Pastorino
d3a2c0e183 Merge pull request #4242 from castlerock/remove_condition_for_MiniTest
MiniTest condition removed
2011-12-31 09:13:40 -08:00
Vijay Dev
86705b60a3 Merge branch 'master' of github.com:lifo/docrails 2011-12-31 19:08:46 +05:30
Vijay Dev
cc843abb50 remove wiki link 2011-12-31 15:18:01 +05:30
Vijay Dev
b6aa300e70 fix a couple of formatting issues 2011-12-31 15:17:53 +05:30
Xavier Noria
80be90f3de removes comment obsoleted by 18ed37b 2011-12-31 10:37:01 +01:00
Vishnu Atrai
c20a74da4f MiniTest condition removed 2011-12-31 13:52:37 +05:30
José Valim
226528dfcc Merge pull request #4241 from castlerock/remove_more_conditions_for_Fiber_ruby19
remove more conditions for Fiber in ruby19
2011-12-30 22:55:43 -08:00
Dmitry Polushkin
5d2bf4d129 Removed metaclass from the has_many dependency destroy method. Fixes #2954 2011-12-31 03:56:48 +00:00