diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-21 18:08:26 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-21 18:08:26 +0300 |
| commit | c859c3bfd242288065fe5e2d887f7204f09e2335 (patch) | |
| tree | 10febaf8774a3ea6ab3773c0dd97658d673fb280 /app/views/shared | |
| parent | 28ce39a3e0e7b47e53939a15fb823af9c433327a (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/shared')
| -rw-r--r-- | app/views/shared/_auto_devops_implicitly_enabled_banner.html.haml | 2 | ||||
| -rw-r--r-- | app/views/shared/milestones/_issues_tab.html.haml | 5 | ||||
| -rw-r--r-- | app/views/shared/milestones/_labels_tab.html.haml | 6 |
3 files changed, 9 insertions, 4 deletions
diff --git a/app/views/shared/_auto_devops_implicitly_enabled_banner.html.haml b/app/views/shared/_auto_devops_implicitly_enabled_banner.html.haml index 3670e19c240..d378e6cb22c 100644 --- a/app/views/shared/_auto_devops_implicitly_enabled_banner.html.haml +++ b/app/views/shared/_auto_devops_implicitly_enabled_banner.html.haml @@ -10,4 +10,4 @@ - unless Gitlab.config.registry.enabled %div = icon('exclamation-triangle') - = _('Container registry is not enabled on this GitLab instance. Ask an administrator to enable it in order for AutoDevOps to work.') + = _('Container registry is not enabled on this GitLab instance. Ask an administrator to enable it in order for Auto DevOps to work.') diff --git a/app/views/shared/milestones/_issues_tab.html.haml b/app/views/shared/milestones/_issues_tab.html.haml index a8db7f8a556..52ce0482cd0 100644 --- a/app/views/shared/milestones/_issues_tab.html.haml +++ b/app/views/shared/milestones/_issues_tab.html.haml @@ -1,6 +1,11 @@ - args = { show_project_name: local_assigns.fetch(:show_project_name, false), show_full_project_name: local_assigns.fetch(:show_full_project_name, false) } +- if display_issues_count_warning? + .flash-container + .flash-warning#milestone-issue-count-warning + = milestone_issues_count_message + .row.prepend-top-default .col-md-4 = render 'shared/milestones/issuables', args.merge(title: 'Unstarted Issues (open and unassigned)', issuables: issues.opened.unassigned, id: 'unassigned', show_counter: true) diff --git a/app/views/shared/milestones/_labels_tab.html.haml b/app/views/shared/milestones/_labels_tab.html.haml index ecab037e378..cdea15bf13e 100644 --- a/app/views/shared/milestones/_labels_tab.html.haml +++ b/app/views/shared/milestones/_labels_tab.html.haml @@ -5,12 +5,12 @@ %li.no-border %span.label-row %span.label-name - = render_label(label, tooltip: false, link: milestones_label_path(options)) + = render_label(label, tooltip: false, link: milestones_issues_path(options)) %span.prepend-description-left = markdown_field(label, :description) .float-right.d-none.d-lg-block.d-xl-block - = link_to milestones_label_path(options.merge(state: 'opened')), class: 'btn btn-transparent btn-action' do + = link_to milestones_issues_path(options.merge(state: 'opened')), class: 'btn btn-transparent btn-action' do - pluralize milestone_issues_by_label_count(@milestone, label, state: :opened), 'open issue' - = link_to milestones_label_path(options.merge(state: 'closed')), class: 'btn btn-transparent btn-action' do + = link_to milestones_issues_path(options.merge(state: 'closed')), class: 'btn btn-transparent btn-action' do - pluralize milestone_issues_by_label_count(@milestone, label, state: :closed), 'closed issue' |