aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix grammatical error in ↵Steve Richert2012-01-021-1/+1
| | | | ActiveModel::MassAssignmentSecurity::PermissionSet#deny? NotImplementedError message
* Merge pull request #4253 from lest/remove-warningsJosé Valim2012-01-021-1/+1
|\ | | | | fix use of FormBuilder.field_helpers
| * fix use of FormBuilder.field_helpersSergey Nartimov2012-01-021-1/+1
| | | | | | | | it is array of symbols now
* | Merge pull request #4263 from bogdan/local_gemfileJosé Valim2012-01-021-1/+2
|\ \ | | | | | | Fixed path to local gemfile.
| * | Fixed path to local gemfile.Bogdan Gusiev2012-01-021-1/+2
|/ /
* | Merge pull request #4251 from castlerock/rename_ruby_debug_to_ruby_debug19José Valim2012-01-014-6/+6
|\ \ | |/ |/| rename ruby-debug to ruby-debug19
| * rename ruby-debug to ruby-debug19Vishnu Atrai2012-01-014-6/+6
| |
* | fix a warning about grouped expressionsVijay Dev2012-01-011-1/+1
|/
* Merge pull request #4248 from andrew/2012Vijay Dev2011-12-3115-15/+15
|\ | | | | Updated copyright notices for 2012
| * Updated copyright notices for 2012Andrew Nesbitt2011-12-3115-15/+15
| |
* | DRY up guides index pageVijay Dev2011-12-313-48/+21
| | | | | | | | | | | | Use the list of guides available in documents.yaml to fill in the menu in the index page instead of duplicating the list again. Also, remove WIP guides from the menu.
* | Merge pull request #4242 from castlerock/remove_condition_for_MiniTestSantiago Pastorino2011-12-311-9/+3
|\ \ | | | | | | MiniTest condition removed
| * | MiniTest condition removedVishnu Atrai2011-12-311-9/+3
| | |
* | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2011-12-313-20/+18
|\ \ \
| * | | remove wiki linkVijay Dev2011-12-311-1/+0
| | | |
| * | | fix a couple of formatting issuesVijay Dev2011-12-311-3/+2
| | | |
| * | | Minor readability improvementsSam Umbach2011-12-301-13/+13
| | | |
| * | | SCSS processor is provided by the sass gemSam Umbach2011-12-301-1/+1
| | | |
| * | | Fixed documentation error in code examples from form_tag_helper.rbAlejandro Andrés2011-12-301-2/+2
| | | |
* | | | removes comment obsoleted by 18ed37bXavier Noria2011-12-311-3/+0
| |/ / |/| |
* | | Merge pull request #4241 from castlerock/remove_more_conditions_for_Fiber_ruby19José Valim2011-12-302-2/+2
|\ \ \ | | | | | | | | remove more conditions for Fiber in ruby19
| * | | remove more conditions for Fiber available in ruby19Vishnu Atrai2011-12-312-2/+2
| | | |
* | | | Merge pull request #4237 from castlerock/fiber_available_in_ruby19Aaron Patterson2011-12-301-1/+1
|\ \ \ \ | | | | | | | | | | fiber is available in ruby19 condition removed
| * | | | fiber is available in ruby19Vishnu Atrai2011-12-311-1/+1
| |/ / /
* | | | updating the reaping frequency documentationAaron Patterson2011-12-301-0/+3
| | | |
* | | | rename start to run and use Thread.pass rather than sleeping to schedule the ↵Aaron Patterson2011-12-302-23/+31
| | | | | | | | | | | | | | | | watchdog
* | | | connection pool starts the reaperAaron Patterson2011-12-302-0/+17
| | | |
* | | | just dup the spec now that it will deep copyAaron Patterson2011-12-301-2/+1
| | | |
* | | | connection specification will deep copy the configAaron Patterson2011-12-302-0/+16
| | | |
* | | | each connection pool has a reaperAaron Patterson2011-12-303-2/+18
| | | |
* | | | introduce a timer class for reaping connectionsAaron Patterson2011-12-302-0/+65
| | | |
* | | | raise a pull full error when the connection pool is full and no connection ↵Aaron Patterson2011-12-302-18/+28
| | | | | | | | | | | | | | | | can be obtained
* | | | connections are only removed if they are inactveAaron Patterson2011-12-302-3/+19
| | | |
* | | | connections can be reaped via the `reap` methodAaron Patterson2011-12-302-0/+27
| | | |
* | | | deal with removing connections associated with the current threadAaron Patterson2011-12-302-0/+15
| | | |
* | | | connections can be removed from the poolAaron Patterson2011-12-302-1/+28
| | | |
* | | | queue and signal no longer neededAaron Patterson2011-12-301-2/+0
| | | |
* | | | refactor checking out the connectionAaron Patterson2011-12-301-5/+6
| | | |
* | | | infinite loop is no longer necessaryAaron Patterson2011-12-301-20/+11
| | | |
* | | | connections must be checked in at the end of a threadAaron Patterson2011-12-303-31/+7
|/ / /
* | | Merge pull request #4235 from castlerock/remove_ruby_18_BasicObjectJosé Valim2011-12-301-1/+0
|\ \ \ | | | | | | | | ruby 1.8 ActiveSupport BasicObject no longer available
| * | | ruby 1.8 ActiveSupport BasicObject no longer availableVishnu Atrai2011-12-301-1/+0
| | | |
* | | | Merge pull request #4236 from castlerock/to_time_available_in_ruby19_DateTimeJosé Valim2011-12-301-1/+1
|\ \ \ \ | |/ / / |/| | | remove condition since to_time always available in ruby19 DateTime
| * | | remove condition since to_time always available in ruby19 DateTimeVishnu Atrai2011-12-311-1/+1
|/ / /
* | | be explicit about where helpers are installedAaron Patterson2011-12-302-2/+2
| | |
* | | Merge pull request #4224 from alexeymuranov/my-fix-for-fixture-tablesAaron Patterson2011-12-308-25/+109
|\ \ \ | | | | | | | | Fix #2572 and define fixture table name in the associated model
| * | | Fixes for TestFixtures::setup_fixture_accessorsAlexey Muranov2011-12-301-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 modelAlexey Muranov2011-12-301-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 modelAlexey Muranov2011-12-301-0/+5
| | | |
| * | | Use foo/bar instead of foo_bar keys for fixturesAlexey Muranov2011-12-301-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").