summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAhmad Sherif <me@ahmadsherif.com>2016-07-27 15:45:18 +0200
committerAhmad Sherif <me@ahmadsherif.com>2016-07-27 15:46:54 +0200
commit3e17187ff0f21b2ce030ba3cac5e13e05f0c254e (patch)
treebc981db2678ee620b8f4637944befe87d4c23f46
parentaed644ccc084223cb1f9c5d955569c5ff9eeaf88 (diff)
downloadgitlab-ce-fix/requests-profiles-controller-does-not-catch-certain-files.tar.gz
Change requests_profiles resource constraint to catch virtually any filefix/requests-profiles-controller-does-not-catch-certain-files
-rw-r--r--CHANGELOG1
-rw-r--r--config/routes.rb2
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index ab1e96919a6..4fb9541a46a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -19,6 +19,7 @@ v 8.11.0 (unreleased)
- Add the `sprockets-es6` gem
- Multiple trigger variables show in separate lines (Katarzyna Kobierska Ula Budziszewska)
- Profile requests when a header is passed
+ - Change requests_profiles resource constraint to catch virtually any file
v 8.10.3 (unreleased)
diff --git a/config/routes.rb b/config/routes.rb
index 414ba69dfae..308d83af57e 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -279,7 +279,7 @@ Rails.application.routes.draw do
resource :health_check, controller: 'health_check', only: [:show]
resource :background_jobs, controller: 'background_jobs', only: [:show]
resource :system_info, controller: 'system_info', only: [:show]
- resources :requests_profiles, only: [:index, :show], param: :name
+ resources :requests_profiles, only: [:index, :show], param: :name, constraints: { name: /.+\.html/ }
resources :namespaces, path: '/projects', constraints: { id: /[a-zA-Z.0-9_\-]+/ }, only: [] do
root to: 'projects#index', as: :projects