aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix inspecting route redirections, closes #6369Łukasz Strzałkowski2012-05-183-2/+15
| | | | | | | | | | | | This commit fixes route inspection in `rake routes` Before: foo /foo(.:format) :controller#:action" After: foo /foo(.:format) Redirect (301)
* More DRY route inspect testsŁukasz Strzałkowski2012-05-181-26/+18
|
* Merge pull request #6183 from nashby/fix-issue-6179Jeremy Kemper2012-05-185-40/+65
|\ | | | | wrap time ranges with timezones
| * respect nsec in TimeWithZoneVasiliy Ermolovich + Sergey Nartimov2012-05-185-40/+48
| | | | | | | | | | | | | | | | | | | | | | when we pass fractional usec to Time methods we should use Rational instead of Float because of accuracy problem Time.local(2011,6,12,23,59,59,999999.999).nsec # => 999999998 Time.local(2011,6,12,23,59,59,Rational(999999999, 1000)).nsec # => 999999999
| * wrap time ranges with timezones, closes #6179Vasiliy Ermolovich2012-05-172-3/+20
| |
* | Merge pull request #6388 from kennyj/fix_warning_20120519Rafael Mendonça França2012-05-181-1/+1
|\ \ | | | | | | Fix warning: possibly useless use of % in void context
| * | Fix warning: possibly useless use of % in void contextkennyj2012-05-191-1/+1
| | |
* | | Merge pull request #6387 from kennyj/fix_test_20120519Rafael Mendonça França2012-05-181-1/+1
|\ \ \ | | | | | | | | Fix build: can't convert Regexp to String
| * | | Fix build: can't convert Regexp to Stringkennyj2012-05-191-1/+1
| |/ /
* | | fix #delete_all with habtm with :delete_sqlJon Leighton2012-05-182-0/+7
| | |
* | | no longer need #delete_all_on_destroyJon Leighton2012-05-185-17/+2
| | |
* | | Perf: Don't load the association for #delete_all.Jon Leighton2012-05-185-10/+47
|/ / | | | | | | Bug #6289
* | Merge pull request #6355 from amutz/fix_number_with_delimiter_escapingRafael Mendonça França2012-05-183-1/+4
|\ \ | | | | | | NumberHelper.number_with_delimiter should html_escape both delimiters and separators
| * | reverting decoupling of NumberHelper from safe_join and adding tests for ↵Andrew Mutz2012-05-183-1/+4
|/ / | | | | | | escaping of delimiters and separators
* | port some mocha to minitest/mockAaron Patterson2012-05-184-222/+223
| |
* | Merge pull request #6382 from oscardelben/refactor_migration_generatorJosé Valim2012-05-181-6/+3
|\ \ | | | | | | Refactor migration generator
| * | Refactor migration generatorOscar Del Ben2012-05-181-6/+3
| | |
* | | Merge pull request #6380 from nashby/output-safety-interpolationJosé Valim2012-05-182-3/+8
|\ \ \ | | | | | | | | doesn't modify params in SafeBuffer#%
| * | | doesn't modify params in SafeBuffer#%Vasiliy Ermolovich2012-05-182-3/+8
| | | |
* | | | fix typo [ci skip]Jon Leighton2012-05-181-1/+1
| | | |
* | | | add changelogs about deprecated stuff [ci skip]Jon Leighton2012-05-181-1/+55
|/ / /
* | | quarantine more deprecated stuffJon Leighton2012-05-184-36/+36
| | |
* | | quarantine deprecated testsJon Leighton2012-05-1810-578/+605
| | |
* | | Merge pull request #6373 from bogdan/callbacks_fixJosé Valim2012-05-171-1/+1
|\ \ \ | | | | | | | | AS::Callbacks: fix run_callbacks for objects with negative id
| * | | AS::Callbacks: fix run_callbacks for objects with negative idBogdan Gusiev2012-05-181-1/+1
|/ / /
* | | Merge pull request #6372 from richo/bugs/middleware_stack_as_arrayJosé Valim2012-05-172-2/+12
|\ \ \ | | | | | | | | Add some common Array methods to the middleware stack
| * | | Add the #unshift method to the middleware stackRich Healey2012-05-182-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | The docs suggest that the middleware stack is an Array, so I've added the unshift method to it. Originally I added some more Array methods, but it was agreed that they lacked usecases.
* | | | Merge pull request #5020 from KL-7/fix-blank-image_tag-sourceJosé Valim2012-05-172-2/+3
|\ \ \ \ | | | | | | | | | | Render img tag with empty src if empty string is passed to image_tag.
| * | | | Render img tag with empty src if empty string is passed to image_tag.Kirill Lashuk2012-05-182-2/+3
| |/ / /
* | | | Merge pull request #5715 from soulim/add_time_input_controlJeremy Kemper2012-05-178-3/+81
|\ \ \ \ | |/ / / |/| | | Add HTML5 input[type="time"] helper
| * | | Add HTML5 input[type="time"] helperAlex Soulim2012-05-188-3/+81
|/ / /
* | | Merge pull request #6371 from ihid/remove_old_text_helper_apiRafael Mendonça França2012-05-173-69/+27
|\ \ \ | | | | | | | | Removed old text_helper apis for highlight, excerpt and word_wrap
| * | | Removed old text_helper apis for highlight, excerpt and word_wrapJeremy Walker2012-05-173-69/+27
|/ / /
* | | Fix incorrect assert_block -> assert conversion. Assumed too much from the ↵Jeremy Kemper2012-05-171-2/+2
| | | | | | | | | | | | MiniTest deprecation message.
* | | Revert changes related to `bundle install` fixes in `rails new`Piotr Sarnacki2012-05-172-17/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reverted changes: f3482a9 Fix tests in railties 5904295 improve #6318 aed906a prevent using already loaded Gemfile for 'bundle install' In order to fix this, we need a fix in bundler related to GEM_PATH, which will allow to run tests properly. I will get this changes back when it happens.
* | | Merge pull request #2036 from Bodacious/tag_helper_data_fixRafael Mendonça França2012-05-172-4/+5
|\ \ \ | | | | | | | | TagHelper creates invalid data attributes when value is a BigDecimal
| * | | Fixed tag_helper data-attribute bug with BigDecimalsBodacious2012-05-172-4/+5
| | | |
* | | | Merge pull request #6238 from pwnall/pgsql_bytea_limitAaron Patterson2012-05-172-8/+20
|\ \ \ \ | | | | | | | | | | Postgresql doesn't accept limits on binary (bytea) columns.
| * | | | Postgresql doesn't accept limits on binary (bytea) columns.Victor Costan2012-05-092-8/+20
| | | | |
* | | | | MiniTest deprecated #assert_block in favor of calling #assert with a blockJeremy Kemper2012-05-171-1/+1
| | | | |
* | | | | Merge pull request #6215 from erichmenge/fix_has_secure_passwordAaron Patterson2012-05-175-15/+43
|\ \ \ \ \ | | | | | | | | | | | | Fix has secure password
| * | | | | Updated tests for has_secure_password.Erich Menge2012-05-084-10/+33
| | | | | |
| * | | | | has_secure_password shouldn't validate password_digest. It should also take ↵Erich Menge2012-05-081-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | options to turn validations off.
* | | | | | Update actionpack/CHANGELOG.mdJosé Valim2012-05-171-0/+3
| | | | | |
* | | | | | Merge pull request #6309 from steveklabnik/fix-2394José Valim2012-05-179-6/+36
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | Created a Raw handler for templates.
| * | | | | Created a Raw handler for templates.Steve Klabnik2012-05-179-6/+36
| | | | | | | | | | | | | | | | | | | | | | | | Fixes #2394
* | | | | | Merge pull request #6250 from iGEL/dont_destroy_readonly_modelsAaron Patterson2012-05-173-0/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | Don't allow to destroy readonly models
| * | | | | | Don't destroy readonly modelsJohannes Barre2012-05-173-0/+7
| | | | | | |
* | | | | | | Make MockLogger work with blocks.Rafael Mendonça França2012-05-171-1/+1
| | | | | | |
* | | | | | | Merge pull request #6365 from kennyj/fix_warning_20120518Aaron Patterson2012-05-171-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Fix warning: ambiguous first argument.