Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
d5b1c58e
Commit
d5b1c58e
authored
May 29, 2015
by
Douwe Maan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Shorten merge request WIP text.
parent
2f3a11fe
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
4 deletions
+5
-4
CHANGELOG
CHANGELOG
+1
-0
app/views/projects/_issuable_form.html.haml
app/views/projects/_issuable_form.html.haml
+4
-4
No files found.
CHANGELOG
View file @
d5b1c58e
Please view this file on the master branch, on stable branches it's out of date.
Please view this file on the master branch, on stable branches it's out of date.
v 7.12.0 (unreleased)
v 7.12.0 (unreleased)
- Shorten merge request WIP text.
- Refactor permission checks with issues and merge requests project settings (Stan Hu)
- Refactor permission checks with issues and merge requests project settings (Stan Hu)
- Fix Markdown preview not working in Edit Milestone page (Stan Hu)
- Fix Markdown preview not working in Edit Milestone page (Stan Hu)
- Fix Zen Mode not closing with ESC key (Stan Hu)
- Fix Zen Mode not closing with ESC key (Stan Hu)
...
...
app/views/projects/_issuable_form.html.haml
View file @
d5b1c58e
...
@@ -15,11 +15,11 @@
...
@@ -15,11 +15,11 @@
-
if
issuable
.
is_a?
(
MergeRequest
)
-
if
issuable
.
is_a?
(
MergeRequest
)
%p
.help-block
%p
.help-block
-
if
issuable
.
work_in_progress?
-
if
issuable
.
work_in_progress?
This merge request is marked a
<strong>
Work In Progress
</strong>
.
Remove the
<code>
WIP
</code>
prefix from the title to allow this
When it's ready, remove the
<code>
WIP
</code>
prefix from the title to allow it to be accepted
.
<strong>
Work In Progress
</strong>
merge request to be accepted when it's ready
.
-
else
-
else
To prevent this merge request from being accepted before it's ready,
Start the title with
<code>
[WIP]
</code>
or
<code>
WIP:
</code>
to prevent a
mark it a
<strong>
Work In Progress
</strong>
by starting the title with
<code>
[WIP]
</code>
or
<code>
WIP:
</code>
.
<strong>
Work In Progress
</strong>
merge request from being accepted before it's ready
.
.form-group.issuable-description
.form-group.issuable-description
=
f
.
label
:description
,
'Description'
,
class:
'control-label'
=
f
.
label
:description
,
'Description'
,
class:
'control-label'
.col-sm-10
.col-sm-10
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment