| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | Added a configuration setting: | Chris Eppstein | 2011-06-27 | 2 | -3/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | |||||
| | * | Stylesheet link tags should use the request protocol to avoid duplicate ↵ | Chris Eppstein | 2011-06-27 | 2 | -9/+5 | |
| | | | | | | | | | | | | | | | | | | | 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 Eppstein | 2011-06-27 | 1 | -12/+11 | |
| | | | | | | | | | | | | | | | | | | | | | 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 any | Xavier Noria | 2011-06-27 | 1 | -1/+5 | |
| |/ | ||||||
| * | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-06-23 | 1 | -10/+10 | |
| |\ | ||||||
| | * | grammar changes in named routes description and clarity around possibilities ↵ | Matt Jankowski | 2011-06-22 | 1 | -10/+10 | |
| | | | | | | | | | for options | |||||
| * | | Minor refactor | Santiago Pastorino | 2011-06-23 | 1 | -2/+2 | |
| | | | ||||||
| * | | Merge pull request #1796 from jdeseno/master | Santiago Pastorino | 2011-06-22 | 1 | -1/+3 | |
| |\ \ | | | | | | | link_to doesn't allow rel attribute when also specifying method | |||||
| | * | | Allow additional link relations when using method attribute with link_to | Josh | 2011-06-20 | 1 | -1/+3 | |
| | | | | ||||||
| * | | | Merge pull request #1778 from spohlenz/hash-models | José Valim | 2011-06-22 | 1 | -1/+1 | |
| |\ \ \ | | | | | | | | | Fix nested fields_for when Hash-based model is passed. | |||||
| | * | | | Test for extractable_options? within nested fields_for. | Sam Pohlenz | 2011-06-20 | 1 | -1/+1 | |
| | | |/ | |/| | | | | | | | | | | 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. | |||||
| * | | | Rename AV::Helpers::AssetPaths to AV::AssetPaths to solve autoload mess. | José Valim | 2011-06-21 | 2 | -81/+4 | |
| | |/ |/| | ||||||
| * | | Only mark the sliced buffer as safe, if it was safe to begin with. | Christopher Meiklejohn | 2011-06-20 | 1 | -1/+2 | |
| | | | ||||||
| * | | Streamline fragment_for SafeBuffer logic to make it more concise. | Christopher Meiklejohn | 2011-06-20 | 1 | -6/+3 | |
| | | | ||||||
| * | | Do not change a frozen text passed to simple_format text helper | Tadas Tamosauskas | 2011-06-20 | 1 | -0/+1 | |
| |/ | ||||||
| * | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-06-18 | 2 | -12/+16 | |
| |\ | ||||||
| | * | Typo. | R.T. Lechow | 2011-06-16 | 1 | -2/+2 | |
| | | | ||||||
| | * | form => form_for | Vijay Dev | 2011-06-15 | 1 | -1/+1 | |
| | | | ||||||
| | * | Clarify importance of *_attributes= writer methods for nested fields | Christine Yen | 2011-06-15 | 1 | -8/+12 | |
| | | | ||||||
| | * | cycle: make an odd number be marked as odd. | Robert Massaioli | 2011-06-13 | 1 | -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 dups | Bogdan Gusiev | 2011-06-17 | 1 | -25/+10 | |
| | | | ||||||
| * | | Use html_safe | Santiago Pastorino | 2011-06-16 | 1 | -2/+2 | |
| | | | ||||||
| * | | Remove usage of memoizable from ActionPack. | José Valim | 2011-06-16 | 1 | -7/+6 | |
| | | | ||||||
| * | | simplify to only one condition | Damien Mathieu | 2011-06-15 | 1 | -5/+1 | |
| | | | | | | | | | Signed-off-by: Andrew White <andyw@pixeltrix.co.uk> | |||||
| * | | Make MissingTranslation exception handler respect :rescue_format | Andrew White | 2011-06-15 | 1 | -1/+5 | |
| | | | ||||||
| * | | Merge pull request #1552 from bogdan/select | Piotr Sarnacki | 2011-06-11 | 1 | -6/+37 | |
| |\ \ | | | | | | | Fixing select[multiple] html specification problem. | |||||
| | * | | Fixing select[multiple] html specification problem. | Bogdan Gusiev | 2011-06-08 | 1 | -6/+37 | |
| | | | | | | | | | | | | | Generating hidden input with same name before each multiple select | |||||
| * | | | No need for a configuration option here. | José Valim | 2011-06-11 | 1 | -10/+2 | |
| | | | | ||||||
| * | | | Make utf8_enforcer_tag an overrideable method | David Lee | 2011-06-11 | 1 | -3/+7 | |
| | | | | ||||||
| * | | | Make utf8 enforcer param customizeable | David Lee | 2011-06-11 | 2 | -4/+11 | |
| | | | | ||||||
| * | | | There are no snowmen here | David Lee | 2011-06-11 | 1 | -3/+3 | |
| | |/ |/| | ||||||
| * | | Ensure number helpers can handle HTML safe strings - closes #1597. | Andrew White | 2011-06-10 | 1 | -1/+1 | |
| | | | ||||||
| * | | Make sure `escape_javascript` return `SafeBuffer` if the incoming argument ↵ | Prem Sichanugrist | 2011-06-09 | 1 | -1/+2 | |
| | | | | | | | | | is already html_safe | |||||
| * | | Make escape_javascript happy to handle SafeBuffers | Paul Gallagher | 2011-06-08 | 1 | -1/+1 | |
| |/ | | | | | * see GH#1553 * allow for the fact that gsub on SafeBuffer does not pass match variables $1, $2 etc to a block | |||||
| * | Merge pull request #1547 from sikachu/safebuffer | José Valim | 2011-06-07 | 2 | -5/+9 | |
| |\ | | | | | Fix ActionPack tests on `master` | |||||
| | * | Add proper fix to `mail_to` helper. | Prem Sichanugrist | 2011-06-08 | 1 | -2/+2 | |
| | | | | | | | | | | | * Fix the problem on manipulating on the `ActiveSupport::SafeBuffer` * Make sure that we run `escape_javascript` on the `String`, to avoid unexpected behavior. | |||||
| | * | Adapt [823aa223efbac6ad4d31ea33402892267bb77cb4] to make sure we perform ↵ | Prem Sichanugrist | 2011-06-08 | 1 | -3/+7 | |
| | | | | | | | | | | | | | cloning before manipulation only on `OutputBuffer`. After the fragment rendering, `Builder` returns the `String` object instead of `ActionView::OutputBuffer`. Somehow the same procedure which was in [823aa223efbac6ad4d31ea33402892267bb77cb4] does not play nice with the String, and result in the fragment got lost. | |||||
| * | | Merge pull request #1542 from cmeiklejohn/dont_gsub_on_safebuffer | José Valim | 2011-06-07 | 1 | -1/+2 | |
| |\ \ | |/ |/| | Don't operate on the safebuffer, operate on a string and convert. | |||||
| | * | Don't operate on the safebuffer, operate on a string and convert. | Christopher Meiklejohn | 2011-06-07 | 1 | -1/+2 | |
| | | | ||||||
| * | | remove warning: assigned but unused variable | Santiago Pastorino | 2011-06-08 | 1 | -1/+1 | |
| | | | ||||||
| * | | Fragment caching needs to operate on the pure output, not the | Christopher Meiklejohn | 2011-06-07 | 1 | -1/+3 | |
| |/ | | | | safebuffer. | |||||
| * | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-06-06 | 3 | -4/+4 | |
| |\ | | | | | | | | | Conflicts: activerecord/RUNNING_UNIT_TESTS | |||||
| | * | Remove trailing white-spaces | Guillermo Iguaran | 2011-06-05 | 1 | -1/+1 | |
| | | | ||||||
| | * | The example in the API docs incorrectly indicated that form_for would use ↵ | Mark Roghelia | 2011-05-31 | 1 | -2/+2 | |
| | | | | | | | | | the same default route for both new and previously persisted records. The default path given in the example would have generated a routing error for new records. form_for actually uses polymorphic_path to determine which route to use based on the state of the record. The example has been updated to reflect the method's actual behavior. | |||||
| | * | Added missing quote in grouped_options_for_select example | diego | 2011-05-26 | 1 | -1/+1 | |
| | | | ||||||
| * | | Merge pull request #1448 from ernie/attr_internal_require | José Valim | 2011-06-01 | 1 | -0/+2 | |
| |\ \ | | | | | | | Require attr_internal before using in ActionView::Helpers | |||||
| | * | | Require attr_internal before using in ActionView::Helpers | Ernie Miller | 2011-06-01 | 1 | -0/+2 | |
| | | | | ||||||
| * | | | fixed asset_paths when called from sprockets for relative_url_root | jacott | 2011-05-28 | 2 | -11/+7 | |
| | |/ |/| | ||||||
| * | | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-05-25 | 8 | -22/+22 | |
| |\ \ | | | | | | | | | | | | | | | | Conflicts: actionmailer/lib/action_mailer/base.rb activesupport/lib/active_support/core_ext/kernel/requires.rb | |||||
| | * | | Remove extra white spaces on ActionPack docs. | Sebastian Martinez | 2011-05-23 | 8 | -22/+22 | |
| | | | | ||||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |