diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-17 18:07:48 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-17 18:07:48 +0000 |
| commit | e72386771751fb22245bc6604fef236a2ee130cb (patch) | |
| tree | 7cf54bca933159cb177d3caa2f139f87d6d30391 /config | |
| parent | c2b98d3dbd47ab92c79c702276fe9130d9a28036 (diff) | |
| download | gitlab-ce-e72386771751fb22245bc6604fef236a2ee130cb.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
| -rw-r--r-- | config/prometheus/common_metrics.yml | 2 | ||||
| -rw-r--r-- | config/routes/project.rb | 3 | ||||
| -rw-r--r-- | config/routes/repository.rb | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/config/prometheus/common_metrics.yml b/config/prometheus/common_metrics.yml index 795243fab49..314ee44ed71 100644 --- a/config/prometheus/common_metrics.yml +++ b/config/prometheus/common_metrics.yml @@ -209,6 +209,6 @@ panel_groups: weight: 1 metrics: - id: system_metrics_knative_function_invocation_count - query_range: 'sum(ceil(rate(istio_requests_total{destination_service_namespace="%{kube_namespace}", destination_app=~"%{function_name}.*"}[1m])*60))' + query_range: 'sum(ceil(rate(istio_requests_total{destination_service_namespace="%{kube_namespace}", destination_service=~"%{function_name}.*"}[1m])*60))' label: invocations / minute unit: requests diff --git a/config/routes/project.rb b/config/routes/project.rb index d2abc73f7cc..6c2dcafd1ab 100644 --- a/config/routes/project.rb +++ b/config/routes/project.rb @@ -554,7 +554,8 @@ constraints(::Constraints::ProjectUrlConstrainer.new) do :forks, :group_links, :import, :avatar, :mirror, :cycle_analytics, :mattermost, :variables, :triggers, :environments, :protected_environments, :error_tracking, - :serverless, :clusters, :audit_events, :wikis, :merge_requests) + :serverless, :clusters, :audit_events, :wikis, :merge_requests, + :blob, :tree, :raw, :blame, :commits, :create_dir, :find_file, :files) end # rubocop: disable Cop/PutProjectRoutesUnderScope diff --git a/config/routes/repository.rb b/config/routes/repository.rb index 4815575ba9f..e59168c6af4 100644 --- a/config/routes/repository.rb +++ b/config/routes/repository.rb @@ -65,7 +65,7 @@ scope format: false do resources :protected_tags, only: [:index, :show, :create, :update, :destroy] end - scope constraints: { id: /[^\0]+/ } do + scope path: '-', constraints: { id: /[^\0]+/ } do scope controller: :blob do get '/new/*id', action: :new, as: :new_blob post '/create/*id', action: :create, as: :create_blob |