diff options
| author | Douwe Maan <douwe@selenight.nl> | 2016-07-27 13:27:09 -0600 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2016-07-27 13:27:09 -0600 |
| commit | ce31fb48564d349875b8191c6db91936b8a094ec (patch) | |
| tree | aa24d80ec1211ecb893cb2a5f3769609d6d242a7 | |
| parent | 6985fea27b134675756eb9a79f1c23dc3fbdaf66 (diff) | |
| parent | 3e17187ff0f21b2ce030ba3cac5e13e05f0c254e (diff) | |
| download | gitlab-ce-ce31fb48564d349875b8191c6db91936b8a094ec.tar.gz | |
Merge branch 'fix/requests-profiles-controller-does-not-catch-certain-files'
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | config/routes.rb | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG index a4dbce95268..cc0d01708f1 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -22,6 +22,7 @@ v 8.11.0 (unreleased) - Multiple trigger variables show in separate lines (Katarzyna Kobierska Ula Budziszewska) - Profile requests when a header is passed - Make error pages responsive (Takuya Noguchi) + - 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 |