aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1870 from chriseppstein/asset_urls_masterSantiago Pastorino2011-06-276-63/+209
|\ | | | | Asset urls master
| * Added a configuration setting:Chris Eppstein2011-06-276-17/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | config.action_controller.default_asset_host_protocol It's best to leave this unset. When unset the :request protocol is used whenever it can be and :relative is used in the other situations. When set to :request then assets hosts will be disabled when there is no request in scope and will use the request protocol whenever a request is in scope. If set to :relative, then a relative protocol is always used except for stylesheet link tags which must use the :request protocol to avoid double downloads in IE6&7. Conflicts: actionpack/lib/sprockets/helpers/rails_helper.rb actionpack/test/template/sprockets_helper_test.rb
| * Move the config bootstrapping to initialization to minimize access to the ↵Chris Eppstein2011-06-272-11/+14
| | | | | | | | Rails.application global.
| * Stylesheet link tags should use the request protocol to avoid duplicate ↵Chris Eppstein2011-06-275-27/+50
| | | | | | | | | | | | | | | | | | download of stylesheets in IE7 and IE8. Conflicts: actionpack/lib/action_view/helpers/asset_tag_helpers/stylesheet_tag_helpers.rb actionpack/lib/sprockets/helpers/rails_helper.rb
| * Add asset_url helper and refactor the asset paths so that asset hosts can be ↵Chris Eppstein2011-06-275-47/+129
| | | | | | | | | | | | | | | | | | | | used during asset precompilation. Conflicts: actionpack/lib/action_view/asset_paths.rb actionpack/lib/sprockets/helpers/rails_helper.rb actionpack/test/template/sprockets_helper_test.rb
* | the generated ALT attribute for images no longer contains the digest, if anyXavier Noria2011-06-272-1/+13
|/
* Get the fixture_path from self.class instead of ActiveSupport::TestCase.David Chelimsky2011-06-252-1/+8
| | | | | | This allows test classes that are not subclasses of ActiveSupport::TestCase (like those in rspec-rails) to interact with with this variable without having to reference ActiveSupport::TestCase.
* make the logs a little simpler to view, put the render message inline with ↵James Cox2011-06-242-5/+6
| | | | other events, pull processing to char[0] and add a new line to the completed. looks more like a block now, which is useful for serial actions like test/dev
* Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-06-233-25/+28
|\
| * grammar changes in named routes description and clarity around possibilities ↵Matt Jankowski2011-06-221-10/+10
| | | | | | | | for options
| * use present tense on examplesMatt Jankowski2011-06-211-5/+5
| |
| * more detail on how the flow between redirect and show works, and minor grammarMatt Jankowski2011-06-211-7/+9
| |
| * remove extra space and clarify how an exception is made for controller wide ↵Matt Jankowski2011-06-211-3/+3
| | | | | | | | layouts
| * reorder layout selection examples to occur in the order that the code does, ↵Matt Jankowski2011-06-211-5/+6
| | | | | | | | and provide more detail on why each selection is made
* | Edited actionpack/actionpack.gemspec via GitHubJosé Valim2011-06-231-1/+1
| |
* | Minor refactorSantiago Pastorino2011-06-231-2/+2
| |
* | Merge pull request #1796 from jdeseno/masterSantiago Pastorino2011-06-222-1/+10
|\ \ | | | | | | link_to doesn't allow rel attribute when also specifying method
| * | Adds a test to check link_to with method & rel optionsJosh2011-06-211-0/+7
| | |
| * | Allow additional link relations when using method attribute with link_toJosh2011-06-201-1/+3
| | |
* | | Merge pull request #1798 from jeroenj/cachesweeper-fixSantiago Pastorino2011-06-222-0/+6
|\ \ \ | | | | | | | | Fixes an issue where cache sweepers with only after filters would have no controller object
| * | | Tests only after filters in cache sweepersJeroen Jacobs2011-06-221-0/+5
| | | |
| * | | Fixes an issue where cache sweepers with only after filters would have no ↵Jeroen Jacobs2011-06-211-0/+1
| |/ / | | | | | | | | | | | | | | | controller object It would raise undefined method controller_name for nil
* | | Revert "Bump sprockets requirement"Joshua Peek2011-06-221-1/+1
| | | | | | | | | | | | This reverts commit 458512c8fa31196816dd2372fddecd0e0237c4c0.
* | | Merge pull request #1778 from spohlenz/hash-modelsJosé Valim2011-06-223-1/+28
|\ \ \ | | | | | | | | Fix nested fields_for when Hash-based model is passed.
| * | | Use real hash model in nested fields_for with hash model testSam Pohlenz2011-06-222-4/+13
| | | |
| * | | Test for extractable_options? within nested fields_for.Sam Pohlenz2011-06-202-1/+19
| | | | | | | | | | | | | | | | | | | | This fixes an error when a record object that is a subclass of Hash is passed to fields_for, which is incorrectly interpreted as field options.
* | | | Require helpers so autoload is properly setup.José Valim2011-06-211-1/+1
| | | |
* | | | Bump sprockets requirementJoshua Peek2011-06-211-1/+1
| | | |
* | | | Don't use deprecated stuff.José Valim2011-06-211-2/+1
| | | |
* | | | Assign Rails.cache to sprocketsJoshua Peek2011-06-211-0/+4
| | | |
* | | | Rename AV::Helpers::AssetPaths to AV::AssetPaths to solve autoload mess.José Valim2011-06-214-81/+84
| |/ / |/| |
* | | Only mark the sliced buffer as safe, if it was safe to begin with.Christopher Meiklejohn2011-06-201-1/+2
| | |
* | | Streamline fragment_for SafeBuffer logic to make it more concise.Christopher Meiklejohn2011-06-201-6/+3
| | |
* | | Do not change a frozen text passed to simple_format text helperTadas Tamosauskas2011-06-202-2/+10
|/ /
* / Call super here to allow SessionHash initialize new stuff for usSantiago Pastorino2011-06-191-1/+1
|/
* Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-06-183-12/+17
|\
| * Typo.R.T. Lechow2011-06-161-2/+2
| |
| * form => form_forVijay Dev2011-06-151-1/+1
| |
| * Tweak linebreak in ActionController::Redirecting docChristine Yen2011-06-151-2/+2
| |
| * Clarify importance of *_attributes= writer methods for nested fieldsChristine Yen2011-06-151-8/+12
| |
| * Improve documentation around status code argument of redirect_toChristine Yen2011-06-151-1/+2
| |
| * cycle: make an odd number be marked as odd.Robert Massaioli2011-06-131-1/+1
| | | | | | | | Just a minor issue that was annoying me so I thought that I would jump in and fix it.
* | Select tag helpers: remove some code dupsBogdan Gusiev2011-06-171-25/+10
| |
* | Make the API for compression consistent between JS and CSS. By default, ↵wycats2011-06-161-2/+6
| | | | | | | | | | | | users just need to say whether they want compression or not, and a default will be chosen by a Railtie. In the case of CSS, this default is already chosen by the sass-rails gem. Users can still explicitly choose a compressor in their application.rb if they have a preference, but will usually want to let plugins choose defaults in their Railties.
* | Use html_safeSantiago Pastorino2011-06-161-2/+2
| |
* | Remove usage of memoizable from ActionPack.José Valim2011-06-162-10/+9
| |
* | Also change the default route commentWen-Tien Chang2011-06-161-1/+1
| |
* | Use assert_equal instead of assert in uploaded file test.Lukáš Konarovský2011-06-151-1/+1
| |
* | simplify to only one conditionDamien Mathieu2011-06-151-5/+1
| | | | | | | | Signed-off-by: Andrew White <andyw@pixeltrix.co.uk>
* | Make MissingTranslation exception handler respect :rescue_formatAndrew White2011-06-152-1/+13
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-04 14:42:04 +0000