diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-10 15:06:19 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-10 15:06:19 +0300 |
| commit | 69849c280c5525d132ebaddb1200c390a42ecc06 (patch) | |
| tree | 2c6ffc6fd6dc4fa719305f25b475391730389747 /config | |
| parent | c157f963db87a40a3ba7b94b339530ee83194bc8 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
| -rw-r--r-- | config/routes/project.rb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/config/routes/project.rb b/config/routes/project.rb index f9331a22bc8..7d51cfd6dee 100644 --- a/config/routes/project.rb +++ b/config/routes/project.rb @@ -186,6 +186,10 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do resource :import, only: [:new, :create, :show] resource :avatar, only: [:show, :destroy] + + get 'grafana/proxy/:datasource_id/*proxy_path', + to: 'grafana_api#proxy', + as: :grafana_api end # End of the /-/ scope. @@ -282,6 +286,7 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do get :pipelines get :diffs, to: 'merge_requests/diffs#show' get :diffs_batch, to: 'merge_requests/diffs#diffs_batch' + get :diffs_metadata, to: 'merge_requests/diffs#diffs_metadata' get :widget, to: 'merge_requests/content#widget' get :cached_widget, to: 'merge_requests/content#cached_widget' end |