Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Merge pull request #7975 from butcher/extend_date_select_helper_functionality | Rafael Mendonça França | 2012-10-18 | 1 | -0/+3 | |
|\ \ | | | | | | | | | | | | | | | | | | | Extend date_select helper functionality. Conflicts: actionpack/CHANGELOG.md | |||||
| * | | Extend date_select helper functionality. | Pavel Nikitin | 2012-10-18 | 1 | -0/+3 | |
| | | | ||||||
* | | | Permit string and float values in the multiparameter attributes | Rafael Mendonça França | 2012-10-18 | 1 | -1/+1 | |
| | | | ||||||
* | | | fix Digestor to be thread safe. | Aaron Patterson | 2012-10-17 | 1 | -8/+30 | |
|/ / | | | | | | | | | Add a lock on the cache so that we don't have concurrency issues when calculating the cache. | |||||
* | | Ignore asset url query string or anchor when appending extensions and ↵ | Joshua Peek | 2012-10-15 | 1 | -1/+3 | |
| | | | | | | | | computing public path | |||||
* | | Extract compute_asset_extname and allow extname to be disabled | Joshua Peek | 2012-10-15 | 1 | -7/+15 | |
| | | ||||||
* | | Merge branch 'master' into asset-path-helper | Joshua Peek | 2012-10-15 | 2 | -6/+4 | |
|\ \ | | | | | | | | | | | | | Conflicts: railties/test/application/configuration_test.rb | |||||
| * | | 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. | |||||
| * | | remove 'then' from conditional statement | Nihad Abbasov | 2012-10-14 | 1 | -2/+4 | |
| | | | ||||||
* | | | :fire: Rails asset id support | Joshua Peek | 2012-10-15 | 6 | -166/+1 | |
| | | | ||||||
* | | | 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 | 1 | -2/+4 | |
| | | | ||||||
* | | | All asset url helpers should pass options | Joshua Peek | 2012-10-12 | 1 | -24/+24 | |
| | | | ||||||
* | | | Ensure AssetUrlHelper can be mixed into AC::Base | Joshua Peek | 2012-10-12 | 1 | -6/+13 | |
| | | | ||||||
* | | | Refactor AssetUrlHelper to make it friendly for plugins and extensions | Joshua Peek | 2012-10-12 | 8 | -345/+240 | |
| | | | | | | | | | | | | | | | | | | | | | | | | 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 | 2 | -17/+54 | |
|/ / | ||||||
* | | 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 | |
| | | ||||||
* | | 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 | 1 | -1/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 1 | -1/+1 | |
| | | ||||||
* | | 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 | 2 | -9/+18 | |
| | | ||||||
* | | 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 | |
| | | | ||||||
* | | | Remove expansion config | Joshua Peek | 2012-10-10 | 1 | -2/+0 | |
| | | | ||||||
* | | | Remove old asset tag concatenation | Joshua Peek | 2012-10-10 | 4 | -378/+16 | |
| |/ |/| | | | | | Use sprockets, jammit, or some other asset bundler | |||||
* | | 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 | 1 | -50/+48 | |
| | | | | | | | | | | * 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 | 1 | -2/+5 | |
| | | | | | | | | | | 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 | 1 | -3/+7 | |
| | | | | | | | | | | | | | | | | | | | | | | 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 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | 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 | |
| | | ||||||
* | | config.action_dispatch.rack_cache should set explicitly to enable Rack::Cache | Guillermo Iguaran | 2012-10-04 | 1 | -6/+1 | |
| | | ||||||
* | | Merge pull request #7847 from bloudermilk/recursive_permit | David Heinemeier Hansson | 2012-10-04 | 1 | -0/+5 | |
|\ \ | | | | | | | ActionController::Parameters#permit! is recursive | |||||
| * | | ActionController::Parameters#permit! is recursive | Brendan Loudermilk | 2012-10-04 | 1 | -0/+5 | |
| | | | ||||||
* | | | 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 | |||||
* | | Merge pull request #7833 from frodsan/extract_ap_pages_actions_caching | Rafael Mendonça França | 2012-10-04 | 4 | -400/+17 | |
|\ \ | | | | | | | Extract AP Page and Action caching from Rails | |||||
| * | | rename page_cache_extension option to default_static_extension | Francesco Rodriguez | 2012-10-03 | 2 | -11/+13 | |
| | | | ||||||
| * | | extract AP Page and Action caching to actionpack-deprecated_caching gem | Francesco Rodriguez | 2012-10-03 | 3 | -399/+14 | |
| | | | ||||||
* | | | Add nodoc to now public fragment_name_with_digest | Ryan Garver | 2012-10-04 | 1 | -0/+1 | |
| | | | ||||||
* | | | Merge branch 'master' into feature/public-fragment_name_with_digest | Ryan Garver | 2012-10-02 | 14 | -166/+202 | |
|\| | |