aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | Infer currency negative format from positive one.Tsutomu Kuroda2012-01-052-0/+8
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | When a locale file sets the format of the positive currency value as '%n %u', the default negative currency format should be '-%n %u'.
* | | | | Merge pull request #4298 from rafaelfranca/patch-2Aaron Patterson2012-01-0412-129/+22
|\ \ \ \ \ | | | | | | | | | | | | Remove rescue block to require psych gem
| * | | | | No need to require psych since require yaml does that.Rafael Mendonça França2012-01-047-7/+0
| | | | | |
| * | | | | No need to override to_yaml and yaml_initialize methods in ActiveRecord::CoreRafael Mendonça França2012-01-041-20/+0
| | | | | |
| * | | | | No need to override to_yaml method in ActiveSupport::TimeWithZoneRafael Mendonça França2012-01-041-7/+1
| | | | | |
| * | | | | No need to override to_yaml method in ActiveSupport::OrderedHashRafael Mendonça França2012-01-041-15/+0
| | | | | |
| * | | | | No need to override the to_yaml method in ActiveSupporte::SafeBufferRafael Mendonça França2012-01-041-5/+0
| | | | | |
| * | | | | No need to override the to_yaml method in BigDecimalRafael Mendonça França2012-01-041-15/+0
| | | | | |
| * | | | | No need to use rescue block to require psychRafael Mendonça França2012-01-049-69/+30
| | | | | |
| * | | | | No need to check if YAML::ENGINE is defined since ruby 1.9 does thatRafael Mendonça França2012-01-045-5/+5
| | | | | |
* | | | | | Merge pull request #4299 from Karunakar/loggerAaron Patterson2012-01-041-2/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | | using the active support logger
| * | | | | using the active support loggerKarunakar (Ruby)2012-01-041-2/+2
|/ / / / /
* | | | | Merge pull request #4289 from rafaelfranca/patch-1Santiago Pastorino2012-01-043-2/+10
|\ \ \ \ \ | |_|_|_|/ |/| | | | No need of html_safe here
| * | | | Whitespaces :scissors:Rafael Mendonça França2012-01-041-1/+1
| | | | |
| * | | | Make sure that check_box helper return a safe bufferRafael Mendonça França2012-01-041-0/+1
| | | | |
| * | | | Add test to make sure that add two safe buffers always return a safe bufferRafael Mendonça França2012-01-041-0/+7
| | | | |
| * | | | No need of html_safe hereRafael Mendonça França2012-01-041-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/docrailsVijay Dev2012-01-042-75/+112
|\ \ \ \ \
| * | | | | copy editsVijay Dev2012-01-041-10/+7
| | | | | |
| * | | | | Merge branch 'master' of github.com:lifo/docrailsPablo Ifran2012-01-0230-240/+570
| |\ \ \ \ \
| | * | | | | General editing pass over assets pipeline guideMike Gunderloy2011-12-311-56/+58
| | | | | | |
| * | | | | | improve doc in number helper optionsPablo Ifran2012-01-021-19/+57
| | | | | | |
* | | | | | | updates to 3.2 release notesVijay Dev2012-01-041-1/+8
| |_|_|/ / / |/| | | | |
* | | | | | create_fixtures should accept symbol keys for custom table -> class ↵Jeremy Kemper2012-01-032-4/+14
| |_|/ / / |/| | | | | | | | | | | | | | mappings. Fixes an unintended regression.
* | | | | Merge pull request #4286 from kennyj/fix_4285José Valim2012-01-032-1/+7
|\ \ \ \ \ | | | | | | | | | | | | Fix GH #4285. Remove options when we record calling creat_table
| * | | | | Fix GH #4285. Remove options when we record calling creat_tablekennyj2012-01-042-1/+7
|/ / / / /
* | | | | 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