Skip to content
Snippets Groups Projects

Easily (un)mark merge request as WIP using link

Merged Douwe Maan requested to merge remove-wip into master

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/3768 and https://gitlab.com/gitlab-org/gitlab-ce/issues/3516

Link to add WIP prefix (underline is visible because of hover)

wipless_title

Link to remove WIP prefix

wip_title

System note after WIP is added

wip_sysnote

Widget with link to remove WIP

wip_widget

Flash after WIP is removed

wip_flash

System note after WIP is removed

wipless_sysnote

Widget when current user cannot remove the WIP prefix

wip_widget_unauthorized

cc @creamzy

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
  • Pinging @jschatz1 for CS review -- I think we need to off the same events due to our dumb dispatcher, don't we?

  • Reassigned to @DouweM

  • @rspeicher If that's your only question... Use event delegation and chain them. Something like:

      $(document)
        .off 'click', '.gutter-toggle'
        .on 'click', '.gutter-toggle', (e) ->

    But yes we do.

    Edited by Jacob Schatz
  • @DouweM Will this be ready for 8.6? :)

  • Added ~13921 label

  • Author Maintainer

    @rymai I hope to have time today.

  • Added 1012 commits:

    • d4b49587...18fc7c66 - 1010 commits from branch master
    • 0b942541 - Improve the "easy WIP & un-WIP from link" feature
    • cafa408b - Merge remote-tracking branch 'origin/master' into remove-wip
  • Added 1 commit:

    • 4ce29395 - Remove CHANGELOG item that was added during merge resolution
  • @DouweM I have pushed improvements, I hope you don't mind.

    Pinging @jschatz1 for CS review -- I think we need to off the same events due to our dumb dispatcher, don't we?

    I haven't taken this in account, though. Not sure this is relevant here.

    Anyways, I let @DouweM @rspeicher and @jschatz1 review.

  • @rymai I'like take a look as soon as I get a chance.

  • Author Maintainer

    @rymai LGTM.

    @jschatz1 I'll assign to you

  • Reassigned to @jschatz1

  • Douwe Maan Added ~149423 label

    Added ~149423 label

  • @rymai Quite nice! LGTM. Merging.

  • Jacob Schatz mentioned in commit 3f22a92f

    mentioned in commit 3f22a92f

  • Jacob Schatz Status changed to merged

    Status changed to merged

  • Picked into 8-6-stable, will go into 8.6.0-rc5.

  • username-removed-128633 Removed ~149423 label

    Removed ~149423 label

  • Jacob Schatz mentioned in commit 42c43041

    mentioned in commit 42c43041

  • Please register or sign in to reply
    Loading