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
0
Merge Requests
0
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
Tatuya Kamada
gitlab-ce
Commits
6ffa988a
Commit
6ffa988a
authored
Feb 27, 2017
by
Bob Van Landuyt
Committed by
Bob Van Landuyt
Mar 13, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update copy for warning on new issue form
parent
d6453e75
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
6 deletions
+5
-6
app/views/shared/issuable/_form.html.haml
app/views/shared/issuable/_form.html.haml
+5
-6
No files found.
app/views/shared/issuable/_form.html.haml
View file @
6ffa988a
...
...
@@ -53,16 +53,15 @@
=
hidden_field_tag
'merge_request_for_resolving_discussions'
,
@merge_request_for_resolving_discussions
.
iid
-
if
@discussion_to_resolve
=
hidden_field_tag
'discussion_to_resolve'
,
@discussion_to_resolve
.
id
Creating this issue will
mark the discussion at
=
link_to
@discussion_to_resolve
.
noteable
.
to_reference
,
Gitlab
::
UrlBuilder
.
build
(
@discussion_to_resolve
.
first_note
)
Creating this issue will
resolve the discussion in
=
link_to
"
#{
@merge_request_for_resolving_discussions
.
to_reference
}
(discussion
#{
@discussion_to_resolve
.
first_note
.
id
}
)"
,
Gitlab
::
UrlBuilder
.
build
(
@discussion_to_resolve
.
first_note
)
-
else
Creating this issue will
mark
all discussions in
Creating this issue will
resolve
all discussions in
=
link_to
@merge_request_for_resolving_discussions
.
to_reference
,
merge_request_path
(
@merge_request_for_resolving_discussions
)
as resolved.
-
else
You can't automatically mark all discussions in
The discussion at
=
link_to
@merge_request_for_resolving_discussions
.
to_reference
,
merge_request_path
(
@merge_request_for_resolving_discussions
)
as resolved. Ask someone with sufficient rights to resolve the them
.
will stay unresolved. Ask someone with permission to resolve it
.
-
is_footer
=
!
(
issuable
.
is_a?
(
MergeRequest
)
&&
issuable
.
new_record?
)
.row-content-block
{
class:
(
is_footer
?
"footer-block"
:
"middle-block"
)
}
...
...
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