diff options
| author | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2019-04-01 19:14:38 +0300 |
|---|---|---|
| committer | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2019-04-01 19:14:38 +0300 |
| commit | 129dce999fdf7394e14bfb4a8bf858ede65d5801 (patch) | |
| tree | 07408b5c654331c084d587e4feca60ca41b14d8b /app | |
| parent | 700e8d1917462f509e430f78f7effca8df56bdba (diff) | |
| parent | de6bab915cc080ecbbce5eb827017d46e1f95e1d (diff) | |
Merge branch 'contribute/fix-nav-links-archived-project' into 'master'
Disable inaccessible navigation links upon archiving a project
Closes #58793
See merge request gitlab-org/gitlab-ce!26020
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/layouts/nav/sidebar/_project.html.haml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/layouts/nav/sidebar/_project.html.haml b/app/views/layouts/nav/sidebar/_project.html.haml index 6b33189d1cf..3a0c2b9c284 100644 --- a/app/views/layouts/nav/sidebar/_project.html.haml +++ b/app/views/layouts/nav/sidebar/_project.html.haml @@ -357,12 +357,12 @@ = link_to project_settings_repository_path(@project), title: _('Repository') do %span = _('Repository') - - if @project.feature_available?(:builds, current_user) + - if !@project.archived? && @project.feature_available?(:builds, current_user) = nav_link(controller: :ci_cd) do = link_to project_settings_ci_cd_path(@project), title: _('CI / CD') do %span = _('CI / CD') - - if settings_operations_available? + - if !@project.archived? && settings_operations_available? = nav_link(controller: [:operations]) do = link_to project_settings_operations_path(@project), title: _('Operations') do = _('Operations') |