aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | Clarify grouped_options_for_select method API, add changelog entryCarlos Antonio da Silva2012-05-193-16/+19
* | | | | | | | | | | Remove delegated methods from generators test caseCarlos Antonio da Silva2012-05-191-1/+0
* | | | | | | | | | | Remove warning in namespaced generator testCarlos Antonio da Silva2012-05-191-1/+1
* | | | | | | | | | | Fix railties testsPiotr Sarnacki2012-05-191-1/+1
* | | | | | | | | | | Ensure that CollectionAssociation#replace returns proper targetPiotr Sarnacki2012-05-192-3/+3
* | | | | | | | | | | 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 `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.Jeremy Walker2012-05-192-14/+62
* | | | | | | | | | | | Merge pull request #6391 from strzalek/redirect_route_inspectPiotr Sarnacki2012-05-183-28/+33
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fix inspecting route redirections, closes #6369Łukasz Strzałkowski2012-05-183-2/+15
| * | | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | respect nsec in TimeWithZoneVasiliy Ermolovich + Sergey Nartimov2012-05-185-40/+48
| * | | | | | | | | | | | 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 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 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
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge pull request #6355 from amutz/fix_number_with_delimiter_escapingRafael Mendonça França2012-05-183-1/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | reverting decoupling of NumberHelper from safe_join and adding tests for esca...Andrew Mutz2012-05-183-1/+4
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | 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 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#%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 idBogdan Gusiev2012-05-181-1/+1
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #6372 from richo/bugs/middleware_stack_as_arrayJosé Valim2012-05-172-2/+12
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Add the #unshift method to the middleware stackRich Healey2012-05-182-2/+12
| | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | |
* | | | | | | | | | | 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.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"] 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_wrapJeremy Walker2012-05-173-69/+27
|/ / / / / / / / / /
* | | | | | | | | | Fix incorrect assert_block -> assert conversion. Assumed too much from the Mi...Jeremy Kemper2012-05-171-2/+2
* | | | | | | | | | Revert changes related to `bundle install` fixes in `rails new`Piotr Sarnacki2012-05-172-17/+3
* | | | | | | | | | Merge pull request #2036 from Bodacious/tag_helper_data_fixRafael Mendonça França2012-05-172-4/+5
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | 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.Victor Costan2012-05-092-8/+20