Skip to content
Snippets Groups Projects

Resolve "Promote Issue/MR templates"

Merged Tim Zallmann requested to merge 2977-promote-issue-mr-templates into master
2 unresolved threads

What does this MR do?

Are there points in the code the reviewer needs to double check?

It promotes Issue Templates through a drop-down window below the link. So on the new issue page, you will now have a dropdown instead of the direct link if all rules for showing promotions are fulfilled. The basic rules of how and what to show for promotions were already established & extensively reviewed here : gitlab-org/gitlab-ee!2540 This MR is following and applying the same patterns here.

Why was this MR needed?

To promote our awesome EE features to all the people who don't have them yet.

Screenshots (if relevant)

chrome_2017-09-05_11-15-56

Does this MR meet the acceptance criteria?

What are the relevant issue numbers?

Closes #2977 (closed)

Edited by Tim Zallmann

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Phil Hughes
  • Phil Hughes
  • Few things:

    • On a project that currently has issue templates I can see the templates dropdown? Is that correct?

    Screen_Shot_2017-09-06_at_14.30.48

    • Link in the dropdown isn't aligned.

    Screen_Shot_2017-09-06_at_14.35.07

    • Should this be shown in the edit issue form?
  • Tim Zallmann resolved all discussions

    resolved all discussions

  • Author Maintainer

    @iamphill :

    • Good question about the templates, i also found no check in code (also not previous code). @mydigitalself has for sure more insight.
    • I aligned it
    • Also another one for @mydigitalself (Currently we don't show the use a template line in edit mode)
  • assigned to @iamphill

  • Phil Hughes
  • Sorry 1 tiny comment on the spacing!

  • Tim Zallmann resolved all discussions

    resolved all discussions

  • Author Maintainer

    Np, fixed + back to you.

  • assigned to @iamphill

  • Phil Hughes approved this merge request

    approved this merge request

  • Conflicts :disappointed:

  • Tim Zallmann added 632 commits

    added 632 commits

    • 9ce01c7b...dd72822b - 626 commits from branch master
    • e8d3f756 - Implemented Issue Template Promotion + Spec
    • c96a7263 - Fixed Trailing Whitespace
    • 933917cd - Adapted based on UX Review Input
    • a90eac99 - Adapted margin on the right
    • cce06054 - Fixed it to no js solution + css
    • 850bacd9 - Changed padding/margin setup

    Compare with previous version

  • Author Maintainer

    Resolved :smiley:

  • assigned to @iamphill

  • Phil Hughes approved this merge request

    approved this merge request

  • Phil Hughes enabled an automatic merge when the pipeline for 850bacd9 succeeds

    enabled an automatic merge when the pipeline for 850bacd9 succeeds

  • Phil Hughes mentioned in commit 509bcaaf

    mentioned in commit 509bcaaf

  • merged

  • 1 .help-block
    2 = _('Add')
    3 = link_to 'description templates', 'javascript:void(0);', id: 'promotion-issue-template-link', data: {toggle: 'dropdown'}
    4 = _('to help your contributors communicate effectively!')
    • @timzallmann apologies for the late feedback.

      It would be great if this string was externalized with a namespace for context and interpolation so that the sentence can be translated as a whole.

      It should probably look something like:

      - promo_link = link_to 'description templates', 'javascript:void(0);', id: 'promotion-issue-template-link', data: {toggle: 'dropdown'}
      = (s_(IssuesTemplatePromotion|Add %{description_templates} to help your contributors communicate effectively!') % { description_templates: promo_link }).html_safe

      Thanks!

    • Please register or sign in to reply
  • 30 30 merge request from being merged before it's ready.
    31 31
    32 32 - if no_issuable_templates && can?(current_user, :push_code, issuable.project)
    33 %p.help-block
    34 Add
    35 = link_to 'description templates', help_page_path('user/project/description_templates'), tabindex: -1
    36 to help your contributors communicate effectively!
    33 - if show_promotions?
    34 = render 'shared/promotions/promote_issue_templates'
    35 - else
    36 %p.help-block
    37 Add
    Please register or sign in to reply
    Loading