| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | | | | | | | | | | | connections must be checked in at the end of a thread | Aaron Patterson | 2011-12-30 | 3 | -31/+7 | |
| |/ / / / / / / / / / / | ||||||
| * | | | | | | | | | | | Merge pull request #4235 from castlerock/remove_ruby_18_BasicObject | José Valim | 2011-12-30 | 1 | -1/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | ruby 1.8 ActiveSupport BasicObject no longer available | |||||
| | * | | | | | | | | | | | ruby 1.8 ActiveSupport BasicObject no longer available | Vishnu Atrai | 2011-12-30 | 1 | -1/+0 | |
| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Merge pull request #4236 from castlerock/to_time_available_in_ruby19_DateTime | José Valim | 2011-12-30 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | | remove condition since to_time always available in ruby19 DateTime | |||||
| | * | | | | | | | | | | | remove condition since to_time always available in ruby19 DateTime | Vishnu Atrai | 2011-12-31 | 1 | -1/+1 | |
| |/ / / / / / / / / / / | ||||||
| * | | | | | | | | | | | be explicit about where helpers are installed | Aaron Patterson | 2011-12-30 | 2 | -2/+2 | |
| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Merge pull request #4224 from alexeymuranov/my-fix-for-fixture-tables | Aaron Patterson | 2011-12-30 | 8 | -25/+109 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Fix #2572 and define fixture table name in the associated model | |||||
| | * | | | | | | | | | | | Fixes for TestFixtures::setup_fixture_accessors | Alexey Muranov | 2011-12-30 | 1 | -6/+5 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Renamed "fixture_name" to "accessor_name" and made fixture names in the form "admin/users" be used as the key for the hashes @fixture_cache and @loaded_fixtures. Previously the variable "fixture_name" here was getting a value of the form "admin_user", and this value was then used as the hash key. | |||||
| | * | | | | | | | | | | | Fixture's table name be defined in the model | Alexey Muranov | 2011-12-30 | 1 | -10/+17 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Made the fixture's table name be taken from its model class whenever this class responds to table_name, instead of inferring it sometimes from the fixture's pass. The previous behavior seemed buggy because it depended on whether the model class was passed as a constant or as a name string. Improved Fixtures#initialize. | |||||
| | * | | | | | | | | | | | Test case: fixture table name is defined in model | Alexey Muranov | 2011-12-30 | 1 | -0/+5 | |
| | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | Use foo/bar instead of foo_bar keys for fixtures | Alexey Muranov | 2011-12-30 | 1 | -12/+25 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This solves an issue with set_fixture_class class method caused by create_fixtures method's overwriting passed to it fixture model classes, when the fixtures are "namespased": foo/bar or admin/users. The idea is to use "foo/bar" string as the name and identifier of a fixture file bar in directory foo. The model class of the fixture is either set with set_fixture_class method, or otherwise inferred from its name using camelize method. Also a bug is fixed in lines 487-489 when the table names were guessed by substitution from the fixture file names, ambiguously called table_names, instead of being taken from fixture attributes. Now they are taken from attributes. I plan to submit another fix so that the fixture's table name (for example foo_bar) be defined by the fixture's model whenever possible, instead of inferring it from the fixture's name ("foo/bar"). | |||||
| | * | | | | | | | | | | | Test fixtures with custom model and table names | Alexey Muranov | 2011-12-30 | 7 | -0/+60 | |
| | | |_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test using fixtures with random names and model names, that is not following naming conventions but using set_fixture_class instead. It is expected that the table name be defined in the model, but this is not explicitly tested here. This will need to be fixed. | |||||
| * | | | | | | | | | | | Merge pull request #4233 from bogdan/remove_define_runner | José Valim | 2011-12-30 | 1 | -16/+3 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | AS::Callbacks: remove __define_runner | |||||
| | * | | | | | | | | | | | AS::Callbacks: remove __define_runner | Bogdan Gusiev | 2011-12-30 | 1 | -16/+3 | |
| | |/ / / / / / / / / / | ||||||
| * | | | | | | | | | | | adds a comments that clarifies why Range#include? chooses the comparison ↵ | Xavier Noria | 2011-12-30 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | operator | |||||
| * | | | | | | | | | | | Merge pull request #4229 from lest/range-include | Xavier Noria | 2011-12-30 | 2 | -1/+6 | |
| |\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | refactor Range#include? to handle ranges with floats | |||||
| | * | | | | | | | | | | refactor Range#include? to handle ranges with floats | Sergey Nartimov | 2011-12-29 | 2 | -1/+6 | |
| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | just add the writer rather than adding both and removing one | Aaron Patterson | 2011-12-29 | 1 | -2/+1 | |
| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | stop using __send__ and just module eval in the extensions | Aaron Patterson | 2011-12-29 | 1 | -3/+2 | |
| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | we know the classes will be a list, so *tell* it to respond to each | Aaron Patterson | 2011-12-29 | 1 | -3/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rather than casting | |||||
| * | | | | | | | | | | | don't need the begin / end | Aaron Patterson | 2011-12-29 | 1 | -21/+17 | |
| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | avoid extra method calls by just defining the delegate | Aaron Patterson | 2011-12-29 | 1 | -2/+3 | |
| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Merge pull request #4226 from grentis/content_for_with_flush | José Valim | 2011-12-29 | 2 | -8/+84 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | content_for with flush parameter | |||||
| | * | | | | | | | | | | | content_for with flush parameter | grentis | 2011-12-29 | 2 | -8/+84 | |
| |/ / / / / / / / / / / | ||||||
| * | / / / / / / / / / | don't use instance eval, just reference variables so we don't have to | Aaron Patterson | 2011-12-29 | 1 | -10/+11 | |
| | |/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | worry about "inspect" marshalling | |||||
| * | | | | | | | | | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2011-12-29 | 5 | -22/+17 | |
| |\ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | revise some doc changes | Vijay Dev | 2011-12-29 | 1 | -9/+4 | |
| | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | Documented about using :path option for resources | Kevin Moore | 2011-12-28 | 1 | -0/+7 | |
| | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | Fixed formatting of code examples in form_tag_helper.rb | Alejandro Andrés | 2011-12-28 | 1 | -4/+4 | |
| | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | typo | Jo Liss | 2011-12-28 | 1 | -1/+1 | |
| | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | Document that index names are made up of all columns, not just the first. | Jo Liss | 2011-12-27 | 1 | -9/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | index_name has been using the following expression "index_#{table_name}_on_#{Array.wrap(options[:column]) * '_and_'}" since at least 2006 (bc7f2315), and that's how they come out in my DB. Please check that this is correct before merging into master, perhaps I'm misunderstanding the section I changed. | |||||
| | * | | | | | | | | | | Remove unnecessary comma. | Uģis Ozols | 2011-12-26 | 1 | -1/+1 | |
| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | removing dead code. | Aaron Patterson | 2011-12-29 | 1 | -12/+3 | |
| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | decouple initialize from clear!. Initialize ivars in initialize, clear | Aaron Patterson | 2011-12-29 | 1 | -5/+5 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ivars in clear! | |||||
| * | | | | | | | | | | | modules don't have any instance methods | Aaron Patterson | 2011-12-29 | 1 | -3/+1 | |
| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Deprecate implicit eager loading. Closes #950. | Jon Leighton | 2011-12-29 | 27 | -99/+181 | |
| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Merge pull request #4231 from nashby/remove-constantize-ruby-18 | José Valim | 2011-12-29 | 1 | -39/+24 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | remove ruby 1.8 checking in constantize method | |||||
| | * | | | | | | | | | | | remove ruby 1.8 checking in constantize method | Vasiliy Ermolovich | 2011-12-29 | 1 | -39/+24 | |
| |/ / / / / / / / / / / | ||||||
| * | | | | | | | | | | | Merge pull request #4230 from alovak/patch-1 | José Valim | 2011-12-29 | 1 | -3/+3 | |
| |\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | | | Fix rails/generators/base.rb documentation for hook_for | |||||
| | * | | | | | | | | | | Fix rails/generators/base.rb documentation for hook_for | Pavel Gabriel | 2011-12-29 | 1 | -3/+3 | |
| |/ / / / / / / / / / | ||||||
| * | | | | | | | | | | simplify sweep now that discard and flashes are in sync | Aaron Patterson | 2011-12-28 | 1 | -8/+2 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | mutations on the underlying hash should also mutate the discard set | Aaron Patterson | 2011-12-28 | 2 | -3/+24 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | rename @used to something a bit more meaningful | Aaron Patterson | 2011-12-28 | 1 | -7/+7 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | mutations can't be done without the consent of our proxy object. This | Aaron Patterson | 2011-12-28 | 2 | -3/+62 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is one benefit of choosing composition over inheritance. | |||||
| * | | | | | | | | | | again, use Set#subtract | Aaron Patterson | 2011-12-28 | 1 | -1/+1 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | Use Set#subtract and Set#merge for keeping track of used / unused keys | Aaron Patterson | 2011-12-28 | 1 | -15/+4 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | fix method visibility | Aaron Patterson | 2011-12-28 | 1 | -15/+15 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | no need for bang bang :bomb: | Aaron Patterson | 2011-12-28 | 1 | -1/+1 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | Merge pull request #4216 from edgecase/master_fix_reorder_with_limited_ids | Aaron Patterson | 2011-12-28 | 2 | -1/+11 | |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | allow reorder to affect eager loading correctly | |||||
| | * | | | | | | | | | | allow reorder to affect eager loading correctly | Matt Jones + Scott Walker | 2011-12-28 | 2 | -1/+11 | |
| | | | | | | | | | | | | ||||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |