diff options
Diffstat (limited to 'app/views/shared/empty_states')
| -rw-r--r-- | app/views/shared/empty_states/_issues.html.haml | 4 | ||||
| -rw-r--r-- | app/views/shared/empty_states/_profile_tabs.html.haml | 2 | ||||
| -rw-r--r-- | app/views/shared/empty_states/_wikis.html.haml | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/app/views/shared/empty_states/_issues.html.haml b/app/views/shared/empty_states/_issues.html.haml index 8ccf14463c7..13d9d71d58e 100644 --- a/app/views/shared/empty_states/_issues.html.haml +++ b/app/views/shared/empty_states/_issues.html.haml @@ -43,7 +43,7 @@ .text-center - if project_select_button = render 'shared/new_project_item_select', path: 'issues/new', label: _('New issue'), type: :issues, with_feature_enabled: 'issues' - - else + - elsif show_new_issue_link?(@project) = link_to _('New issue'), button_path, class: 'gl-button btn btn-confirm', id: 'new_issue_link' - if show_import_button @@ -53,7 +53,7 @@ %strong = s_('JiraService|Using Jira for issue tracking?') %p.gl-text-center.gl-mb-0 - - jira_docs_link_url = help_page_url('user/project/integrations/jira', anchor: 'view-jira-issues') + - jira_docs_link_url = help_page_url('integration/jira/issues', anchor: 'view-jira-issues') - jira_docs_link_start = '<a href="%{url}" target="_blank" rel="noopener noreferrer">'.html_safe % { url: jira_docs_link_url } = html_escape(s_('JiraService|%{jira_docs_link_start}Enable the Jira integration%{jira_docs_link_end} to view your Jira issues in GitLab.')) % { jira_docs_link_start: jira_docs_link_start.html_safe, jira_docs_link_end: '</a>'.html_safe } %p.gl-text-center.gl-mb-0.gl-text-gray-500 diff --git a/app/views/shared/empty_states/_profile_tabs.html.haml b/app/views/shared/empty_states/_profile_tabs.html.haml index 42a845846d1..c813fd691f1 100644 --- a/app/views/shared/empty_states/_profile_tabs.html.haml +++ b/app/views/shared/empty_states/_profile_tabs.html.haml @@ -6,7 +6,7 @@ .svg-content = image_tag illustration_path, size: '75' .text-content - - if user_profile? and current_user.present? and current_user.username == params[:username] + - if user_profile? && current_user.present? && current_user.username == params[:username] %h5= current_user_empty_message_header - if current_user_empty_message_description.present? diff --git a/app/views/shared/empty_states/_wikis.html.haml b/app/views/shared/empty_states/_wikis.html.haml index 0bddffa881a..917ef666e85 100644 --- a/app/views/shared/empty_states/_wikis.html.haml +++ b/app/views/shared/empty_states/_wikis.html.haml @@ -18,14 +18,14 @@ - elsif @project && can?(current_user, :read_issue, @project) - issues_link = link_to s_('WikiEmptyIssueMessage|issue tracker'), project_issues_path(@project) - - new_issue_link = link_to s_('WikiEmpty|Suggest wiki improvement'), new_project_issue_path(@project), class: 'btn gl-button btn-confirm', title: s_('WikiEmptyIssueMessage|Suggest wiki improvement') = render layout: layout_path, locals: { image_path: 'illustrations/wiki_logout_empty.svg' } do %h4 = messages.dig(:issuable, :title) %p.text-left = messages.dig(:issuable, :body).html_safe % { issues_link: issues_link } - = new_issue_link + - if show_new_issue_link?(@project) + = link_to s_('WikiEmpty|Suggest wiki improvement'), new_project_issue_path(@project), class: 'btn gl-button btn-confirm', title: s_('WikiEmptyIssueMessage|Suggest wiki improvement') - else = render layout: layout_path, locals: { image_path: 'illustrations/wiki_logout_empty.svg' } do |