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
41e045a1
Commit
41e045a1
authored
Dec 06, 2017
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed merge request locked icon size
Closes #40876
parent
d87d1e79
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
2 deletions
+7
-2
app/views/projects/_md_preview.html.haml
app/views/projects/_md_preview.html.haml
+1
-1
app/views/shared/notes/_notes_with_form.html.haml
app/views/shared/notes/_notes_with_form.html.haml
+1
-1
changelogs/unreleased/merge-request-lock-icon-size-fix.yml
changelogs/unreleased/merge-request-lock-icon-size-fix.yml
+5
-0
No files found.
app/views/projects/_md_preview.html.haml
View file @
41e045a1
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
-
if
defined?
(
@merge_request
)
&&
@merge_request
.
discussion_locked?
-
if
defined?
(
@merge_request
)
&&
@merge_request
.
discussion_locked?
.issuable-note-warning
.issuable-note-warning
=
icon
(
'lock'
,
class:
'icon'
)
=
sprite_icon
(
'lock'
,
size:
16
,
css_
class:
'icon'
)
%span
%span
=
_
(
'This merge request is locked.'
)
=
_
(
'This merge request is locked.'
)
=
_
(
'Only project members can comment.'
)
=
_
(
'Only project members can comment.'
)
...
...
app/views/shared/notes/_notes_with_form.html.haml
View file @
41e045a1
...
@@ -27,7 +27,7 @@
...
@@ -27,7 +27,7 @@
-
elsif
discussion_locked
-
elsif
discussion_locked
.disabled-comment.text-center.prepend-top-default
.disabled-comment.text-center.prepend-top-default
%span
.issuable-note-warning
%span
.issuable-note-warning
%span
.icon
=
sprite_icon
(
'lock'
,
size:
14
)
=
sprite_icon
(
'lock'
,
size:
16
,
css_class:
'icon'
)
%span
%span
This
This
=
issuable
.
class
.
to_s
.
titleize
.
downcase
=
issuable
.
class
.
to_s
.
titleize
.
downcase
...
...
changelogs/unreleased/merge-request-lock-icon-size-fix.yml
0 → 100644
View file @
41e045a1
---
title
:
Fixed merge request lock icon size
merge_request
:
author
:
type
:
fixed
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