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
35991d16
Commit
35991d16
authored
Apr 09, 2018
by
Clement Ho
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[skip ci] Replace hidden-sm
parent
0aaccbfa
Changes
26
Show whitespace changes
Inline
Side-by-side
Showing
26 changed files
with
30 additions
and
30 deletions
+30
-30
app/assets/javascripts/environments/components/environment_item.vue
.../javascripts/environments/components/environment_item.vue
+2
-2
app/assets/javascripts/environments/components/environment_monitoring.vue
...cripts/environments/components/environment_monitoring.vue
+1
-1
app/assets/javascripts/environments/components/environment_rollback.vue
...ascripts/environments/components/environment_rollback.vue
+1
-1
app/assets/javascripts/environments/components/environment_stop.vue
.../javascripts/environments/components/environment_stop.vue
+1
-1
app/assets/javascripts/environments/components/environment_terminal_button.vue
...s/environments/components/environment_terminal_button.vue
+1
-1
app/assets/javascripts/ide/components/repo_loading_file.vue
app/assets/javascripts/ide/components/repo_loading_file.vue
+1
-1
app/assets/javascripts/notes/components/comment_form.vue
app/assets/javascripts/notes/components/comment_form.vue
+1
-1
app/assets/javascripts/pipelines/components/pipeline_url.vue
app/assets/javascripts/pipelines/components/pipeline_url.vue
+1
-1
app/assets/javascripts/pipelines/components/pipelines_table_row.vue
.../javascripts/pipelines/components/pipelines_table_row.vue
+1
-1
app/assets/javascripts/pipelines/components/time_ago.vue
app/assets/javascripts/pipelines/components/time_ago.vue
+1
-1
app/views/admin/abuse_reports/index.html.haml
app/views/admin/abuse_reports/index.html.haml
+1
-1
app/views/admin/gitaly_servers/index.html.haml
app/views/admin/gitaly_servers/index.html.haml
+1
-1
app/views/layouts/header/_default.html.haml
app/views/layouts/header/_default.html.haml
+1
-1
app/views/projects/commit/_commit_box.html.haml
app/views/projects/commit/_commit_box.html.haml
+1
-1
app/views/projects/commits/show.html.haml
app/views/projects/commits/show.html.haml
+1
-1
app/views/projects/diffs/_diffs.html.haml
app/views/projects/diffs/_diffs.html.haml
+1
-1
app/views/projects/diffs/_stats.html.haml
app/views/projects/diffs/_stats.html.haml
+1
-1
app/views/projects/issues/show.html.haml
app/views/projects/issues/show.html.haml
+2
-2
app/views/projects/merge_requests/_mr_title.html.haml
app/views/projects/merge_requests/_mr_title.html.haml
+1
-1
app/views/projects/pipelines/_info.html.haml
app/views/projects/pipelines/_info.html.haml
+1
-1
app/views/shared/_label.html.haml
app/views/shared/_label.html.haml
+1
-1
app/views/shared/_label_row.html.haml
app/views/shared/_label_row.html.haml
+1
-1
app/views/shared/boards/_show.html.haml
app/views/shared/boards/_show.html.haml
+1
-1
app/views/shared/issuable/_close_reopen_button.html.haml
app/views/shared/issuable/_close_reopen_button.html.haml
+3
-3
app/views/shared/issuable/_close_reopen_report_toggle.html.haml
...ews/shared/issuable/_close_reopen_report_toggle.html.haml
+1
-1
app/views/shared/notes/_notes_with_form.html.haml
app/views/shared/notes/_notes_with_form.html.haml
+1
-1
No files found.
app/assets/javascripts/environments/components/environment_item.vue
View file @
35991d16
...
@@ -493,7 +493,7 @@
...
@@ -493,7 +493,7 @@
</div>
</div>
<div
<div
class=
"table-section section-10 deployment-column
hidden-xs hidden-sm
"
class=
"table-section section-10 deployment-column
d-none d-sm-none d-md-block
"
role=
"gridcell"
role=
"gridcell"
>
>
<span
v-if=
"shouldRenderDeploymentID"
>
<span
v-if=
"shouldRenderDeploymentID"
>
...
@@ -513,7 +513,7 @@
...
@@ -513,7 +513,7 @@
</div>
</div>
<div
<div
class=
"table-section section-15
hidden-xs hidden-sm
"
class=
"table-section section-15
d-none d-sm-none d-md-block
"
role=
"gridcell"
role=
"gridcell"
>
>
<a
<a
...
...
app/assets/javascripts/environments/components/environment_monitoring.vue
View file @
35991d16
...
@@ -26,7 +26,7 @@
...
@@ -26,7 +26,7 @@
<
template
>
<
template
>
<a
<a
v-tooltip
v-tooltip
class=
"btn monitoring-url
hidden-xs hidden-sm
"
class=
"btn monitoring-url
d-none d-sm-none d-md-block
"
data-container=
"body"
data-container=
"body"
rel=
"noopener noreferrer nofollow"
rel=
"noopener noreferrer nofollow"
:href=
"monitoringUrl"
:href=
"monitoringUrl"
...
...
app/assets/javascripts/environments/components/environment_rollback.vue
View file @
35991d16
...
@@ -43,7 +43,7 @@
...
@@ -43,7 +43,7 @@
<
template
>
<
template
>
<button
<button
type=
"button"
type=
"button"
class=
"btn
hidden-xs hidden-sm
"
class=
"btn
d-none d-sm-none d-md-block
"
@
click=
"onClick"
@
click=
"onClick"
:disabled=
"isLoading"
:disabled=
"isLoading"
>
>
...
...
app/assets/javascripts/environments/components/environment_stop.vue
View file @
35991d16
...
@@ -55,7 +55,7 @@
...
@@ -55,7 +55,7 @@
<button
<button
v-tooltip
v-tooltip
type=
"button"
type=
"button"
class=
"btn stop-env-link
hidden-xs hidden-sm
"
class=
"btn stop-env-link
d-none d-sm-none d-md-block
"
data-container=
"body"
data-container=
"body"
@
click=
"onClick"
@
click=
"onClick"
:disabled=
"isLoading"
:disabled=
"isLoading"
...
...
app/assets/javascripts/environments/components/environment_terminal_button.vue
View file @
35991d16
...
@@ -35,7 +35,7 @@
...
@@ -35,7 +35,7 @@
<
template
>
<
template
>
<a
<a
v-tooltip
v-tooltip
class=
"btn terminal-button
hidden-xs hidden-sm
"
class=
"btn terminal-button
d-none d-sm-none d-md-block
"
data-container=
"body"
data-container=
"body"
:title=
"title"
:title=
"title"
:aria-label=
"title"
:aria-label=
"title"
...
...
app/assets/javascripts/ide/components/repo_loading_file.vue
View file @
35991d16
...
@@ -25,7 +25,7 @@
...
@@ -25,7 +25,7 @@
/>
/>
</td>
</td>
<template
v-if=
"!leftPanelCollapsed"
>
<template
v-if=
"!leftPanelCollapsed"
>
<td
class=
"
hidden-sm hidden-xs
"
>
<td
class=
"
d-none d-sm-none d-md-block
"
>
<skeleton-loading-container
<skeleton-loading-container
:small=
"true"
:small=
"true"
/>
/>
...
...
app/assets/javascripts/notes/components/comment_form.vue
View file @
35991d16
...
@@ -325,7 +325,7 @@ Please check your network connection and try again.`;
...
@@ -325,7 +325,7 @@ Please check your network connection and try again.`;
<li
class=
"timeline-entry"
>
<li
class=
"timeline-entry"
>
<div
class=
"timeline-entry-inner"
>
<div
class=
"timeline-entry-inner"
>
<div
class=
"flash-container error-alert timeline-content"
></div>
<div
class=
"flash-container error-alert timeline-content"
></div>
<div
class=
"timeline-icon
hidden-xs hidden-sm
"
>
<div
class=
"timeline-icon
d-none d-sm-none d-md-block
"
>
<user-avatar-link
<user-avatar-link
v-if=
"author"
v-if=
"author"
:link-href=
"author.path"
:link-href=
"author.path"
...
...
app/assets/javascripts/pipelines/components/pipeline_url.vue
View file @
35991d16
...
@@ -46,7 +46,7 @@
...
@@ -46,7 +46,7 @@
};
};
</
script
>
</
script
>
<
template
>
<
template
>
<div
class=
"table-section section-15
hidden-xs hidden-sm
pipeline-tags"
>
<div
class=
"table-section section-15
d-none d-sm-none d-md-block
pipeline-tags"
>
<a
<a
:href=
"pipeline.path"
:href=
"pipeline.path"
class=
"js-pipeline-url-link"
>
class=
"js-pipeline-url-link"
>
...
...
app/assets/javascripts/pipelines/components/pipelines_table_row.vue
View file @
35991d16
...
@@ -296,7 +296,7 @@
...
@@ -296,7 +296,7 @@
<pipelines-artifacts-component
<pipelines-artifacts-component
v-if=
"pipeline.details.artifacts.length"
v-if=
"pipeline.details.artifacts.length"
class=
"
hidden-xs hidden-sm
"
class=
"
d-none d-sm-none d-md-block
"
:artifacts=
"pipeline.details.artifacts"
:artifacts=
"pipeline.details.artifacts"
/>
/>
...
...
app/assets/javascripts/pipelines/components/time_ago.vue
View file @
35991d16
...
@@ -75,7 +75,7 @@
...
@@ -75,7 +75,7 @@
</p>
</p>
<p
<p
class=
"finished-at
hidden-xs hidden-sm
"
class=
"finished-at
d-none d-sm-none d-md-block
"
v-if=
"hasFinishedTime"
v-if=
"hasFinishedTime"
>
>
...
...
app/views/admin/abuse_reports/index.html.haml
View file @
35991d16
...
@@ -5,7 +5,7 @@
...
@@ -5,7 +5,7 @@
-
if
@abuse_reports
.
present?
-
if
@abuse_reports
.
present?
.table-holder
.table-holder
%table
.table.responsive-table
%table
.table.responsive-table
%thead
.
hidden-sm.hidden-xs
%thead
.
d-none.d-sm-none.d-md-block
%tr
%tr
%th
User
%th
User
%th
Reported by
%th
Reported by
...
...
app/views/admin/gitaly_servers/index.html.haml
View file @
35991d16
...
@@ -6,7 +6,7 @@
...
@@ -6,7 +6,7 @@
-
if
@gitaly_servers
.
any?
-
if
@gitaly_servers
.
any?
.table-holder
.table-holder
%table
.table.responsive-table
%table
.table.responsive-table
%thead
.
hidden-sm.hidden-xs
%thead
.
d-none.d-sm-none.d-md-block
%tr
%tr
%th
=
_
(
"Storage"
)
%th
=
_
(
"Storage"
)
%th
=
n_
(
"Gitaly|Address"
)
%th
=
n_
(
"Gitaly|Address"
)
...
...
app/views/layouts/header/_default.html.haml
View file @
35991d16
...
@@ -21,7 +21,7 @@
...
@@ -21,7 +21,7 @@
-
if
current_user
-
if
current_user
=
render
'layouts/header/new_dropdown'
=
render
'layouts/header/new_dropdown'
-
if
header_link?
(
:search
)
-
if
header_link?
(
:search
)
%li
.
hidden-sm.hidden-xs
%li
.
d-none.d-sm-none.d-md-block
=
render
'layouts/search'
unless
current_controller?
(
:search
)
=
render
'layouts/search'
unless
current_controller?
(
:search
)
%li
.d-inline-block.d-sm-none.d-md-none
%li
.d-inline-block.d-sm-none.d-md-none
=
link_to
search_path
,
title:
'Search'
,
aria:
{
label:
"Search"
},
data:
{
toggle:
'tooltip'
,
placement:
'bottom'
,
container:
'body'
}
do
=
link_to
search_path
,
title:
'Search'
,
aria:
{
label:
"Search"
},
data:
{
toggle:
'tooltip'
,
placement:
'bottom'
,
container:
'body'
}
do
...
...
app/views/projects/commit/_commit_box.html.haml
View file @
35991d16
...
@@ -22,7 +22,7 @@
...
@@ -22,7 +22,7 @@
%span
.btn.disabled.btn-grouped.hidden-xs.append-right-10
%span
.btn.disabled.btn-grouped.hidden-xs.append-right-10
=
icon
(
'comment'
)
=
icon
(
'comment'
)
=
@notes_count
=
@notes_count
=
link_to
project_tree_path
(
@project
,
@commit
),
class:
"btn btn-secondary append-right-10
hidden-xs hidden-sm
"
do
=
link_to
project_tree_path
(
@project
,
@commit
),
class:
"btn btn-secondary append-right-10
d-none d-sm-none d-md-block
"
do
#{
_
(
'Browse files'
)
}
#{
_
(
'Browse files'
)
}
.dropdown.inline
.dropdown.inline
%a
.btn.btn-secondary.dropdown-toggle
{
data:
{
toggle:
"dropdown"
}
}
%a
.btn.btn-secondary.dropdown-toggle
{
data:
{
toggle:
"dropdown"
}
}
...
...
app/views/projects/commits/show.html.haml
View file @
35991d16
...
@@ -15,7 +15,7 @@
...
@@ -15,7 +15,7 @@
%ul
.breadcrumb.repo-breadcrumb
%ul
.breadcrumb.repo-breadcrumb
=
commits_breadcrumbs
=
commits_breadcrumbs
.tree-controls.
hidden-xs.hidden-sm
.tree-controls.
d-none.d-sm-none.d-md-block
-
if
@merge_request
.
present?
-
if
@merge_request
.
present?
.control
.control
=
link_to
_
(
"View open merge request"
),
project_merge_request_path
(
@project
,
@merge_request
),
class:
'btn'
=
link_to
_
(
"View open merge request"
),
project_merge_request_path
(
@project
,
@merge_request
),
class:
'btn'
...
...
app/views/projects/diffs/_diffs.html.haml
View file @
35991d16
...
@@ -6,7 +6,7 @@
...
@@ -6,7 +6,7 @@
.content-block.oneline-block.files-changed.diff-files-changed.js-diff-files-changed
{
class:
(
"diff-files-changed-merge-request"
if
merge_request
)
}
.content-block.oneline-block.files-changed.diff-files-changed.js-diff-files-changed
{
class:
(
"diff-files-changed-merge-request"
if
merge_request
)
}
.files-changed-inner
.files-changed-inner
.inline-parallel-buttons.
hidden-xs.hidden-sm
.inline-parallel-buttons.
d-none.d-sm-none.d-md-block
-
if
!
diffs_expanded?
&&
diff_files
.
any?
{
|
diff_file
|
diff_file
.
collapsed?
}
-
if
!
diffs_expanded?
&&
diff_files
.
any?
{
|
diff_file
|
diff_file
.
collapsed?
}
=
link_to
'Expand all'
,
url_for
(
params
.
merge
(
expanded:
1
,
format:
nil
)),
class:
'btn btn-secondary'
=
link_to
'Expand all'
,
url_for
(
params
.
merge
(
expanded:
1
,
format:
nil
)),
class:
'btn btn-secondary'
-
if
show_whitespace_toggle
-
if
show_whitespace_toggle
...
...
app/views/projects/diffs/_stats.html.haml
View file @
35991d16
...
@@ -10,7 +10,7 @@
...
@@ -10,7 +10,7 @@
%strong
.cgreen
=
pluralize
(
sum_added_lines
,
'addition'
)
%strong
.cgreen
=
pluralize
(
sum_added_lines
,
'addition'
)
and
and
%strong
.cred
=
pluralize
(
sum_removed_lines
,
'deletion'
)
%strong
.cred
=
pluralize
(
sum_removed_lines
,
'deletion'
)
.diff-stats-additions-deletions-collapsed.float-right.
hidden-xs.hidden-sm
{
"aria-hidden"
:
"true"
,
"aria-describedby"
:
"diff-stats"
}
.diff-stats-additions-deletions-collapsed.float-right.
d-none.d-sm-none.d-md-block
{
"aria-hidden"
:
"true"
,
"aria-describedby"
:
"diff-stats"
}
%strong
.cgreen
<
%strong
.cgreen
<
+
#{
sum_added_lines
}
+
#{
sum_added_lines
}
%strong
.cred
<
%strong
.cred
<
...
...
app/views/projects/issues/show.html.haml
View file @
35991d16
...
@@ -49,8 +49,8 @@
...
@@ -49,8 +49,8 @@
=
render
'shared/issuable/close_reopen_button'
,
issuable:
@issue
,
can_update:
can_update_issue
=
render
'shared/issuable/close_reopen_button'
,
issuable:
@issue
,
can_update:
can_update_issue
-
if
can_report_spam
-
if
can_report_spam
=
link_to
'Submit as spam'
,
mark_as_spam_project_issue_path
(
@project
,
@issue
),
method: :post
,
class:
'
hidden-xs hidden-sm
btn btn-grouped btn-spam'
,
title:
'Submit as spam'
=
link_to
'Submit as spam'
,
mark_as_spam_project_issue_path
(
@project
,
@issue
),
method: :post
,
class:
'
d-none d-sm-none d-md-block
btn btn-grouped btn-spam'
,
title:
'Submit as spam'
=
link_to
new_project_issue_path
(
@project
),
class:
'
hidden-xs hidden-sm
btn btn-grouped new-issue-link btn-new btn-inverted'
,
title:
'New issue'
,
id:
'new_issue_link'
do
=
link_to
new_project_issue_path
(
@project
),
class:
'
d-none d-sm-none d-md-block
btn btn-grouped new-issue-link btn-new btn-inverted'
,
title:
'New issue'
,
id:
'new_issue_link'
do
New issue
New issue
.issue-details.issuable-details
.issue-details.issuable-details
...
...
app/views/projects/merge_requests/_mr_title.html.haml
View file @
35991d16
...
@@ -37,6 +37,6 @@
...
@@ -37,6 +37,6 @@
=
link_to
'Reopen'
,
merge_request_path
(
@merge_request
,
merge_request:
{
state_event: :reopen
}),
method: :put
,
class:
'reopen-mr-link'
,
title:
'Reopen merge request'
=
link_to
'Reopen'
,
merge_request_path
(
@merge_request
,
merge_request:
{
state_event: :reopen
}),
method: :put
,
class:
'reopen-mr-link'
,
title:
'Reopen merge request'
-
if
can_update_merge_request
-
if
can_update_merge_request
=
link_to
'Edit'
,
edit_project_merge_request_path
(
@project
,
@merge_request
),
class:
"
hidden-xs hidden-sm
btn btn-grouped js-issuable-edit"
=
link_to
'Edit'
,
edit_project_merge_request_path
(
@project
,
@merge_request
),
class:
"
d-none d-sm-none d-md-block
btn btn-grouped js-issuable-edit"
=
render
'shared/issuable/close_reopen_button'
,
issuable:
@merge_request
,
can_update:
can_update_merge_request
=
render
'shared/issuable/close_reopen_button'
,
issuable:
@merge_request
,
can_update:
can_update_merge_request
app/views/projects/pipelines/_info.html.haml
View file @
35991d16
...
@@ -27,7 +27,7 @@
...
@@ -27,7 +27,7 @@
.icon-container.commit-icon
.icon-container.commit-icon
=
custom_icon
(
"icon_commit"
)
=
custom_icon
(
"icon_commit"
)
=
link_to
@commit
.
short_id
,
project_commit_path
(
@project
,
@pipeline
.
sha
),
class:
"commit-sha js-details-short"
=
link_to
@commit
.
short_id
,
project_commit_path
(
@project
,
@pipeline
.
sha
),
class:
"commit-sha js-details-short"
=
link_to
(
"#"
,
class:
"js-details-expand
hidden-xs hidden-sm
"
)
do
=
link_to
(
"#"
,
class:
"js-details-expand
d-none d-sm-none d-md-block
"
)
do
%span
.text-expander
%span
.text-expander
\...
\...
%span
.js-details-content.d-none
%span
.js-details-content.d-none
...
...
app/views/shared/_label.html.haml
View file @
35991d16
...
@@ -46,7 +46,7 @@
...
@@ -46,7 +46,7 @@
data:
{
confirm:
'Remove this label? Are you sure?'
},
data:
{
confirm:
'Remove this label? Are you sure?'
},
class:
'text-danger'
class:
'text-danger'
.float-right.
hidden-xs.hidden-sm
.float-right.
d-none.d-sm-none.d-md-block
-
if
label
.
is_a?
(
ProjectLabel
)
&&
label
.
project
.
group
&&
can?
(
current_user
,
:admin_label
,
label
.
project
.
group
)
-
if
label
.
is_a?
(
ProjectLabel
)
&&
label
.
project
.
group
&&
can?
(
current_user
,
:admin_label
,
label
.
project
.
group
)
%button
.js-promote-project-label-button.btn.btn-transparent.btn-action.has-tooltip
{
title:
_
(
'Promote to Group Label'
),
%button
.js-promote-project-label-button.btn.btn-transparent.btn-action.has-tooltip
{
title:
_
(
'Promote to Group Label'
),
disabled:
true
,
disabled:
true
,
...
...
app/views/shared/_label_row.html.haml
View file @
35991d16
...
@@ -22,7 +22,7 @@
...
@@ -22,7 +22,7 @@
-
if
label
.
description
.
present?
-
if
label
.
description
.
present?
.description-text
.description-text
=
markdown_field
(
label
,
:description
)
=
markdown_field
(
label
,
:description
)
.
hidden-xs.hidden-sm
.
d-none.d-sm-none.d-md-block
-
if
show_label_issues_link
-
if
show_label_issues_link
=
link_to_label
(
label
,
subject:
subject
)
{
'Issues'
}
=
link_to_label
(
label
,
subject:
subject
)
{
'Issues'
}
-
if
show_label_merge_requests_link
-
if
show_label_merge_requests_link
...
...
app/views/shared/boards/_show.html.haml
View file @
35991d16
...
@@ -13,7 +13,7 @@
...
@@ -13,7 +13,7 @@
%script
#js-board-modal-filter
{
type:
"text/x-template"
}=
render
"shared/issuable/search_bar"
,
type: :boards_modal
%script
#js-board-modal-filter
{
type:
"text/x-template"
}=
render
"shared/issuable/search_bar"
,
type: :boards_modal
#board-app
.boards-app
{
"v-cloak"
=>
true
,
data:
board_data
,
":class"
=>
"{ 'is-compact': detailIssueVisible }"
}
#board-app
.boards-app
{
"v-cloak"
=>
true
,
data:
board_data
,
":class"
=>
"{ 'is-compact': detailIssueVisible }"
}
.
hidden-xs.hidden-sm
.
d-none.d-sm-none.d-md-block
=
render
'shared/issuable/search_bar'
,
type: :boards
=
render
'shared/issuable/search_bar'
,
type: :boards
.boards-list
.boards-list
...
...
app/views/shared/issuable/_close_reopen_button.html.haml
View file @
35991d16
...
@@ -4,11 +4,11 @@
...
@@ -4,11 +4,11 @@
-
if
can_update
&&
is_current_user
-
if
can_update
&&
is_current_user
=
link_to
"Close
#{
display_issuable_type
}
"
,
close_issuable_path
(
issuable
),
method:
button_method
,
=
link_to
"Close
#{
display_issuable_type
}
"
,
close_issuable_path
(
issuable
),
method:
button_method
,
class:
"
hidden-xs hidden-sm
btn btn-grouped btn-close js-btn-issue-action
#{
issuable_button_visibility
(
issuable
,
true
)
}
"
,
title:
"Close
#{
display_issuable_type
}
"
class:
"
d-none d-sm-none d-md-block
btn btn-grouped btn-close js-btn-issue-action
#{
issuable_button_visibility
(
issuable
,
true
)
}
"
,
title:
"Close
#{
display_issuable_type
}
"
=
link_to
"Reopen
#{
display_issuable_type
}
"
,
reopen_issuable_path
(
issuable
),
method:
button_method
,
=
link_to
"Reopen
#{
display_issuable_type
}
"
,
reopen_issuable_path
(
issuable
),
method:
button_method
,
class:
"
hidden-xs hidden-sm
btn btn-grouped btn-reopen js-btn-issue-action
#{
issuable_button_visibility
(
issuable
,
false
)
}
"
,
title:
"Reopen
#{
display_issuable_type
}
"
class:
"
d-none d-sm-none d-md-block
btn btn-grouped btn-reopen js-btn-issue-action
#{
issuable_button_visibility
(
issuable
,
false
)
}
"
,
title:
"Reopen
#{
display_issuable_type
}
"
-
elsif
can_update
&&
!
is_current_user
-
elsif
can_update
&&
!
is_current_user
=
render
'shared/issuable/close_reopen_report_toggle'
,
issuable:
issuable
=
render
'shared/issuable/close_reopen_report_toggle'
,
issuable:
issuable
-
else
-
else
=
link_to
'Report abuse'
,
new_abuse_report_path
(
user_id:
issuable
.
author
.
id
,
ref_url:
issuable_url
(
issuable
)),
=
link_to
'Report abuse'
,
new_abuse_report_path
(
user_id:
issuable
.
author
.
id
,
ref_url:
issuable_url
(
issuable
)),
class:
'
hidden-xs hidden-sm
btn btn-grouped btn-close-color'
,
title:
'Report abuse'
class:
'
d-none d-sm-none d-md-block
btn btn-grouped btn-close-color'
,
title:
'Report abuse'
app/views/shared/issuable/_close_reopen_report_toggle.html.haml
View file @
35991d16
-
display_issuable_type
=
issuable_display_type
(
issuable
)
-
display_issuable_type
=
issuable_display_type
(
issuable
)
-
button_action
=
issuable
.
closed?
?
'reopen'
:
'close'
-
button_action
=
issuable
.
closed?
?
'reopen'
:
'close'
-
display_button_action
=
button_action
.
capitalize
-
display_button_action
=
button_action
.
capitalize
-
button_responsive_class
=
'
hidden-xs hidden-sm
'
-
button_responsive_class
=
'
d-none d-sm-none d-md-block
'
-
button_class
=
"
#{
button_responsive_class
}
btn btn-grouped js-issuable-close-button js-btn-issue-action issuable-close-button"
-
button_class
=
"
#{
button_responsive_class
}
btn btn-grouped js-issuable-close-button js-btn-issue-action issuable-close-button"
-
toggle_class
=
"
#{
button_responsive_class
}
btn btn-nr dropdown-toggle js-issuable-close-toggle"
-
toggle_class
=
"
#{
button_responsive_class
}
btn btn-nr dropdown-toggle js-issuable-close-toggle"
-
button_method
=
issuable_close_reopen_button_method
(
issuable
)
-
button_method
=
issuable_close_reopen_button_method
(
issuable
)
...
...
app/views/shared/notes/_notes_with_form.html.haml
View file @
35991d16
...
@@ -13,7 +13,7 @@
...
@@ -13,7 +13,7 @@
.timeline-entry-inner
.timeline-entry-inner
.flash-container.timeline-content
.flash-container.timeline-content
.timeline-icon.
hidden-xs.hidden-sm
.timeline-icon.
d-none.d-sm-none.d-md-block
%a
.author_link
{
href:
user_path
(
current_user
)
}
%a
.author_link
{
href:
user_path
(
current_user
)
}
=
image_tag
avatar_icon_for_user
(
current_user
),
alt:
current_user
.
to_reference
,
class:
'avatar s40'
=
image_tag
avatar_icon_for_user
(
current_user
),
alt:
current_user
.
to_reference
,
class:
'avatar s40'
.timeline-content.timeline-content-form
.timeline-content.timeline-content-form
...
...
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