aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Merge pull request #4043 from cqpx/masterJosé Valim2011-12-202-2/+3
|\ \ \ | | | | | | | | don't encode an UTF-8 encoded template
| * | | don't encode an UTF-8 encoded templateXu Pan2011-12-202-2/+3
| | | |
* | | | Remove i18n dependencies from AP and AMo since they are in AS.José Valim2011-12-202-2/+0
| | | |
* | | | remove more uses of deprecated logger methodsAaron Patterson2011-12-193-6/+8
| | | |
* | | | Revert "Update .travis.yml"Aaron Patterson2011-12-191-0/+1
| | | | | | | | | | | | | | | | This reverts commit ce0cf7d6fbb39a22a0563934abd8c02ff50dd14c.
* | | | Update .travis.ymlGuillermo Iguaran2011-12-191-1/+0
| | | |
* | | | * BufferedLogger is deprecated. Use ActiveSupport::Logger, or the loggerAaron Patterson2011-12-1917-180/+50
|/ / / | | | | | | | | | from Ruby stdlib.
* | | Party like its R-C-UNO!David Heinemeier Hansson2011-12-199-9/+9
| | |
* | | Add an invitation to use jbuilder, since we are not going to bundle it in 3.2David Heinemeier Hansson2011-12-191-0/+3
| | |
* | | Merge pull request #4036 from Juanmcuello/database_tasksPiotr Sarnacki2011-12-191-9/+22
|\ \ \ | | | | | | | | Fix database tasks in test namespace.
| * | | Fix database tasks in test namespace.Juan M. Cuello2011-12-191-9/+22
| | |/ | |/| | | | | | | | | | This is mostly the same as 876bade5999c51f5031861f703933d50e48512ff that was reverted due to test failures, but now with a correction.
* / | adding tests for #4029Aaron Patterson2011-12-192-1/+52
|/ /
* | Revert "Merge pull request #4030 from Juanmcuello/database_tasks"José Valim2011-12-191-20/+9
| | | | | | | | | | This reverts commit a0edfb4d204857f0885784bd12582ae526af43c3, reversing changes made to 4012fcff22e4fe7833aae53b98e3ca9acfe3d3ad.
* | Merge pull request #4030 from Juanmcuello/database_tasksJosé Valim2011-12-191-9/+20
|\ \ | | | | | | Fix database tasks in test namespace.
| * | Fix database tasks in test namespace.Juan M. Cuello2011-12-191-9/+20
|/ /
* | Don't notify campfire when the build keeps passingJon Leighton2011-12-181-1/+4
| |
* | fix a minor typoVijay Dev2011-12-191-1/+1
| |
* | Update activerecord/lib/active_record/railties/databases.rakeJosé Valim2011-12-181-1/+1
| |
* | Merge pull request #4019 from kommen/rake_db_structureJosé Valim2011-12-182-13/+23
|\ \ | | | | | | Make structure.sql file configureable in db:structure:dump analog to SCHEMA in db:schema:dump
| * | Rename STRUCTURE to DB_STRUCTURE, update dump task description and add ↵Dieter Komendera2011-12-182-3/+11
| | | | | | | | | | | | simple testcase.
| * | Make structure file configureable in db:structure:dump analog to SCHEMA in ↵Dieter Komendera2011-12-161-12/+14
| | | | | | | | | | | | db:schema dump and clean up a bit.
* | | Merge pull request #4014 from lest/bypass-preloading-for-ids-readerJon Leighton2011-12-182-2/+16
|\ \ \ | | | | | | | | bypass preloading for ids_reader
| * | | bypass preloading for ids_readerSergey Nartimov2011-12-182-2/+16
| | | | | | | | | | | | | | | | | | | | when fetching ids for a collection, bypass preloading to avoid the unnecessary performance overhead
* | | | Merge pull request #4011 from lest/scope-with-lambda-duplicatesJon Leighton2011-12-183-1/+8
|\ \ \ \ | | | | | | | | | | call scope within unscoped to prevent duplication of where values
| * | | | call scope within unscoped to prevent duplication of where valuesSergey Nartimov2011-12-173-1/+8
| | | | |
* | | | | Merge pull request #4018 from arunagw/warning_removed_José Valim2011-12-181-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Warning removed in test
| * | | | | Warning removed in testArun Agrawal2011-12-181-1/+1
|/ / / / /
* | | | | Merge pull request #4017 from arunagw/remove_extra_requireJosé Valim2011-12-172-2/+0
|\ \ \ \ \ | | | | | | | | | | | | No need 'abstract_unit' here. It's already in 'generators_test_helper'
| * | | | | No need 'abstract_unit' here. It's already in 'generators_test_helper'Arun Agrawal2011-12-182-2/+0
|/ / / / /
* | | | | Merge pull request #4009 from kirs/generate-rake-taskPiotr Sarnacki2011-12-174-0/+41
|\ \ \ \ \ | | | | | | | | | | | | Rake tasks generator
| * | | | | Rake tasks generator with testKir2011-12-174-0/+41
| | | | | |
* | | | | | Merge pull request #4015 from schneems/schneems/routing_error_helpJosé Valim2011-12-171-8/+13
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | Add Help Text to Routing Error
| * | | | | add help text to routing errorschneems2011-12-171-8/+13
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | When a newcomer hits the routing error page they are often confused about how to trouble shoot the next step. Adding a simple help text can gently remind coders where to get more help.
* | | | | Add campfire notifications for travisSantiago Pastorino2011-12-171-0/+2
| | | | |
* | | | | Merge pull request #4012 from JustinCampbell/masterJosé Valim2011-12-172-1/+32
|\ \ \ \ \ | | | | | | | | | | | | Allow symbols to be passed as extension aliases in Mime::Type.register
| * | | | | Add test for register_aliasJustin Campbell2011-12-171-0/+9
| | | | | |
| * | | | | Add test for type aliasesJustin Campbell2011-12-171-0/+11
| | | | | |
| * | | | | Allow symbols to be passed for extension aliasesJustin Campbell2011-12-172-1/+12
| | | | | |
* | | | | | Use gem versions of sass-rails and coffee-rails.José Valim2011-12-171-10/+26
| |_|/ / / |/| | | |
* | | | | Merge pull request #4010 from arunagw/fix_test_activemodelJosé Valim2011-12-171-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Fixed test "ArgumentError: wrong number of arguments(1 for 0)"
| * | | | | Fixed test "ArgumentError: wrong number of arguments(1 for 0)"Arun Agrawal2011-12-171-1/+1
|/ / / / /
* | | | | Merge pull request #4008 from arunagw/warning_variable_for_layoutJosé Valim2011-12-161-0/+1
|\ \ \ \ \ | |/ / / / |/| | | | warning removed "warning: instance variable @variable_for_layout not ini...
| * | | | warning removed "warning: instance variable @variable_for_layout not ↵Arun Agrawal2011-12-171-0/+1
|/ / / / | | | | | | | | | | | | initialized"
* | | | Merge pull request #4007 from exviva/expand_cache_key_for_one_element_arrayJosé Valim2011-12-162-8/+16
|\ \ \ \ | | | | | | | | | | Fix expanding cache key for single element arrays
| * | | | Fix expanding cache key for single element arraysOlek Janiszewski2011-12-162-8/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In short: expand_cache_key(element) should not equal expand_cache_key([element]) This way a fragment cache key for an index page with only a single element in the collection is different than a fragment cache for a typical show page for that element.
* | | | | AS::Concern is not really needed for AR::ExplainXavier Noria2011-12-163-73/+71
| | | | |
* | | | | Merge pull request #4006 from devton/validation_error_on_message_is_empty_part_2José Valim2011-12-162-1/+8
|\ \ \ \ \ | | | | | | | | | | | | Fixed bug when error message is an empty string.
| * | | | | Fixed bug when error message is an empty string.Antonio Roberto2011-12-162-1/+8
| | | | | |
* | | | | | Merge pull request #3780 from marcbowes/masterVijay Dev2011-12-161-7/+3
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | Fix favicon_link_tag help text
| * | | | | * A `/` is required if you want to explicitly skip the assets directory. ↵Marc Bowes2011-11-281-7/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is important because `public/assets` is typically git-ignored. * The asset id is no longer generated.
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 04:34:42 +0000