aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | Add CHANGELOG entry for #6369 & #6391Andrew White2012-05-191-0/+2
| |
* | Merge pull request #4835 from ↵Carlos Antonio da Silva2012-05-191-3/+3
|\ \ | | | | | | | | | | | | pacoguzman/refactor_define_restrict_dependency_method Refactor define_restrict_dependency_method using reflection
| * | Refactor define_restrict_dependency_method using reflectionPaco Guzman2012-02-011-3/+3
| | |
* | | Merge pull request #5678 from troyk/patch-1Carlos Antonio da Silva2012-05-191-1/+1
|\ \ \ | | | | | | | | Remove sort on attributes.keys
| * | | Remove sort on attributes.keysTroy Kruthoff2012-03-301-1/+1
| | | |
* | | | Clarify grouped_options_for_select method API, add changelog entryCarlos Antonio da Silva2012-05-193-16/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make the method API more clear by explicitly showing the expected arguments. This means that the options cannot be passed as second argument because we are not relying on extract_options! anymore, you are expected to give a selected key or `nil` if you want to pass options, as it is the last argument. Notice that this does not change the current method arguments contract available in 3.2, it just brings back the same functionality with the divider addition.
* | | | Remove delegated methods from generators test caseCarlos Antonio da Silva2012-05-191-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | `class_attribute` already generates instance readers/writers by default, so there's no need to add delegation methods. Removes some "method redefined" warnings.
* | | | Remove warning in namespaced generator testCarlos Antonio da Silva2012-05-191-1/+1
| | | |
* | | | Fix railties testsPiotr Sarnacki2012-05-191-1/+1
| | | | | | | | | | | | | | | | | | | | Minitest uses different signature for assert_no_match, so we have to swap arguments.
* | | | Ensure that CollectionAssociation#replace returns proper targetPiotr Sarnacki2012-05-192-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The fix commited in e2a070c was returning the `new_target`, as a try to return whatever user replaced association with. The problem is, the resulting association target may be ordered differently. In such case we want to return the target that will be later used for that association.
* | | | Improve `rake routes` output for redirects - closes #6369.Andrew White2012-05-193-17/+30
| | | |
* | | | Merge pull request #6376 from jgaskins/timestamp-microsecondsJeremy Kemper2012-05-184-3/+6
|\ \ \ \ | | | | | | | | | | Increase numeric-timestamp precision to nanoseconds
| * | | | Increase `AR#cache_key` precision to nanosecondsJamie Gaskins2012-05-194-3/+6
| | | | |
* | | | | Merge pull request #6384 from ihid/tidy_text_helpersJeremy Kemper2012-05-182-14/+62
|\ \ \ \ \ | | | | | | | | | | | | Tidied and standardised text_helper implementations.
| * | | | | Tidied and standardised text_helper implementations.Jeremy Walker2012-05-192-14/+62
| | | | | |
* | | | | | Merge pull request #6391 from strzalek/redirect_route_inspectPiotr Sarnacki2012-05-183-28/+33
|\ \ \ \ \ \ | | | | | | | | | | | | | | Redirect route inspect
| * | | | | | 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.