diff options
author | Filipa Lacerda <filipa@gitlab.com> | 2018-08-30 16:51:22 +0000 |
---|---|---|
committer | Filipa Lacerda <filipa@gitlab.com> | 2018-08-30 16:51:22 +0000 |
commit | f2272c1551a662a089e96fe3aecaeb7b7269012f (patch) | |
tree | 7e4605710cb85bf822857142f23aea65e25691d9 /app/views/projects/milestones | |
parent | 1bd37c4c17cc0849a8334cd874e5601ca405af01 (diff) | |
parent | 39d96d594f07bad172b29a166fa1e3d9cf11a10e (diff) | |
download | gitlab-ce-f2272c1551a662a089e96fe3aecaeb7b7269012f.tar.gz |
Merge branch '47943-project-milestone-page-deprecation-message' into 'master'
Show deprecation message on project milestone page for category tabs
Closes #47943
See merge request gitlab-org/gitlab-ce!21236
Diffstat (limited to 'app/views/projects/milestones')
-rw-r--r-- | app/views/projects/milestones/_deprecation_message.html.haml | 7 | ||||
-rw-r--r-- | app/views/projects/milestones/show.html.haml | 1 |
2 files changed, 8 insertions, 0 deletions
diff --git a/app/views/projects/milestones/_deprecation_message.html.haml b/app/views/projects/milestones/_deprecation_message.html.haml new file mode 100644 index 00000000000..b2cca3690d6 --- /dev/null +++ b/app/views/projects/milestones/_deprecation_message.html.haml @@ -0,0 +1,7 @@ +.banner-callout.compact.milestone-deprecation-message.prepend-top-20 + .banner-graphic= image_tag 'illustrations/milestone_removing-page.svg' + .banner-body.prepend-left-10.append-right-10 + %h5.banner-title.prepend-top-0 + = _('The tabs below will be removed in a future version') + %p.milestone-banner-text + = _('Learn more about %{issue_boards_url}, to keep track of issues in multiple lists, using labels, assignees, and milestones. If you’re missing something from issue boards, please create an issue on %{gitlab_issues_url}.').html_safe % { issue_boards_url: link_to(_('issue boards'), help_page_url('user/project/issue_board'), target: '_blank', rel: 'noopener noreferrer'), gitlab_issues_url: link_to(_('GitLab’s issue tracker'), 'https://gitlab.com/gitlab-org/gitlab-ce/issues', target: '_blank', rel: 'noopener noreferrer') } diff --git a/app/views/projects/milestones/show.html.haml b/app/views/projects/milestones/show.html.haml index 0a684f9016a..5859de61d71 100644 --- a/app/views/projects/milestones/show.html.haml +++ b/app/views/projects/milestones/show.html.haml @@ -67,5 +67,6 @@ .alert.alert-success.prepend-top-default %span All issues for this milestone are closed. You may close this milestone now. + = render 'deprecation_message' = render 'shared/milestones/tabs', milestone: @milestone = render 'shared/milestones/sidebar', milestone: @milestone, project: @project, affix_offset: 153 |