diff options
author | Jacob Schatz <jschatz1@gmail.com> | 2016-03-19 20:06:59 +0000 |
---|---|---|
committer | Jacob Schatz <jschatz1@gmail.com> | 2016-03-19 20:06:59 +0000 |
commit | 3f22a92f4a561543c2249786b695d0c65120455b (patch) | |
tree | f977579e2e1b8f4d0b1bd90e2ba9e189fb20e441 /app/controllers/projects/tree_controller.rb | |
parent | 64b57ec86a74f0a45412c6b6b415b09e86a4eb97 (diff) | |
parent | 4ce29395049e9ce9c368c5cf4b30a4969d03b42e (diff) | |
download | gitlab-ce-3f22a92f4a561543c2249786b695d0c65120455b.tar.gz |
Merge branch 'remove-wip' into 'master'
Easily (un)mark merge request as WIP using link
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](/uploads/72a6f7119ba9d8043ca8329641e97c3b/wipless_title.png)
## Link to remove `WIP` prefix
![wip_title](/uploads/8620ad65da9ef620b180603520fead55/wip_title.png)
## System note after WIP is added
![wip_sysnote](/uploads/2de073b75e854d2c9e243eb8b5d5c259/wip_sysnote.png)
## Widget with link to remove WIP
![wip_widget](/uploads/cf83ea93743c4c26d9df759c17cb9d7b/wip_widget.png)
## Flash after WIP is removed
![wip_flash](/uploads/27b7240cd5d7ceeb8b7b477abd94d7ff/wip_flash.png)
## System note after WIP is removed
![wipless_sysnote](/uploads/c0d3368abdf21a2f253532a9a9594d90/wipless_sysnote.png)
## Widget when current user cannot remove the WIP prefix
![wip_widget_unauthorized](/uploads/174ccf1674be86dc81c3078fe297acb7/wip_widget_unauthorized.png)
cc @creamzy
See merge request !3006
Diffstat (limited to 'app/controllers/projects/tree_controller.rb')
0 files changed, 0 insertions, 0 deletions