1. 01 8月, 2012 1 次提交
  2. 30 7月, 2012 9 次提交
  3. 29 7月, 2012 1 次提交
  4. 20 7月, 2012 1 次提交
  5. 11 7月, 2012 2 次提交
    • P
      Fix indentation. · 542637e6
      Piotr Sarnacki 提交于
      542637e6
    • P
      Don't raise an error if http auth token isn't well formatted · df40d79f
      Piotr Sarnacki 提交于
      When someone sends malformed authorization header, like:
      
          Authorization: Token foobar
      
      given token should be just ignored and resource should not be authorized,
      instead of raising error. Before this patch controller would return 401 header
      only for well formed tokens, like:
      
          Authorization: Token token=foobar
      
      and would return 500 in former case.
      df40d79f
  6. 10 7月, 2012 1 次提交
  7. 07 7月, 2012 4 次提交
    • C
      ea7b48b0
    • K
      Added support add_flash_types · 238a4253
      kennyj 提交于
      238a4253
    • K
      Remove unused code. · 1498071b
      kennyj 提交于
      1498071b
    • M
      Prevent conflict between mime types and Object methods · 021f3d24
      Mircea Pricop 提交于
      Assuming the type ":touch", Collector.new was calling
      send(:touch), which instead of triggering method_missing
      and generating a new collector method, actually
      invoked the private method `touch` inherited from
      Object.
      
      By generating the method for each mime type as it
      is registered, the private methods on Object can
      never be reached by `send`, because the `Collector`
      will have them before `send` is called on it.
      
      To do this, a callback mechanism was added to Mime::Type
      
      This allows someone to add a callback for whenever
      a new mime type is registered. The callback then
      gets called with the new mime as a parameter.
      
      This is then used in AbstractController::Collector
      to generate new collector methods after each mime
      is registered.
      021f3d24
  8. 04 7月, 2012 2 次提交
  9. 26 6月, 2012 1 次提交
  10. 22 6月, 2012 1 次提交
  11. 21 6月, 2012 1 次提交
    • A
      Removed warnings. · 6f6111e0
      Arun Agrawal 提交于
      1. Change in test name as already defined.
      2. ambiguous first argument; put parentheses or 
      even spaces
      6f6111e0
  12. 19 6月, 2012 2 次提交
    • D
      Added test for case when view doesn't have logger method when using... · e8f9e667
      Dmitry Vorotilin 提交于
      Added test for case when view doesn't have logger method when using ActionController::Metal controller.
      e8f9e667
    • J
      Ensure that cache-control headers are merged · 0b4e8c8d
      James Tucker 提交于
      There are several aspects to this commit, that don't well fit into broken down
      commits, so they are detailed here:
      
       * When a user uses response.headers['Cache-Control'] = some_value, then the
         documented convention in ConditionalGet is not adhered to, in this case,
         response.cache_control is ignored due to `return if
         self[CACHE_CONTROL].present?`
       * When a middleware sets cache-control headers that would clobber, they're
         converted to symbols directly, without underscores. This would lead to bugs.
       * Items that would live in :extras if set through expires_in, are placed
         directly in the @cache_control hash, and not respected in many cases
         (somewhat adhering to the aforementioned documentation).
       * Although quite useless, any directive named 'extras' would be ignored.
      
      The general convention applied is that expires_* take precedence, but no longer
      overwrite everything and expires_* are ALWAYS applied, even if the header is
      set.
      
      I am still unhappy about the contents of this commit, and the code in general.
      Ideally it should be refactored to no longer use :extras. I'd likely recommend
      expanding @cache_control into a class, and giving it the power to handle the
      merge in a more efficient fashion. Such a commit would be a larger change that
      could have additional semantic changes for other libraries unless they utilize
      expires_in in very standard ways.
      0b4e8c8d
  13. 15 6月, 2012 2 次提交
  14. 13 6月, 2012 1 次提交
  15. 12 6月, 2012 1 次提交
  16. 06 6月, 2012 1 次提交
  17. 01 6月, 2012 2 次提交
    • P
      Include routes.mounted_helpers into integration tests · 65250022
      Piotr Sarnacki 提交于
      In integration tests, you might want to use helpers from engines that
      you mounted in your application. It's not hard to add it by yourself,
      but it's unneeded boilerplate. mounted_helpers are now included by
      default. That means that given engine mounted like:
      
          mount Foo::Engine => "/foo", :as => "foo"
      
      you will be able to use paths from this engine in tests this way:
      
          foo.root_path #=> "/foo"
      
      (closes #6573)
      65250022
    • J
      Extracted redirect logic from ActionController::Force::ClassMethods.force_ssl · 47918223
      Jeremy Friesen 提交于
      Prior to this patch the existing .force_ssl method handles both defining
      the filter and handling the logic for performing the redirect.
      
      With this patch the logic for redirecting to the HTTPS protocol is
      separated from the filter logic that determines if a redirect should
      occur.  By separating the two levels of behavior, an instance method
      for ActionController (i.e. #force_ssl_redirect) is exposed and available
      for more granular SSL enforcement.
      
      Cleaned up indentation.
      47918223
  18. 31 5月, 2012 1 次提交
  19. 28 5月, 2012 1 次提交
    • P
      Fix sorting of helpers from different paths · e4aaac13
      Piotr Sarnacki 提交于
      When more than one directory for helpers is provided to a controller, it
      should preserver the order of directories. Given 2 paths:
      
          MyController.helpers_paths = ["dir1/helpers", "dir2/helpers"]
      
      helpers from dir1 should be loaded first. Before this commit, all
      helpers were mixed and then sorted alphabetically, which essentially
      would require to rename helpers to get desired order.
      
      This is a problem especially for engines, where you would like to be
      able to predict accurately which engine helpers will load first.
      
      (closes #6496)
      e4aaac13
  20. 21 5月, 2012 1 次提交
    • A
      Escape the extension when normalizing the action cache path. · 79b38c38
      Andrew White 提交于
      Although no recognized formats use non-ASCII characters, sometimes they
      can be included in the :format parameter because of invalid URLS. To
      prevent encoding incompatibility errors we need to escape them before
      passing the path to URI.unescape.
      
      Closes #4379
      79b38c38
  21. 20 5月, 2012 2 次提交
  22. 12 5月, 2012 1 次提交
  23. 11 5月, 2012 1 次提交
    • A
      Refactor the handling of default_url_options in integration tests · e306ca36
      Andrew White 提交于
      This commit improves the handling of default_url_options in integration
      tests by making behave closer to how a real application operates.
      
      Specifically the following issues have been addressed:
      
      * Options specified in routes.rb are used (fixes #546)
      * Options specified in controllers are used
      * Request parameters are recalled correctly
      * Tests can override default_url_options directly
      e306ca36