Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Extract compute_asset_extname and allow extname to be disabled | Joshua Peek | 2012-10-15 | 2 | -13/+30 |
| | |||||
* | Merge branch 'master' into asset-path-helper | Joshua Peek | 2012-10-15 | 3 | -11/+5 |
|\ | | | | | | | | | Conflicts: railties/test/application/configuration_test.rb | ||||
| * | Merge pull request #7953 from kryzhovnik/sanitize_helper_cleanup | Santiago Pastorino | 2012-10-15 | 1 | -4/+0 |
| |\ | | | | | | | Removed useless "extend SanitizeHelper::ClassMethods" | ||||
| | * | Removed useless "extend SanitizeHelper::ClassMethods" | Andrey Samsonov | 2012-10-15 | 1 | -4/+0 |
| | | | | | | | | | | | | | | | Since SanitizeHelper includes ActiveSupport::Concern, extending of it ClassMethods is no needed. | ||||
| * | | Minor cleanup, helper method was only used once | Ayrton De Craene | 2012-10-15 | 1 | -5/+1 |
| |/ | |||||
| * | remove 'then' from conditional statement | Nihad Abbasov | 2012-10-14 | 1 | -2/+4 |
| | | |||||
* | | :fire: Rails asset id support | Joshua Peek | 2012-10-15 | 7 | -246/+2 |
| | | |||||
* | | merge! default asset tag options | Joshua Peek | 2012-10-15 | 1 | -12/+12 |
| | | |||||
* | | Just check request instead of controller.request | Joshua Peek | 2012-10-15 | 1 | -13/+2 |
| | | |||||
* | | Allow asset url config to be undefined | Joshua Peek | 2012-10-13 | 2 | -2/+45 |
| | | |||||
* | | Add a few more compute_asset_path tests | Joshua Peek | 2012-10-13 | 1 | -0/+8 |
| | | |||||
* | | All asset url helpers should pass options | Joshua Peek | 2012-10-12 | 1 | -24/+24 |
| | | |||||
* | | JAVASCRIPTS_DIR, STYLESHEETS_DIR, ASSETS_DIR don't even exist anymore | Joshua Peek | 2012-10-12 | 1 | -28/+0 |
| | | |||||
* | | Ensure AssetUrlHelper can be mixed into AC::Base | Joshua Peek | 2012-10-12 | 2 | -6/+46 |
| | | |||||
* | | Refactor AssetUrlHelper to make it friendly for plugins and extensions | Joshua Peek | 2012-10-12 | 9 | -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 helpers | Joshua Peek | 2012-10-12 | 3 | -17/+72 |
|/ | |||||
* | Split asset url helpers into seperate AssetUrlHelper | Joshua Peek | 2012-10-12 | 5 | -419/+416 |
| | |||||
* | warning removed: shadowing outer local variable - value | Arun Agrawal | 2012-10-12 | 1 | -2/+2 |
| | |||||
* | Cleanup trailing whitespaces | dfens | 2012-10-12 | 1 | -1/+1 |
| | |||||
* | update AC::Parameters#permit documentation [ci skip] | Francesco Rodriguez | 2012-10-11 | 1 | -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 Pastorino | 2012-10-12 | 2 | -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 Shipman | 2012-10-11 | 4 | -1/+8 |
| | |||||
* | refactor `ActionView::TestCase` internals to track rendered locals | Yves Senn | 2012-10-11 | 2 | -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 #3675 | Yves Senn | 2012-10-11 | 5 | -9/+33 |
| | |||||
* | Merge pull request #7890 from AvnerCohen/new_hash_syntax | Vijay Dev | 2012-10-10 | 1 | -9/+9 |
|\ | | | | | Moving to new hash syntax | ||||
| * | moving to new hash syntax, for discussion before I take the time on full folders | AvnerCohen | 2012-10-09 | 1 | -9/+9 |
| | | |||||
* | | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2012-10-11 | 2 | -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 ↵ | AvnerCohen | 2012-10-08 | 1 | -1/+1 |
| | | | | | | | | | | | | testing push process first | ||||
| * | | Space between "every" and "time" | schneems | 2012-10-02 | 1 | -1/+1 |
| | | | |||||
* | | | Add changelog entry for killing the asset tag concatenation | David Heinemeier Hansson | 2012-10-10 | 1 | -0/+2 |
| | | | |||||
* | | | Remove expansion config | Joshua Peek | 2012-10-10 | 1 | -2/+0 |
| | | | |||||
* | | | Remove old asset tag concatenation | Joshua Peek | 2012-10-10 | 5 | -1130/+16 |
| |/ |/| | | | | | Use sprockets, jammit, or some other asset bundler | ||||
* | | Rename "Fixtures" class to "FixtureSet" | Alexey Muranov | 2012-10-07 | 1 | -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 Kemper | 2012-10-06 | 1 | -1/+1 |
| | | | | | | | | few times, so fix up the test to work with however it chooses to escape. | ||||
* | | Fix nodoc comment | Rafael Mendonça França | 2012-10-07 | 1 | -16/+15 |
| | | |||||
* | | More Ruby 1.9 hash syntax. | Rafael Mendonça França | 2012-10-06 | 1 | -52/+47 |
| | | |||||
* | | We don't need to check blank? here. | Rafael Mendonça França | 2012-10-06 | 1 | -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ça | 2012-10-06 | 2 | -200/+228 |
| | | | | | | | | | | * Uses the Ruby 1.9 hash syntax * Avoid escaping " inside string using the %{} syntax | ||||
* | | Accept :remote as symbol in link_to options | Riley Lynch | 2012-10-06 | 3 | -2/+21 |
| | | | | | | | | | | Accept either :remote or 'remote' in both the html_options and (url_)options hash arguments to link_to. | ||||
* | | can't pass :locals to #assert_template without a view test case. Closes #3415 | Yves Senn | 2012-10-06 | 3 | -4/+24 |
| | | | | | | | | | | | | | | | | | | | | | | the documentation on #assert_template states that the :locals option is only available in view test cases: # In a view test case, you can also assert that specific locals are passed # to partials: I added a warning when it's passed in an inapropriate context to prevent a NoMethodError. | ||||
* | | We don't need the each call since grep take a block and yield each match | Rafael Mendonça França | 2012-10-06 | 1 | -1/+1 |
| | | | | | | | | | | | | to the block. Thanks @tenderlove | ||||
* | | Allow parameter filters to match multi-parameter attributes | Rafael Mendonça França | 2012-10-05 | 2 | -0/+34 |
| | | | | | | | | | | | | | | This will make easier to permit date/time attributes generated by helpers like date_select. [Sven Schwyn + Rafael Mendonça França] | ||||
* | | Revert "Use flat_map { } instead of map {}.flatten" | Santiago Pastorino | 2012-10-05 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | This reverts commit abf8de85519141496a6773310964ec03f6106f3f. We should take a deeper look to those cases flat_map doesn't do deep flattening. irb(main):002:0> [[[1,3], [1,2]]].map{|i| i}.flatten => [1, 3, 1, 2] irb(main):003:0> [[[1,3], [1,2]]].flat_map{|i| i} => [[1, 3], [1, 2]] | ||||
* | | Use flat_map { } instead of map {}.flatten | Santiago Pastorino | 2012-10-05 | 1 | -2/+2 |
| | | |||||
* | | Update CHANGELOG entry about rack-cache extract | Guillermo Iguaran | 2012-10-04 | 1 | -3/+7 |
| | | |||||
* | | config.action_dispatch.rack_cache should set explicitly to enable Rack::Cache | Guillermo Iguaran | 2012-10-04 | 1 | -6/+1 |
| | | |||||
* | | Remove unneeded CHANGELOG entry. | Rafael Mendonça França | 2012-10-04 | 1 | -3/+0 |
| | | | | | | | | | | | | | | This was added in Rails 4 and we don't need changelog entries to behavior changes [ci skip] | ||||
* | | Merge pull request #7847 from bloudermilk/recursive_permit | David Heinemeier Hansson | 2012-10-04 | 3 | -0/+15 |
|\ \ | | | | | | | ActionController::Parameters#permit! is recursive | ||||
| * | | ActionController::Parameters#permit! is recursive | Brendan Loudermilk | 2012-10-04 | 3 | -0/+15 |
| | | | |||||
* | | | Do not set removed option | Rafael Mendonça França | 2012-10-04 | 1 | -1/+0 |
|/ / | | | | | | | | | Sine page caching was remove from the core we don't have the page_cache_directory anymore |