aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* fix engines rake tasksJake Varghese2011-07-042-0/+10
|
* Revert "The rails gem doesn't have a lib directory - closes #1958."Andrew White2011-07-041-3/+2
| | | | | | RubyGems requires at least one require_path. This reverts commit e7fc5d1cad27e47d3d0149a2b9a61d074c30f225.
* The rails gem doesn't have a lib directory - closes #1958.Andrew White2011-07-041-2/+3
|
* Merge pull request #1957 from vijaydev/add-validator-gemXavier Noria2011-07-041-0/+1
|\ | | | | Add w3c_validators gem to the doc group to fix failing validation of guides
| * add w3c_validators gem to the doc group to fix failing validation of guidesVijay Dev2011-07-041-0/+1
|/
* Use an instance variable to store the current masss assignment optionsAndrew White2011-07-042-13/+18
|
* Merge pull request #1950 from dmathieu/require_railtiesJosé Valim2011-07-031-1/+2
|\ | | | | Add railties to the load path if it's not already there
| * Load the generators test helper and properly load it's test caseDamien Mathieu2011-07-031-1/+2
| |
* | Merge pull request #1941 from vijaydev/command-recorder-fixJon Leighton2011-07-032-14/+8
|\ \ | |/ |/| Reversing the changes related to CommandRecorder
| * Reversing the changes done in c278a2c while still resolving #1857.Vijay Dev2011-07-022-14/+8
| | | | | | | | | | | | | | | | | | The changes broke bulk migration tests and were fixed in 4d256bc6; however that brought back the issue of #1857 and so this commit goes back to the original scenario and just adds change_table to the list of methods which are to be recorded in the CommandRecorder. The method_missing now delegates all calls to the underlying connection as before.
* | Merge pull request #1948 from dmathieu/html_safe_numericJosé Valim2011-07-032-1/+5
|\ \ | | | | | | All numerics should be html_safe
| * | all numerics should be html_safe - Closes #1935Damien Mathieu2011-07-032-1/+5
|/ /
* | Merge pull request #1945 from spohlenz/fix-engine-migrations-checkJosé Valim2011-07-022-1/+10
|\ \ | | | | | | Fix has_migrations? check in Rails::Engine
| * | Fix has_migrations? check in Rails::EngineSam Pohlenz2011-07-032-1/+10
| | |
* | | Merge pull request #1925 from spohlenz/refactor-asset-pathsJosé Valim2011-07-023-9/+40
|\ \ \ | |/ / |/| | Refactor sprockets asset paths to allow for alternate asset environments
| * | Add documentation for asset_prefix and asset_environmentSam Pohlenz2011-07-031-0/+9
| | |
| * | Add tests for alternate asset prefix/environmentSam Pohlenz2011-07-012-0/+13
| | |
| * | Refactor sprockets asset paths to allow for alternate asset environmentsSam Pohlenz2011-07-011-9/+18
| | |
* | | Merge pull request #1940 from dmathieu/missing_locationSantiago Pastorino2011-07-023-1/+18
|\ \ \ | |_|/ |/| | Provide a more explicit message when we try to redirect to a missing location
| * | provide a more explicit message when using url_for with nilDamien Mathieu2011-07-023-1/+18
|/ / | | | | This fixes the problem of having a non-explicit message when the :location option is not provided in respond_with.
* | Merge pull request #1938 from joefiorini/masterJosé Valim2011-07-012-6/+69
|\ \ | | | | | | Make to_json take a parameter to exclude root
| * | Enable passing root: false to #to_jsonJoe Fiorini2011-07-012-6/+69
|/ /
* | a few minor performance improvements: fewer strings, fewer range objects, ↵Aaron Patterson2011-07-012-22/+13
| | | | | | | | fewer method calls
* | require 'thread' before using mutexJosé Valim2011-07-011-0/+1
| |
* | calling super is super. if the other object is exactly equal, we can return ↵Aaron Patterson2011-07-011-1/+5
| | | | | | | | early
* | remove unused codesAaron Patterson2011-07-011-4/+0
| |
* | It's autoload all the way downAndrew White2011-07-011-1/+1
| |
* | Don't require ActionView::Context as it's autoloadedAndrew White2011-07-011-1/+0
| |
* | Revert "Add missing require for ActionView::AssetPaths"Andrew White2011-07-011-1/+0
| | | | | | | | This reverts commit 987eb7d4236513978e3cfcd5c3c159d95d2a84c8.
* | Add missing requires for ActionView::Context and Module#instance_method_namesAndrew White2011-07-011-0/+2
| |
* | Add missing require for ActionView::AssetPathsAndrew White2011-07-011-0/+1
| |
* | Add assets_gemfile_entry.José Valim2011-07-012-5/+11
| |
* | Revert "Add method fields_for_with_index to FormHelper"José Valim2011-07-013-145/+6
| | | | | | | | | | | | | | | | This reverts commit 7c562d5e460d97b18e4f3367b3cfb13401732920. Conflicts: actionpack/lib/action_view/helpers/form_helper.rb
* | reduce calls to owners_by_key and to read_attribute, respond_to? etcAaron Patterson2011-07-011-2/+3
| |
* | Merge pull request #1927 from bogdan/select_multiple_indexJosé Valim2011-07-012-1/+8
|\ \ | |/ |/| Fixed ActionView::FormOptionsHelper#select with :multiple => false
| * Fixed ActionView::FormOptionsHelper#select with :multiple => falseBogdan Gusiev2011-06-302-1/+8
| |
* | Remove AssociationReflection#create_association and ↵Jon Leighton2011-06-301-17/+0
| | | | | | | | AssociationReflection#create_association! - they are not called from anywhere.
* | Assign the association attributes to the associated record before the ↵Jon Leighton2011-06-308-12/+45
| | | | | | | | before_initialize callback of the record runs. Fixes #1842.
* | match method signature of the superclassAaron Patterson2011-06-302-4/+4
| |
* | call super rather than delegating to the other objects equal? methodAaron Patterson2011-06-301-1/+1
| |
* | just alias eql? to == for frewer method callsAaron Patterson2011-06-301-5/+1
| |
* | only calculate method name onceAaron Patterson2011-06-301-2/+3
| |
* | cache the plural name on the reflection so we do not pay pluralize costs on ↵Aaron Patterson2011-06-303-8/+15
| | | | | | | | joins
* | Depend on edge version of sass-railsSantiago Pastorino2011-06-301-1/+1
| |
* | Depend on edge version of coffee-railsSantiago Pastorino2011-06-301-1/+1
| |
* | Document the change to Array.wrap's behaviour that was made in ↵Jon Leighton2011-06-301-2/+2
| | | | | | | | b4d8c7d148c6b44eea6701687ca2a97df9088747
* | Make sure respond_with with :js tries to render a template in all casesJosé Valim2011-06-304-6/+23
| |
* | Master version is 3.2.0.betaSantiago Pastorino2011-06-309-17/+17
| |
* | Bump up rack-cache and tzinfoSantiago Pastorino2011-06-302-3/+3
| |
* | Allow CI to use the latest rubygems versionSantiago Pastorino2011-06-301-1/+1
| |