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
40dd9937
Commit
40dd9937
authored
Mar 09, 2017
by
Bob Van Landuyt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Replace the warning with an info icon
parent
67bd277a
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
1 addition
and
1 deletion
+1
-1
app/views/shared/issuable/_form.html.haml
app/views/shared/issuable/_form.html.haml
+1
-1
doc/user/project/merge_requests/img/preview_issue_for_discussion.png
...oject/merge_requests/img/preview_issue_for_discussion.png
+0
-0
doc/user/project/merge_requests/img/resolve_discussion_issue_notice.png
...ct/merge_requests/img/resolve_discussion_issue_notice.png
+0
-0
No files found.
app/views/shared/issuable/_form.html.haml
View file @
40dd9937
...
@@ -48,7 +48,7 @@
...
@@ -48,7 +48,7 @@
-
if
@merge_request_for_resolving_discussions
-
if
@merge_request_for_resolving_discussions
.form-group
.form-group
.col-sm-10.col-sm-offset-2
.col-sm-10.col-sm-offset-2
=
icon
(
'
exclamation-triang
le'
)
=
icon
(
'
info-circ
le'
)
-
if
@merge_request_for_resolving_discussions
.
discussions_can_be_resolved_by?
(
current_user
)
-
if
@merge_request_for_resolving_discussions
.
discussions_can_be_resolved_by?
(
current_user
)
=
hidden_field_tag
'merge_request_for_resolving_discussions'
,
@merge_request_for_resolving_discussions
.
iid
=
hidden_field_tag
'merge_request_for_resolving_discussions'
,
@merge_request_for_resolving_discussions
.
iid
-
if
@discussion_to_resolve
-
if
@discussion_to_resolve
...
...
doc/user/project/merge_requests/img/preview_issue_for_discussion.png
View replaced file @
67bd277a
View file @
40dd9937
210 KB
|
W:
|
H:
80.5 KB
|
W:
|
H:
2-up
Swipe
Onion skin
doc/user/project/merge_requests/img/resolve_discussion_issue_notice.png
View replaced file @
67bd277a
View file @
40dd9937
10.9 KB
|
W:
|
H:
10.1 KB
|
W:
|
H:
2-up
Swipe
Onion skin
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