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
e3e74a1c
Commit
e3e74a1c
authored
Apr 10, 2018
by
Clement Ho
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[skip ci] Fix bad migrations of -block to -inline-block
parent
30a2ed2b
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
17 additions
and
17 deletions
+17
-17
app/helpers/issuables_helper.rb
app/helpers/issuables_helper.rb
+3
-3
app/views/projects/commits/_commit.html.haml
app/views/projects/commits/_commit.html.haml
+1
-1
app/views/projects/issues/_issue.html.haml
app/views/projects/issues/_issue.html.haml
+5
-5
app/views/projects/merge_requests/_merge_request.html.haml
app/views/projects/merge_requests/_merge_request.html.haml
+8
-8
No files found.
app/helpers/issuables_helper.rb
View file @
e3e74a1c
...
...
@@ -131,15 +131,15 @@ module IssuablesHelper
output
=
""
output
<<
"Opened
#{
time_ago_with_tooltip
(
issuable
.
created_at
)
}
by "
.
html_safe
output
<<
content_tag
(
:strong
)
do
author_output
=
link_to_member
(
project
,
issuable
.
author
,
size:
24
,
mobile_classes:
"d-none d-sm-block"
,
tooltip:
true
)
author_output
=
link_to_member
(
project
,
issuable
.
author
,
size:
24
,
mobile_classes:
"d-none d-sm-
inline-
block"
,
tooltip:
true
)
author_output
<<
link_to_member
(
project
,
issuable
.
author
,
size:
24
,
by_username:
true
,
avatar:
false
,
mobile_classes:
"d-block d-sm-none"
)
end
output
<<
" "
.
html_safe
output
<<
content_tag
(
:span
,
(
issuable_first_contribution_icon
if
issuable
.
first_contribution?
),
class:
'has-tooltip'
,
title:
_
(
'1st contribution!'
))
output
<<
content_tag
(
:span
,
(
issuable
.
task_status
if
issuable
.
tasks?
),
id:
"task_status"
,
class:
"d-none d-sm-none d-md-block"
)
output
<<
content_tag
(
:span
,
(
issuable
.
task_status_short
if
issuable
.
tasks?
),
id:
"task_status_short"
,
class:
"d-md-none d-lg-none d-xl-block"
)
output
<<
content_tag
(
:span
,
(
issuable
.
task_status
if
issuable
.
tasks?
),
id:
"task_status"
,
class:
"d-none d-sm-none d-md-
inline-
block"
)
output
<<
content_tag
(
:span
,
(
issuable
.
task_status_short
if
issuable
.
tasks?
),
id:
"task_status_short"
,
class:
"d-md-none d-lg-none d-xl-
inline-
block"
)
output
.
html_safe
end
...
...
app/views/projects/commits/_commit.html.haml
View file @
e3e74a1c
...
...
@@ -33,7 +33,7 @@
.d-block.d-sm-none
=
render_commit_status
(
commit
,
ref:
ref
)
-
if
commit
.
description?
%button
.text-expander.d-none.d-sm-block.js-toggle-button
{
type:
"button"
}
...
%button
.text-expander.d-none.d-sm-
inline-
block.js-toggle-button
{
type:
"button"
}
...
-
if
commit
.
description?
%pre
.commit-row-description.js-toggle-content
...
...
app/views/projects/issues/_issue.html.haml
View file @
e3e74a1c
...
...
@@ -12,25 +12,25 @@
=
confidential_icon
(
issue
)
=
link_to
issue
.
title
,
issue_path
(
issue
)
-
if
issue
.
tasks?
%span
.task-status.d-none.d-sm-block
%span
.task-status.d-none.d-sm-
inline-
block
=
issue
.
task_status
.issuable-info
%span
.issuable-reference
#{
issuable_reference
(
issue
)
}
%span
.issuable-authored.d-none.d-sm-block
%span
.issuable-authored.d-none.d-sm-
inline-
block
·
opened
#{
time_ago_with_tooltip
(
issue
.
created_at
,
placement:
'bottom'
)
}
by
#{
link_to_member
(
@project
,
issue
.
author
,
avatar:
false
)
}
-
if
issue
.
milestone
%span
.issuable-milestone.d-none.d-sm-block
%span
.issuable-milestone.d-none.d-sm-
inline-
block
=
link_to
project_issues_path
(
issue
.
project
,
milestone_title:
issue
.
milestone
.
title
),
data:
{
html:
1
,
toggle:
'tooltip'
,
title:
issuable_milestone_tooltip_title
(
issue
)
}
do
=
icon
(
'clock-o'
)
=
issue
.
milestone
.
title
-
if
issue
.
due_date
%span
.issuable-due-date.d-none.d-sm-block.has-tooltip
{
class:
"#{'cred' if issue.overdue?}"
,
title:
_
(
'Due date'
)
}
%span
.issuable-due-date.d-none.d-sm-
inline-
block.has-tooltip
{
class:
"#{'cred' if issue.overdue?}"
,
title:
_
(
'Due date'
)
}
=
icon
(
'calendar'
)
=
issue
.
due_date
.
to_s
(
:medium
)
...
...
@@ -50,5 +50,5 @@
=
render
'shared/issuable_meta_data'
,
issuable:
issue
.float-right.issuable-updated-at.d-none.d-sm-block
.float-right.issuable-updated-at.d-none.d-sm-
inline-
block
%span
updated
#{
time_ago_with_tooltip
(
issue
.
updated_at
,
placement:
'bottom'
,
html_class:
'issue_update_ago'
)
}
app/views/projects/merge_requests/_merge_request.html.haml
View file @
e3e74a1c
...
...
@@ -9,19 +9,19 @@
%span
.merge-request-title-text
=
link_to
merge_request
.
title
,
merge_request_path
(
merge_request
)
-
if
merge_request
.
tasks?
%span
.task-status.d-none.d-sm-block
%span
.task-status.d-none.d-sm-
inline-
block
=
merge_request
.
task_status
.issuable-info
%span
.issuable-reference
#{
issuable_reference
(
merge_request
)
}
%span
.issuable-authored.d-none.d-sm-block
%span
.issuable-authored.d-none.d-sm-
inline-
block
·
opened
#{
time_ago_with_tooltip
(
merge_request
.
created_at
,
placement:
'bottom'
)
}
by
#{
link_to_member
(
@project
,
merge_request
.
author
,
avatar:
false
)
}
-
if
merge_request
.
milestone
%span
.issuable-milestone.d-none.d-sm-block
%span
.issuable-milestone.d-none.d-sm-
inline-
block
=
link_to
project_merge_requests_path
(
merge_request
.
project
,
milestone_title:
merge_request
.
milestone
.
title
),
data:
{
html:
1
,
toggle:
'tooltip'
,
title:
issuable_milestone_tooltip_title
(
merge_request
)
}
do
=
icon
(
'clock-o'
)
...
...
@@ -40,17 +40,17 @@
.issuable-meta
%ul
.controls
-
if
merge_request
.
merged?
%li
.issuable-status.d-none.d-sm-block
%li
.issuable-status.d-none.d-sm-
inline-
block
MERGED
-
elsif
merge_request
.
closed?
%li
.issuable-status.d-none.d-sm-block
%li
.issuable-status.d-none.d-sm-
inline-
block
=
icon
(
'ban'
)
CLOSED
-
if
merge_request
.
head_pipeline
%li
.issuable-pipeline-status.d-none.d-sm-block
%li
.issuable-pipeline-status.d-none.d-sm-
inline-
block
=
render_pipeline_status
(
merge_request
.
head_pipeline
)
-
if
merge_request
.
open?
&&
merge_request
.
broken?
%li
.issuable-pipeline-broken.d-none.d-sm-block
%li
.issuable-pipeline-broken.d-none.d-sm-
inline-
block
=
link_to
merge_request_path
(
merge_request
),
class:
"has-tooltip"
,
title:
_
(
'Cannot be merged automatically'
)
do
=
icon
(
'exclamation-triangle'
)
-
if
merge_request
.
assignee
...
...
@@ -59,5 +59,5 @@
=
render
'shared/issuable_meta_data'
,
issuable:
merge_request
.float-right.issuable-updated-at.d-none.d-sm-block
.float-right.issuable-updated-at.d-none.d-sm-
inline-
block
%span
updated
#{
time_ago_with_tooltip
(
merge_request
.
updated_at
,
placement:
'bottom'
,
html_class:
'merge_request_updated_ago'
)
}
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