diff options
| author | Amit Rathi <amit@hypertrack.io> | 2018-11-13 14:30:43 +0300 |
|---|---|---|
| committer | Amit Rathi <amit@hypertrack.io> | 2018-11-13 14:30:43 +0300 |
| commit | 0e8e75581b1e62502174a45742834f4000c0b335 (patch) | |
| tree | e40eab66e2022a569d995e8e026fb3d04ffdbb6f /app/views | |
| parent | 206f6747ec9ff97a4b6c77d7a2e0bc6bdd52732d (diff) | |
| parent | b45a3033b8a34b060d5dba506fb4e7d895b6ea98 (diff) | |
Merge branch 'master' into certmanager-temp
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/admin/background_jobs/show.html.haml | 5 | ||||
| -rw-r--r-- | app/views/projects/edit.html.haml | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/app/views/admin/background_jobs/show.html.haml b/app/views/admin/background_jobs/show.html.haml index faa5854bb40..9aa705d9fa6 100644 --- a/app/views/admin/background_jobs/show.html.haml +++ b/app/views/admin/background_jobs/show.html.haml @@ -34,10 +34,13 @@ .clearfix %p %i.fa.fa-exclamation-circle - If '[#{@concurrency} of #{@concurrency} busy]' is shown, restart GitLab with 'sudo service gitlab reload'. + If '[#{@concurrency} of #{@concurrency} busy]' is shown, restart GitLab. + = link_to sprite_icon('question', size: 16), help_page_path('administration/restart_gitlab') + %p %i.fa.fa-exclamation-circle If more than one sidekiq process is listed, stop GitLab, kill the remaining sidekiq processes (sudo pkill -u #{gitlab_config.user} -f sidekiq) and restart GitLab. + = link_to sprite_icon('question', size: 16), help_page_path('administration/restart_gitlab') diff --git a/app/views/projects/edit.html.haml b/app/views/projects/edit.html.haml index 3aff5538813..de768696fe9 100644 --- a/app/views/projects/edit.html.haml +++ b/app/views/projects/edit.html.haml @@ -165,7 +165,7 @@ .input-group .input-group-prepend .input-group-text - #{URI.join(root_url, @project.namespace.full_path)}/ + #{Gitlab::Utils.append_path(root_url, @project.namespace.full_path)}/ = f.text_field :path, class: 'form-control' %ul %li Be careful. Renaming a project's repository can have unintended side effects. |