diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-18 14:11:44 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-18 14:11:44 +0300 |
| commit | 25989ab7ef1a444ed2abd5479f176d58e1d9462a (patch) | |
| tree | 271bb24f3c7178f320cb9de0be0833a285327d09 /app/views | |
| parent | 9bbb32b29703f3ce33dd35d5101145774b793a6d (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/projects/issues/index.html.haml | 3 | ||||
| -rw-r--r-- | app/views/shared/empty_states/_issues.html.haml | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/views/projects/issues/index.html.haml b/app/views/projects/issues/index.html.haml index 49e482ff1df..2633a3899f7 100644 --- a/app/views/projects/issues/index.html.haml +++ b/app/views/projects/issues/index.html.haml @@ -20,4 +20,5 @@ - if new_issue_email = render 'projects/issuable_by_email', email: new_issue_email, issuable_type: 'issue' - else - = render 'shared/empty_states/issues', button_path: new_project_issue_path(@project), show_import_button: true + - new_project_issue_button_path = @project.archived? ? false : new_project_issue_path(@project) + = render 'shared/empty_states/issues', new_project_issue_button_path: new_project_issue_button_path, show_import_button: true diff --git a/app/views/shared/empty_states/_issues.html.haml b/app/views/shared/empty_states/_issues.html.haml index 9173b802dd4..325e01bb5c8 100644 --- a/app/views/shared/empty_states/_issues.html.haml +++ b/app/views/shared/empty_states/_issues.html.haml @@ -1,4 +1,4 @@ -- button_path = local_assigns.fetch(:button_path, false) +- button_path = local_assigns.fetch(:new_project_issue_button_path, false) - project_select_button = local_assigns.fetch(:project_select_button, false) - show_import_button = local_assigns.fetch(:show_import_button, false) && can?(current_user, :import_issues, @project) - has_button = button_path || project_select_button @@ -56,4 +56,3 @@ - if show_import_button = render 'projects/issues/import_csv/modal' - |