aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Collapse)AuthorAgeFilesLines
* move cache inside the instance so we do not need lockingAaron Patterson2012-10-181-9/+12
|
* add test for fetch with a blockAaron Patterson2012-10-182-2/+6
|
* prefer composition over inheritenceAaron Patterson2012-10-182-11/+31
|
* Merge pull request #7975 from butcher/extend_date_select_helper_functionalityRafael Mendonça França2012-10-183-0/+24
|\ | | | | | | | | | | | | Extend date_select helper functionality. Conflicts: actionpack/CHANGELOG.md
| * Extend date_select helper functionality.Pavel Nikitin2012-10-183-0/+22
| |
* | Permit string and float values in the multiparameter attributesRafael Mendonça França2012-10-182-10/+15
| |
* | Add changelog entry for precompile configJoshua Peek2012-10-171-0/+4
| |
* | Add more CHANGELOG entries from #7927Rafael Mendonça França2012-10-171-0/+5
| | | | | | | | | | | | Also remove references for RAILS_ASSET_ID from the guides [ci skip]
* | Add CHANGELOG entry for #7927Rafael Mendonça França2012-10-171-1/+7
| | | | | | | | | | | | | | Removed the asset_path configuration from the guides and added an entry in the upgrading_ruby_on_rails guide [ci skip]
* | fix Digestor to be thread safe.Aaron Patterson2012-10-171-8/+30
| | | | | | | | | | Add a lock on the cache so that we don't have concurrency issues when calculating the cache.
* | use the tmp filesystem rather than our own thing.Aaron Patterson2012-10-171-5/+9
|/
* Ignore asset url query string or anchor when appending extensions and ↵Joshua Peek2012-10-152-2/+21
| | | | computing public path
* Extract compute_asset_extname and allow extname to be disabledJoshua Peek2012-10-152-13/+30
|
* Merge branch 'master' into asset-path-helperJoshua Peek2012-10-153-11/+5
|\ | | | | | | | | Conflicts: railties/test/application/configuration_test.rb
| * Merge pull request #7953 from kryzhovnik/sanitize_helper_cleanupSantiago Pastorino2012-10-151-4/+0
| |\ | | | | | | Removed useless "extend SanitizeHelper::ClassMethods"
| | * Removed useless "extend SanitizeHelper::ClassMethods"Andrey Samsonov2012-10-151-4/+0
| | | | | | | | | | | | | | | Since SanitizeHelper includes ActiveSupport::Concern, extending of it ClassMethods is no needed.
| * | Minor cleanup, helper method was only used onceAyrton De Craene2012-10-151-5/+1
| |/
| * remove 'then' from conditional statementNihad Abbasov2012-10-141-2/+4
| |
* | :fire: Rails asset id supportJoshua Peek2012-10-157-246/+2
| |
* | merge! default asset tag optionsJoshua Peek2012-10-151-12/+12
| |
* | Just check request instead of controller.requestJoshua Peek2012-10-151-13/+2
| |
* | Allow asset url config to be undefinedJoshua Peek2012-10-132-2/+45
| |
* | Add a few more compute_asset_path testsJoshua Peek2012-10-131-0/+8
| |
* | All asset url helpers should pass optionsJoshua Peek2012-10-121-24/+24
| |
* | JAVASCRIPTS_DIR, STYLESHEETS_DIR, ASSETS_DIR don't even exist anymoreJoshua Peek2012-10-121-28/+0
| |
* | Ensure AssetUrlHelper can be mixed into AC::BaseJoshua Peek2012-10-122-6/+46
| |
* | Refactor AssetUrlHelper to make it friendly for plugins and extensionsJoshua Peek2012-10-129-346/+275
| | | | | | | | | | | | | | | | Add asset_path/url helper for a consolidated entry point Expose compute_asset_path as a public API Expose compute_asset_host as a public API Move RAILS_ASSET_ID to its own module, AssetIdHelper Removed AV::AssetPaths
* | Add asset_path and asset_url helpersJoshua Peek2012-10-123-17/+72
|/
* Split asset url helpers into seperate AssetUrlHelperJoshua Peek2012-10-125-419/+416
|
* warning removed: shadowing outer local variable - valueArun Agrawal2012-10-121-2/+2
|
* Cleanup trailing whitespacesdfens2012-10-121-1/+1
|
* update AC::Parameters#permit documentation [ci skip]Francesco Rodriguez2012-10-111-0/+22
| | | | bdd105d changes the behaviour of AC::Parameters#permit.
* When executing permit with just a key that points to a hash, DO NOT allow ↵Santiago Pastorino2012-10-122-2/+9
| | | | | | | | | | | | | | all the hash params.require(:person).permit(:projects_attributes) was returning => {"projects_attributes"=>{"0"=>{"name"=>"Project 1"}}} When should return => {} You should be doing ... params.require(:person).permit(projects_attributes: :name) to get just the projects attributes you want to allow
* Allow for deep directory path for view templates.Andy Shipman2012-10-114-1/+8
|
* refactor `ActionView::TestCase` internals to track rendered localsYves Senn2012-10-112-20/+33
| | | | | this refactoring extracts the semi complex data structure of rendered locals per view into into a separate class
* recognizes when a partial was rendered twice. Closes #3675Yves Senn2012-10-115-9/+33
|
* Merge pull request #7890 from AvnerCohen/new_hash_syntaxVijay Dev2012-10-101-9/+9
|\ | | | | Moving to new hash syntax
| * moving to new hash syntax, for discussion before I take the time on full foldersAvnerCohen2012-10-091-9/+9
| |
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-10-112-2/+2
|\ \ | | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/persistence.rb railties/lib/rails/generators/rails/resource_route/resource_route_generator.rb
| * | Closed unclosed <tt>, working on a complete solution for docrails, but ↵AvnerCohen2012-10-081-1/+1
| | | | | | | | | | | | testing push process first
| * | Space between "every" and "time"schneems2012-10-021-1/+1
| | |
* | | Add changelog entry for killing the asset tag concatenationDavid Heinemeier Hansson2012-10-101-0/+2
| | |
* | | Remove expansion configJoshua Peek2012-10-101-2/+0
| | |
* | | Remove old asset tag concatenationJoshua Peek2012-10-105-1130/+16
| |/ |/| | | | | Use sprockets, jammit, or some other asset bundler
* | Rename "Fixtures" class to "FixtureSet"Alexey Muranov2012-10-071-1/+1
| | | | | | | | Rename `ActiveRecord::Fixtures` class to `ActiveRecord::FixtureSet`. Instances of this class normally hold a collection of fixtures (records) loaded either from a single YAML file, or from a file and a folder with the same name. This change make the class name singular and makes the class easier to distinguish from the modules like `ActiveRecord::TestFixtures`, which operates on multiple fixture sets, or `DelegatingFixtures`, `::Fixtures`, etc., and from the class `ActiveRecord::Fixture`, which corresponds to a single fixture.
* | Ruby 2 compat. CGI.escapeHTML has changed the way it escapes apostrophes a ↵Jeremy Kemper2012-10-061-1/+1
| | | | | | | | few times, so fix up the test to work with however it chooses to escape.
* | Fix nodoc commentRafael Mendonça França2012-10-071-16/+15
| |
* | More Ruby 1.9 hash syntax.Rafael Mendonça França2012-10-061-52/+47
| |
* | We don't need to check blank? here.Rafael Mendonça França2012-10-061-1/+1
| | | | | | | | | | | | | | | | Also the blank? check introduced a bug. $ rails generate model Foo blank:boolean form_for(Foo.new(:blank => true)) => ArgumentError, "First argument in form cannot contain nil or be empty"
* | Update some code styles.Rafael Mendonça França2012-10-062-200/+228
| | | | | | | | | | * Uses the Ruby 1.9 hash syntax * Avoid escaping " inside string using the %{} syntax