Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-11-23 17:57:46 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-11-23 17:57:46 +0300
commit64fc6a9b19faca58ad0087b1a1cb11f7ed910015 (patch)
treefe4e98cfab4289850ee15965ae0b04648ee90207 /app/views/admin
parent6317794da29af0bccf95dece5b57b2be2c0977a4 (diff)
Add latest changes from gitlab-org/gitlab@13-6-stable-ee
Diffstat (limited to 'app/views/admin')
-rw-r--r--app/views/admin/instance_statistics/index.html.haml4
-rw-r--r--app/views/admin/runners/index.html.haml4
2 files changed, 3 insertions, 5 deletions
diff --git a/app/views/admin/instance_statistics/index.html.haml b/app/views/admin/instance_statistics/index.html.haml
index ab28a2471e6..d5902f702e5 100644
--- a/app/views/admin/instance_statistics/index.html.haml
+++ b/app/views/admin/instance_statistics/index.html.haml
@@ -1,4 +1,4 @@
-- breadcrumb_title _("Instance Statistics")
-- page_title _("Instance Statistics")
+- breadcrumb_title _("Usage Trends")
+- page_title _("Usage Trends")
#js-instance-statistics-app
diff --git a/app/views/admin/runners/index.html.haml b/app/views/admin/runners/index.html.haml
index c2d7b63f1f9..3d3b8c28a17 100644
--- a/app/views/admin/runners/index.html.haml
+++ b/app/views/admin/runners/index.html.haml
@@ -39,9 +39,7 @@
= render partial: 'ci/runner/how_to_setup_runner',
locals: { registration_token: Gitlab::CurrentSettings.runners_registration_token,
type: 'shared',
- reset_token_url: reset_registration_token_admin_application_settings_path,
- project_path: '',
- group_path: '' }
+ reset_token_url: reset_registration_token_admin_application_settings_path }
.row
.col-sm-9