1. 23 Dec, 2016 5 commits
    • Valery Sizov's avatar
      Update changelog · 6f35ed71
      Valery Sizov authored
      6f35ed71
    • Valery Sizov's avatar
      Fix ES search for non-default branches · 40e6800d
      Valery Sizov authored
      40e6800d
    • Douwe Maan's avatar
      Merge branch '1447-custom-domain-500' into 'master' · cdb51842
      Douwe Maan authored
      Fix 500 error while navigating to the `pages_domains` 'show' page.
      
      Closes #1447 and #1448
      
      See merge request !993
      cdb51842
    • Timothy Andrew's avatar
      Add CHANGELOG entry for !993. · 4c0c368a
      Timothy Andrew authored
      4c0c368a
    • Timothy Andrew's avatar
      Fix 500 error while navigating to the `pages_domains` 'show' page. · d34d918d
      Timothy Andrew authored
      ==================
      = Implementation =
      ==================
      
      1. The path of the page is of the form 'group/project/pages/domains/<domain_name>'
      2. Rails looks at `params[:id]` (which should be the domain name), and finds the
         relevant model record.
      3. Given a domain like `foo.bar`, Rails sets `params[:id]` to `foo` (should be
         `foo.bar`), and sets `params[:format]` to `bar`
      4. This commit fixes the issue by adding a route constraint, so that
         `params[:id]` is set to the entire `foo.bar` domain name.
      
      =========
      = Tests =
      =========
      
      1. Add controller specs for the `PagesDomainController`. These are
         slightly orthogonal to this bug fix (they don't fail when this bug is
         present), but should be present nonetheless.
      2. Add routing specs that catch this bug (by asserting that the `id`
         param is passed as expected when it contains a domain name).
      3. Modify the 'RESTful project resources' routing spec shared example to
         accomodate controllers where the controller path (such as
         `pages/domains`) is different from the controller name (such as
         `pages_domains`).
      d34d918d
  2. 22 Dec, 2016 16 commits
  3. 21 Dec, 2016 19 commits