summaryrefslogtreecommitdiff
path: root/config/routes
diff options
context:
space:
mode:
authorTimothy Andrew <mail@timothyandrew.net>2016-12-23 00:26:33 +0530
committerJames Edwards-Jones <jedwardsjones@gitlab.com>2017-01-31 22:55:33 +0000
commit86f4767dc1afea9f0744e4fb0c5ce663bf7e3de8 (patch)
tree4df956400114cbd42b9e5ed1acbfa3895a8c657b /config/routes
parent80f9794c3e05362c2b06978d8a664ebf4e0ae0a6 (diff)
downloadgitlab-ce-86f4767dc1afea9f0744e4fb0c5ce663bf7e3de8.tar.gz
Fix 500 error while navigating to the `pages_domains` 'show' page.
================== = 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`).
Diffstat (limited to 'config/routes')
-rw-r--r--config/routes/project.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/config/routes/project.rb b/config/routes/project.rb
index ea3bfdd45e6..b6b432256df 100644
--- a/config/routes/project.rb
+++ b/config/routes/project.rb
@@ -40,7 +40,7 @@ constraints(ProjectUrlConstrainer.new) do
end
resource :pages, only: [:show, :destroy] do
- resources :domains, only: [:show, :new, :create, :destroy], controller: 'pages_domains'
+ resources :domains, only: [:show, :new, :create, :destroy], controller: 'pages_domains', constraints: { id: /[^\/]+/ }
end
resources :compare, only: [:index, :create] do