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
Jérome Perrin
gitlab-ce
Commits
9bd074d4
Commit
9bd074d4
authored
Aug 06, 2015
by
Douwe Maan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use display: inline where appropriate
parent
c015f96b
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
1 deletion
+9
-1
app/views/events/event/_push.html.haml
app/views/events/event/_push.html.haml
+1
-1
app/views/layouts/_user_styles.html.haml
app/views/layouts/_user_styles.html.haml
+8
-0
No files found.
app/views/events/event/_push.html.haml
View file @
9bd074d4
...
@@ -34,7 +34,7 @@
...
@@ -34,7 +34,7 @@
Compare
#{
from_label
}
...
#{
truncate_sha
(
event
.
commit_to
)
}
Compare
#{
from_label
}
...
#{
truncate_sha
(
event
.
commit_to
)
}
-
if
create_mr
-
if
create_mr
%span
{
"data-user-is"
=>
event
.
author_id
}
%span
{
"data-user-is"
=>
event
.
author_id
,
"data-display"
=>
"inline"
}
or
or
=
link_to
create_mr_path
(
event
.
project
.
default_branch
,
event
.
ref_name
,
event
.
project
)
do
=
link_to
create_mr_path
(
event
.
project
.
default_branch
,
event
.
ref_name
,
event
.
project
)
do
create a merge request
create a merge request
...
...
app/views/layouts/_user_styles.html.haml
View file @
9bd074d4
...
@@ -7,10 +7,18 @@
...
@@ -7,10 +7,18 @@
display
:
block
!important
;
display
:
block
!important
;
}
}
[
data-user-is
=
"
#{
current_user
.
try
(
:id
)
}
"][data-display="
inline
"
]
{
display
:
inline
!important
;
}
[
data-user-is-not
]
{
[
data-user-is-not
]
{
display
:
block
!important
;
display
:
block
!important
;
}
}
[
data-user-is-not
][
data-display
=
"inline"
]
{
display
:
inline
!important
;
}
[
data-user-is-not
=
"
#{
current_user
.
try
(
:id
)
}
"
]
{
[
data-user-is-not
=
"
#{
current_user
.
try
(
:id
)
}
"
]
{
display
:
none
!important
;
display
:
none
!important
;
}
}
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