aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | Merge pull request #1948 from dmathieu/html_safe_numericJosé Valim2011-07-032-1/+5
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | 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::EngineSam Pohlenz2011-07-032-1/+10
* | | | | | | | | | | Merge pull request #1925 from spohlenz/refactor-asset-pathsJosé Valim2011-07-023-9/+40
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | 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 using url_for with nilDamien Mathieu2011-07-023-1/+18
|/ / / / / / / / /
* | | | | | | | | Merge pull request #1938 from joefiorini/masterJosé Valim2011-07-012-6/+69
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Enable passing root: false to #to_jsonJoe Fiorini2011-07-012-6/+69
|/ / / / / / / / /
* | | | | | | | | a few minor performance improvements: fewer strings, fewer range objects, few...Aaron Patterson2011-07-012-22/+13
* | | | | | | | | require 'thread' before using mutexJosé Valim2011-07-011-0/+1
* | | | | | | | | calling super is super. if the other object is exactly equal, we can return e...Aaron Patterson2011-07-011-1/+5
* | | | | | | | | 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
* | | | | | | | | 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
* | | | | | | | | 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 => falseBogdan Gusiev2011-06-302-1/+8
* | | | | | | | | Remove AssociationReflection#create_association and AssociationReflection#cre...Jon Leighton2011-06-301-17/+0
* | | | | | | | | Assign the association attributes to the associated record before the before_...Jon Leighton2011-06-308-12/+45
* | | | | | | | | 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 j...Aaron Patterson2011-06-303-8/+15
* | | | | | | | | 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 b4d8c7d148c6b4...Jon Leighton2011-06-301-2/+2
* | | | | | | | | 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
* | | | | | | | | Update CI configSantiago Pastorino2011-06-302-9/+9
* | | | | | | | | Add has_key? and key? methods to CookieJar removed in 0ca69ca65f83b4bb34f8José Valim2011-06-302-0/+14
* | | | | | | | | Merge pull request #1690 from vijaydev/mattr_accessor_changesJosé Valim2011-06-302-2/+13
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Added instance_accessor: false to Module#mattr_accessorVijay Dev2011-06-142-2/+13
* | | | | | | | | Move Coffee generators and templates to Coffee Railtie and create javascript_...Santiago Pastorino2011-06-2910-46/+29
* | | | | | | | | CommandRecorder should delegate in method_missing where possible. Fixes some ...Jon Leighton2011-06-302-2/+11
* | | | | | | | | Array.wrap should follow Kernel#Array semantics when the object's to_ary is n...Jon Leighton2011-06-302-3/+4
* | | | | | | | | Define to_ary on ActiveRecord::Base to return nil. Improve performance of Arr...Jon Leighton2011-06-301-0/+12
* | | | | | | | | sub suffices hereXavier Noria2011-06-291-1/+1
* | | | | | | | | Revert "Delegate to @flashes with 'delegate' instead of manually."Aaron Patterson2011-06-291-2/+24