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
Boxiang Sun
gitlab-ce
Commits
9bcf8f43
Commit
9bcf8f43
authored
Apr 09, 2018
by
Clement Ho
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[skip ci] Replace hidden-xs
parent
35991d16
Changes
59
Show whitespace changes
Inline
Side-by-side
Showing
59 changed files
with
94 additions
and
94 deletions
+94
-94
app/assets/javascripts/deploy_keys/components/key.vue
app/assets/javascripts/deploy_keys/components/key.vue
+1
-1
app/assets/javascripts/groups/components/group_item.vue
app/assets/javascripts/groups/components/group_item.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.js
app/assets/javascripts/notes.js
+2
-2
app/assets/javascripts/projects_dropdown/components/search.vue
...ssets/javascripts/projects_dropdown/components/search.vue
+1
-1
app/assets/javascripts/registry/components/collapsible_container.vue
...javascripts/registry/components/collapsible_container.vue
+1
-1
app/assets/javascripts/registry/components/table_registry.vue
...assets/javascripts/registry/components/table_registry.vue
+1
-1
app/assets/javascripts/vue_shared/components/notes/placeholder_note.vue
...ascripts/vue_shared/components/notes/placeholder_note.vue
+1
-1
app/helpers/avatars_helper.rb
app/helpers/avatars_helper.rb
+1
-1
app/helpers/issuables_helper.rb
app/helpers/issuables_helper.rb
+1
-1
app/views/admin/groups/_group.html.haml
app/views/admin/groups/_group.html.haml
+1
-1
app/views/admin/hook_logs/_index.html.haml
app/views/admin/hook_logs/_index.html.haml
+1
-1
app/views/dashboard/_snippets_head.html.haml
app/views/dashboard/_snippets_head.html.haml
+1
-1
app/views/layouts/header/_default.html.haml
app/views/layouts/header/_default.html.haml
+1
-1
app/views/layouts/nav/_dashboard.html.haml
app/views/layouts/nav/_dashboard.html.haml
+3
-3
app/views/profiles/gpg_keys/_key.html.haml
app/views/profiles/gpg_keys/_key.html.haml
+1
-1
app/views/profiles/keys/_key.html.haml
app/views/profiles/keys/_key.html.haml
+2
-2
app/views/projects/_home_panel.html.haml
app/views/projects/_home_panel.html.haml
+1
-1
app/views/projects/_issuable_by_email.html.haml
app/views/projects/_issuable_by_email.html.haml
+1
-1
app/views/projects/_last_push.html.haml
app/views/projects/_last_push.html.haml
+1
-1
app/views/projects/artifacts/file.html.haml
app/views/projects/artifacts/file.html.haml
+1
-1
app/views/projects/blob/_blob.html.haml
app/views/projects/blob/_blob.html.haml
+1
-1
app/views/projects/branches/_branch.html.haml
app/views/projects/branches/_branch.html.haml
+1
-1
app/views/projects/commit/_commit_box.html.haml
app/views/projects/commit/_commit_box.html.haml
+2
-2
app/views/projects/commits/_commit.html.haml
app/views/projects/commits/_commit.html.haml
+3
-3
app/views/projects/diffs/_diffs.html.haml
app/views/projects/diffs/_diffs.html.haml
+3
-3
app/views/projects/diffs/_file.html.haml
app/views/projects/diffs/_file.html.haml
+1
-1
app/views/projects/hook_logs/_index.html.haml
app/views/projects/hook_logs/_index.html.haml
+1
-1
app/views/projects/issues/_issue.html.haml
app/views/projects/issues/_issue.html.haml
+5
-5
app/views/projects/issues/show.html.haml
app/views/projects/issues/show.html.haml
+2
-2
app/views/projects/jobs/_user.html.haml
app/views/projects/jobs/_user.html.haml
+1
-1
app/views/projects/jobs/show.html.haml
app/views/projects/jobs/show.html.haml
+1
-1
app/views/projects/merge_requests/_merge_request.html.haml
app/views/projects/merge_requests/_merge_request.html.haml
+8
-8
app/views/projects/merge_requests/_mr_title.html.haml
app/views/projects/merge_requests/_mr_title.html.haml
+1
-1
app/views/projects/merge_requests/diffs/_commit_widget.html.haml
...ws/projects/merge_requests/diffs/_commit_widget.html.haml
+1
-1
app/views/projects/new.html.haml
app/views/projects/new.html.haml
+3
-3
app/views/projects/pages_domains/show.html.haml
app/views/projects/pages_domains/show.html.haml
+2
-2
app/views/projects/registry/repositories/_tag.html.haml
app/views/projects/registry/repositories/_tag.html.haml
+1
-1
app/views/projects/services/_index.html.haml
app/views/projects/services/_index.html.haml
+3
-3
app/views/projects/snippets/_actions.html.haml
app/views/projects/snippets/_actions.html.haml
+1
-1
app/views/projects/tree/_blob_item.html.haml
app/views/projects/tree/_blob_item.html.haml
+1
-1
app/views/projects/tree/_submodule_item.html.haml
app/views/projects/tree/_submodule_item.html.haml
+1
-1
app/views/projects/tree/_tree_content.html.haml
app/views/projects/tree/_tree_content.html.haml
+2
-2
app/views/projects/tree/_tree_item.html.haml
app/views/projects/tree/_tree_item.html.haml
+1
-1
app/views/shared/_commit_well.html.haml
app/views/shared/_commit_well.html.haml
+1
-1
app/views/shared/_issuable_meta_data.html.haml
app/views/shared/_issuable_meta_data.html.haml
+4
-4
app/views/shared/_project_limit.html.haml
app/views/shared/_project_limit.html.haml
+1
-1
app/views/shared/groups/_group.html.haml
app/views/shared/groups/_group.html.haml
+1
-1
app/views/shared/hook_logs/_content.html.haml
app/views/shared/hook_logs/_content.html.haml
+1
-1
app/views/shared/members/_group.html.haml
app/views/shared/members/_group.html.haml
+1
-1
app/views/shared/members/_member.html.haml
app/views/shared/members/_member.html.haml
+3
-3
app/views/shared/snippets/_blob.html.haml
app/views/shared/snippets/_blob.html.haml
+1
-1
app/views/shared/snippets/_header.html.haml
app/views/shared/snippets/_header.html.haml
+1
-1
app/views/shared/snippets/_snippet.html.haml
app/views/shared/snippets/_snippet.html.haml
+3
-3
app/views/snippets/_actions.html.haml
app/views/snippets/_actions.html.haml
+1
-1
app/views/snippets/index.html.haml
app/views/snippets/index.html.haml
+1
-1
app/views/users/show.html.haml
app/views/users/show.html.haml
+1
-1
spec/javascripts/notes_spec.js
spec/javascripts/notes_spec.js
+2
-2
spec/javascripts/projects_dropdown/components/search_spec.js
spec/javascripts/projects_dropdown/components/search_spec.js
+1
-1
No files found.
app/assets/javascripts/deploy_keys/components/key.vue
View file @
9bcf8f43
...
@@ -45,7 +45,7 @@
...
@@ -45,7 +45,7 @@
<
template
>
<
template
>
<div>
<div>
<div
class=
"float-left append-right-10
hidden-xs
"
>
<div
class=
"float-left append-right-10
d-none d-sm-block
"
>
<i
<i
aria-hidden=
"true"
aria-hidden=
"true"
class=
"fa fa-key key-icon"
class=
"fa fa-key key-icon"
...
...
app/assets/javascripts/groups/components/group_item.vue
View file @
9bcf8f43
...
@@ -99,7 +99,7 @@ export default {
...
@@ -99,7 +99,7 @@ export default {
/>
/>
</div>
</div>
<div
<div
class=
"avatar-container prepend-top-8 prepend-left-5 s24
hidden-xs
"
class=
"avatar-container prepend-top-8 prepend-left-5 s24
d-none d-sm-block
"
:class=
"
{ 'content-loading': group.isChildrenLoading }"
:class=
"
{ 'content-loading': group.isChildrenLoading }"
>
>
<a
<a
...
...
app/assets/javascripts/ide/components/repo_loading_file.vue
View file @
9bcf8f43
...
@@ -31,7 +31,7 @@
...
@@ -31,7 +31,7 @@
/>
/>
</td>
</td>
<td
class=
"
hidden-xs
"
>
<td
class=
"
d-none d-sm-block
"
>
<skeleton-loading-container
<skeleton-loading-container
class=
"animation-container-right"
class=
"animation-container-right"
:small=
"true"
:small=
"true"
...
...
app/assets/javascripts/notes.js
View file @
9bcf8f43
...
@@ -1659,7 +1659,7 @@ export default class Notes {
...
@@ -1659,7 +1659,7 @@ export default class Notes {
<div class="note-header">
<div class="note-header">
<div class="note-header-info">
<div class="note-header-info">
<a href="/
${
_
.
escape
(
currentUsername
)}
">
<a href="/
${
_
.
escape
(
currentUsername
)}
">
<span class="
hidden-xs
">
${
_
.
escape
(
<span class="
d-none d-sm-block
">
${
_
.
escape
(
currentUsername
,
currentUsername
,
)}
</span>
)}
</span>
<span class="note-headline-light">
${
_
.
escape
(
<span class="note-headline-light">
${
_
.
escape
(
...
@@ -1678,7 +1678,7 @@ export default class Notes {
...
@@ -1678,7 +1678,7 @@ export default class Notes {
</li>`
,
</li>`
,
);
);
$tempNote
.
find
(
'
.
hidden-xs
'
).
text
(
_
.
escape
(
currentUserFullname
));
$tempNote
.
find
(
'
.
d-none.d-sm-block
'
).
text
(
_
.
escape
(
currentUserFullname
));
$tempNote
$tempNote
.
find
(
'
.note-headline-light
'
)
.
find
(
'
.note-headline-light
'
)
.
text
(
`@
${
_
.
escape
(
currentUsername
)}
`
);
.
text
(
`@
${
_
.
escape
(
currentUsername
)}
`
);
...
...
app/assets/javascripts/projects_dropdown/components/search.vue
View file @
9bcf8f43
...
@@ -46,7 +46,7 @@
...
@@ -46,7 +46,7 @@
<
template
>
<
template
>
<div
<div
class=
"search-input-container
hidden-xs
"
class=
"search-input-container
d-none d-sm-block
"
>
>
<input
<input
type=
"search"
type=
"search"
...
...
app/assets/javascripts/registry/components/collapsible_container.vue
View file @
9bcf8f43
...
@@ -89,7 +89,7 @@
...
@@ -89,7 +89,7 @@
css-class=
"btn-secondary btn-transparent btn-clipboard"
css-class=
"btn-secondary btn-transparent btn-clipboard"
/>
/>
<div
class=
"controls
hidden-xs
float-right"
>
<div
class=
"controls
d-none d-sm-block
float-right"
>
<button
<button
v-if=
"repo.canDelete"
v-if=
"repo.canDelete"
type=
"button"
type=
"button"
...
...
app/assets/javascripts/registry/components/table_registry.vue
View file @
9bcf8f43
...
@@ -118,7 +118,7 @@
...
@@ -118,7 +118,7 @@
<button
<button
v-if=
"item.canDelete"
v-if=
"item.canDelete"
type=
"button"
type=
"button"
class=
"js-delete-registry btn btn-danger
hidden-xs
float-right"
class=
"js-delete-registry btn btn-danger
d-none d-sm-block
float-right"
:title=
"s__('ContainerRegistry|Remove tag')"
:title=
"s__('ContainerRegistry|Remove tag')"
:aria-label=
"s__('ContainerRegistry|Remove tag')"
:aria-label=
"s__('ContainerRegistry|Remove tag')"
data-container=
"body"
data-container=
"body"
...
...
app/assets/javascripts/vue_shared/components/notes/placeholder_note.vue
View file @
9bcf8f43
...
@@ -54,7 +54,7 @@
...
@@ -54,7 +54,7 @@
<div
class=
"note-header"
>
<div
class=
"note-header"
>
<div
class=
"note-header-info"
>
<div
class=
"note-header-info"
>
<a
:href=
"getUserData.path"
>
<a
:href=
"getUserData.path"
>
<span
class=
"
hidden-xs
"
>
{{
getUserData
.
name
}}
</span>
<span
class=
"
d-none d-sm-block
"
>
{{
getUserData
.
name
}}
</span>
<span
class=
"note-headline-light"
>
@
{{
getUserData
.
username
}}
</span>
<span
class=
"note-headline-light"
>
@
{{
getUserData
.
username
}}
</span>
</a>
</a>
</div>
</div>
...
...
app/helpers/avatars_helper.rb
View file @
9bcf8f43
...
@@ -4,7 +4,7 @@ module AvatarsHelper
...
@@ -4,7 +4,7 @@ module AvatarsHelper
user:
commit_or_event
.
author
,
user:
commit_or_event
.
author
,
user_name:
commit_or_event
.
author_name
,
user_name:
commit_or_event
.
author_name
,
user_email:
commit_or_event
.
author_email
,
user_email:
commit_or_event
.
author_email
,
css_class:
'
hidden-xs
'
css_class:
'
d-none d-sm-block
'
}))
}))
end
end
...
...
app/helpers/issuables_helper.rb
View file @
9bcf8f43
...
@@ -131,7 +131,7 @@ module IssuablesHelper
...
@@ -131,7 +131,7 @@ module IssuablesHelper
output
=
""
output
=
""
output
<<
"Opened
#{
time_ago_with_tooltip
(
issuable
.
created_at
)
}
by "
.
html_safe
output
<<
"Opened
#{
time_ago_with_tooltip
(
issuable
.
created_at
)
}
by "
.
html_safe
output
<<
content_tag
(
:strong
)
do
output
<<
content_tag
(
:strong
)
do
author_output
=
link_to_member
(
project
,
issuable
.
author
,
size:
24
,
mobile_classes:
"
hidden-xs
"
,
tooltip:
true
)
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
,
by_username:
true
,
avatar:
false
,
mobile_classes:
"d-block d-sm-none"
)
author_output
<<
link_to_member
(
project
,
issuable
.
author
,
size:
24
,
by_username:
true
,
avatar:
false
,
mobile_classes:
"d-block d-sm-none"
)
end
end
...
...
app/views/admin/groups/_group.html.haml
View file @
9bcf8f43
...
@@ -20,7 +20,7 @@
...
@@ -20,7 +20,7 @@
=
visibility_level_icon
(
group
.
visibility_level
,
fw:
false
)
=
visibility_level_icon
(
group
.
visibility_level
,
fw:
false
)
.avatar-container.s40
.avatar-container.s40
=
group_icon
(
group
,
class:
"avatar s40
hidden-xs
"
)
=
group_icon
(
group
,
class:
"avatar s40
d-none d-sm-block
"
)
.title
.title
=
link_to
[
:admin
,
group
],
class:
'group-name'
do
=
link_to
[
:admin
,
group
],
class:
'group-name'
do
=
group
.
full_name
=
group
.
full_name
...
...
app/views/admin/hook_logs/_index.html.haml
View file @
9bcf8f43
...
@@ -18,7 +18,7 @@
...
@@ -18,7 +18,7 @@
%tr
%tr
%td
%td
=
render
partial:
'shared/hook_logs/status_label'
,
locals:
{
hook_log:
hook_log
}
=
render
partial:
'shared/hook_logs/status_label'
,
locals:
{
hook_log:
hook_log
}
%td
.
hidden-xs
%td
.
d-none.d-sm-block
%span
.label.label-gray.deploy-project-label
%span
.label.label-gray.deploy-project-label
=
hook_log
.
trigger
.
singularize
.
titleize
=
hook_log
.
trigger
.
singularize
.
titleize
%td
%td
...
...
app/views/dashboard/_snippets_head.html.haml
View file @
9bcf8f43
...
@@ -8,5 +8,5 @@
...
@@ -8,5 +8,5 @@
Explore snippets
Explore snippets
-
if
current_user
-
if
current_user
.nav-controls.
hidden-xs
.nav-controls.
d-none.d-sm-block
=
link_to
"New snippet"
,
new_snippet_path
,
class:
"btn btn-new"
,
title:
"New snippet"
=
link_to
"New snippet"
,
new_snippet_path
,
class:
"btn btn-new"
,
title:
"New snippet"
app/views/layouts/header/_default.html.haml
View file @
9bcf8f43
...
@@ -8,7 +8,7 @@
...
@@ -8,7 +8,7 @@
=
brand_header_logo
=
brand_header_logo
-
logo_text
=
brand_header_logo_type
-
logo_text
=
brand_header_logo_type
-
if
logo_text
.
present?
-
if
logo_text
.
present?
%span
.logo-text.
hidden-xs
%span
.logo-text.
d-none.d-sm-block
=
logo_text
=
logo_text
-
if
current_user
-
if
current_user
...
...
app/views/layouts/nav/_dashboard.html.haml
View file @
9bcf8f43
...
@@ -8,7 +8,7 @@
...
@@ -8,7 +8,7 @@
=
render
"layouts/nav/projects_dropdown/show"
=
render
"layouts/nav/projects_dropdown/show"
-
if
dashboard_nav_link?
(
:groups
)
-
if
dashboard_nav_link?
(
:groups
)
=
nav_link
(
controller:
[
'dashboard/groups'
,
'explore/groups'
],
html_options:
{
class:
"
hidden-xs
"
})
do
=
nav_link
(
controller:
[
'dashboard/groups'
,
'explore/groups'
],
html_options:
{
class:
"
d-none d-sm-block
"
})
do
=
link_to
dashboard_groups_path
,
class:
'dashboard-shortcuts-groups qa-groups-link'
,
title:
'Groups'
do
=
link_to
dashboard_groups_path
,
class:
'dashboard-shortcuts-groups qa-groups-link'
,
title:
'Groups'
do
Groups
Groups
...
@@ -61,13 +61,13 @@
...
@@ -61,13 +61,13 @@
Projects
Projects
-
if
current_controller?
(
'ide'
)
-
if
current_controller?
(
'ide'
)
%li
.line-separator.
hidden-xs
%li
.line-separator.
d-none.d-sm-block
=
nav_link
(
controller:
'ide'
)
do
=
nav_link
(
controller:
'ide'
)
do
=
link_to
'#'
,
class:
'dashboard-shortcuts-web-ide'
,
title:
'Web IDE'
do
=
link_to
'#'
,
class:
'dashboard-shortcuts-web-ide'
,
title:
'Web IDE'
do
Web IDE
Web IDE
-
if
current_user
.
admin?
||
Gitlab
::
Sherlock
.
enabled?
-
if
current_user
.
admin?
||
Gitlab
::
Sherlock
.
enabled?
%li
.line-separator.
hidden-xs
%li
.line-separator.
d-none.d-sm-block
-
if
current_user
.
admin?
-
if
current_user
.
admin?
=
nav_link
(
controller:
'admin/dashboard'
)
do
=
nav_link
(
controller:
'admin/dashboard'
)
do
=
link_to
admin_root_path
,
class:
'admin-icon qa-admin-area-link'
,
title:
'Admin area'
,
aria:
{
label:
"Admin area"
},
data:
{
toggle:
'tooltip'
,
placement:
'bottom'
,
container:
'body'
}
do
=
link_to
admin_root_path
,
class:
'admin-icon qa-admin-area-link'
,
title:
'Admin area'
,
aria:
{
label:
"Admin area"
},
data:
{
toggle:
'tooltip'
,
placement:
'bottom'
,
container:
'body'
}
do
...
...
app/views/profiles/gpg_keys/_key.html.haml
View file @
9bcf8f43
%li
.key-list-item
%li
.key-list-item
.float-left.append-right-10
.float-left.append-right-10
=
icon
'key'
,
class:
"settings-list-icon
hidden-xs
"
=
icon
'key'
,
class:
"settings-list-icon
d-none d-sm-block
"
.key-list-item-info
.key-list-item-info
-
key
.
emails_with_verified_status
.
map
do
|
email
,
verified
|
-
key
.
emails_with_verified_status
.
map
do
|
email
,
verified
|
=
render
partial:
'shared/email_with_badge'
,
locals:
{
email:
email
,
verified:
verified
}
=
render
partial:
'shared/email_with_badge'
,
locals:
{
email:
email
,
verified:
verified
}
...
...
app/views/profiles/keys/_key.html.haml
View file @
9bcf8f43
%li
.key-list-item
%li
.key-list-item
.float-left.append-right-10
.float-left.append-right-10
-
if
key
.
valid?
-
if
key
.
valid?
=
icon
'key'
,
class:
'settings-list-icon
hidden-xs
'
=
icon
'key'
,
class:
'settings-list-icon
d-none d-sm-block
'
-
else
-
else
=
icon
'exclamation-triangle'
,
class:
'settings-list-icon
hidden-xs
has-tooltip'
,
=
icon
'exclamation-triangle'
,
class:
'settings-list-icon
d-none d-sm-block
has-tooltip'
,
title:
key
.
errors
.
full_messages
.
join
(
', '
)
title:
key
.
errors
.
full_messages
.
join
(
', '
)
...
...
app/views/projects/_home_panel.html.haml
View file @
9bcf8f43
...
@@ -37,7 +37,7 @@
...
@@ -37,7 +37,7 @@
=
render
'projects/buttons/star'
=
render
'projects/buttons/star'
=
render
'projects/buttons/fork'
=
render
'projects/buttons/fork'
%span
.
hidden-xs
%span
.
d-none.d-sm-block
-
if
can?
(
current_user
,
:download_code
,
@project
)
-
if
can?
(
current_user
,
:download_code
,
@project
)
.project-clone-holder
.project-clone-holder
=
render
"shared/clone_panel"
=
render
"shared/clone_panel"
...
...
app/views/projects/_issuable_by_email.html.haml
View file @
9bcf8f43
...
@@ -18,7 +18,7 @@
...
@@ -18,7 +18,7 @@
.email-modal-input-group.input-group
.email-modal-input-group.input-group
=
text_field_tag
:issuable_email
,
email
,
class:
"monospace js-select-on-focus form-control"
,
readonly:
true
=
text_field_tag
:issuable_email
,
email
,
class:
"monospace js-select-on-focus form-control"
,
readonly:
true
.input-group-btn
.input-group-btn
=
clipboard_button
(
target:
'#issuable_email'
,
class:
'btn btn-clipboard btn-transparent
hidden-xs
'
)
=
clipboard_button
(
target:
'#issuable_email'
,
class:
'btn btn-clipboard btn-transparent
d-none d-sm-block
'
)
=
mail_to
email
,
class:
'btn btn-clipboard btn-transparent'
,
=
mail_to
email
,
class:
'btn btn-clipboard btn-transparent'
,
subject:
_
(
"Enter the
#{
name
}
title"
),
subject:
_
(
"Enter the
#{
name
}
title"
),
body:
_
(
"Enter the
#{
name
}
description"
),
body:
_
(
"Enter the
#{
name
}
description"
),
...
...
app/views/projects/_last_push.html.haml
View file @
9bcf8f43
-
event
=
last_push_event
-
event
=
last_push_event
-
if
event
&&
show_last_push_widget?
(
event
)
-
if
event
&&
show_last_push_widget?
(
event
)
.row-content-block.top-block.
hidden-xs
.white
.row-content-block.top-block.
d-none.d-sm-block
.white
.event-last-push
.event-last-push
.event-last-push-text
.event-last-push-text
%span
=
s_
(
"LastPushEvent|You pushed to"
)
%span
=
s_
(
"LastPushEvent|You pushed to"
)
...
...
app/views/projects/artifacts/file.html.haml
View file @
9bcf8f43
...
@@ -22,7 +22,7 @@
...
@@ -22,7 +22,7 @@
.js-file-title.file-title-flex-parent
.js-file-title.file-title-flex-parent
=
render
'projects/blob/header_content'
,
blob:
blob
=
render
'projects/blob/header_content'
,
blob:
blob
.file-actions.
hidden-xs
.file-actions.
d-none.d-sm-block
=
render
'projects/blob/viewer_switcher'
,
blob:
blob
=
render
'projects/blob/viewer_switcher'
,
blob:
blob
.btn-group
{
role:
"group"
}
<
.btn-group
{
role:
"group"
}
<
...
...
app/views/projects/blob/_blob.html.haml
View file @
9bcf8f43
=
render
"projects/blob/breadcrumb"
,
blob:
blob
=
render
"projects/blob/breadcrumb"
,
blob:
blob
.info-well.
hidden-xs
.info-well.
d-none.d-sm-block
.well-segment
.well-segment
%ul
.blob-commit-info
%ul
.blob-commit-info
=
render
'projects/commits/commit'
,
commit:
@last_commit
,
project:
@project
,
ref:
@ref
=
render
'projects/commits/commit'
,
commit:
@last_commit
,
project:
@project
,
ref:
@ref
...
...
app/views/projects/branches/_branch.html.haml
View file @
9bcf8f43
...
@@ -40,7 +40,7 @@
...
@@ -40,7 +40,7 @@
.bar.bar-ahead
{
style:
"width: #{number_commits_ahead * bar_graph_width_factor}%"
}
.bar.bar-ahead
{
style:
"width: #{number_commits_ahead * bar_graph_width_factor}%"
}
%span
.count.count-ahead
=
diverging_count_label
(
number_commits_ahead
)
%span
.count.count-ahead
=
diverging_count_label
(
number_commits_ahead
)
.controls.
hidden-xs
<
.controls.
d-none.d-sm-block
<
-
if
merge_project
&&
create_mr_button?
(
@repository
.
root_ref
,
branch
.
name
)
-
if
merge_project
&&
create_mr_button?
(
@repository
.
root_ref
,
branch
.
name
)
=
link_to
create_mr_path
(
@repository
.
root_ref
,
branch
.
name
),
class:
'btn btn-secondary'
do
=
link_to
create_mr_path
(
@repository
.
root_ref
,
branch
.
name
),
class:
'btn btn-secondary'
do
=
_
(
'Merge request'
)
=
_
(
'Merge request'
)
...
...
app/views/projects/commit/_commit_box.html.haml
View file @
9bcf8f43
...
@@ -5,7 +5,7 @@
...
@@ -5,7 +5,7 @@
#{
s_
(
'CommitBoxTitle|Commit'
)
}
#{
s_
(
'CommitBoxTitle|Commit'
)
}
%span
.commit-sha
=
@commit
.
short_id
%span
.commit-sha
=
@commit
.
short_id
=
clipboard_button
(
text:
@commit
.
id
,
title:
_
(
"Copy commit SHA to clipboard"
))
=
clipboard_button
(
text:
@commit
.
id
,
title:
_
(
"Copy commit SHA to clipboard"
))
%span
.
hidden-xs
authored
%span
.
d-none.d-sm-block
authored
#{
time_ago_with_tooltip
(
@commit
.
authored_date
)
}
#{
time_ago_with_tooltip
(
@commit
.
authored_date
)
}
%span
=
s_
(
'ByAuthor|by'
)
%span
=
s_
(
'ByAuthor|by'
)
=
author_avatar
(
@commit
,
size:
24
)
=
author_avatar
(
@commit
,
size:
24
)
...
@@ -19,7 +19,7 @@
...
@@ -19,7 +19,7 @@
.header-action-buttons
.header-action-buttons
-
if
defined?
(
@notes_count
)
&&
@notes_count
>
0
-
if
defined?
(
@notes_count
)
&&
@notes_count
>
0
%span
.btn.disabled.btn-grouped.
hidden-xs
.append-right-10
%span
.btn.disabled.btn-grouped.
d-none.d-sm-block
.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 d-none d-sm-none d-md-block"
do
=
link_to
project_tree_path
(
@project
,
@commit
),
class:
"btn btn-secondary append-right-10 d-none d-sm-none d-md-block"
do
...
...
app/views/projects/commits/_commit.html.haml
View file @
9bcf8f43
...
@@ -17,7 +17,7 @@
...
@@ -17,7 +17,7 @@
=
cache
(
cache_key
,
expires_in:
1
.
day
)
do
=
cache
(
cache_key
,
expires_in:
1
.
day
)
do
%li
.commit.flex-row.js-toggle-container
{
id:
"commit-#{commit.short_id}"
}
%li
.commit.flex-row.js-toggle-container
{
id:
"commit-#{commit.short_id}"
}
.avatar-cell.
hidden-xs
.avatar-cell.
d-none.d-sm-block
=
author_avatar
(
commit
,
size:
36
)
=
author_avatar
(
commit
,
size:
36
)
.commit-detail.flex-list
.commit-detail.flex-list
...
@@ -33,7 +33,7 @@
...
@@ -33,7 +33,7 @@
.d-block.d-sm-none
.d-block.d-sm-none
=
render_commit_status
(
commit
,
ref:
ref
)
=
render_commit_status
(
commit
,
ref:
ref
)
-
if
commit
.
description?
-
if
commit
.
description?
%button
.text-expander.
hidden-xs
.js-toggle-button
{
type:
"button"
}
...
%button
.text-expander.
d-none.d-sm-block
.js-toggle-button
{
type:
"button"
}
...
-
if
commit
.
description?
-
if
commit
.
description?
%pre
.commit-row-description.js-toggle-content
%pre
.commit-row-description.js-toggle-content
...
@@ -45,7 +45,7 @@
...
@@ -45,7 +45,7 @@
-
commit_text
=
_
(
'%{commit_author_link} authored %{commit_timeago}'
)
%
{
commit_author_link:
commit_author_link
,
commit_timeago:
commit_timeago
}
-
commit_text
=
_
(
'%{commit_author_link} authored %{commit_timeago}'
)
%
{
commit_author_link:
commit_author_link
,
commit_timeago:
commit_timeago
}
#{
commit_text
.
html_safe
}
#{
commit_text
.
html_safe
}
.commit-actions.flex-row.
hidden-xs
.commit-actions.flex-row.
d-none.d-sm-block
-
if
request
.
xhr?
-
if
request
.
xhr?
=
render
partial:
'projects/commit/signature'
,
object:
commit
.
signature
=
render
partial:
'projects/commit/signature'
,
object:
commit
.
signature
-
else
-
else
...
...
app/views/projects/diffs/_diffs.html.haml
View file @
9bcf8f43
...
@@ -11,11 +11,11 @@
...
@@ -11,11 +11,11 @@
=
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
-
if
current_controller?
(
:commit
)
-
if
current_controller?
(
:commit
)
=
commit_diff_whitespace_link
(
diffs
.
project
,
@commit
,
class:
'
hidden-xs
'
)
=
commit_diff_whitespace_link
(
diffs
.
project
,
@commit
,
class:
'
d-none d-sm-block
'
)
-
elsif
current_controller?
(
'projects/merge_requests/diffs'
)
-
elsif
current_controller?
(
'projects/merge_requests/diffs'
)
=
diff_merge_request_whitespace_link
(
diffs
.
project
,
@merge_request
,
class:
'
hidden-xs
'
)
=
diff_merge_request_whitespace_link
(
diffs
.
project
,
@merge_request
,
class:
'
d-none d-sm-block
'
)
-
elsif
current_controller?
(
:compare
)
-
elsif
current_controller?
(
:compare
)
=
diff_compare_whitespace_link
(
diffs
.
project
,
params
[
:from
],
params
[
:to
],
class:
'
hidden-xs
'
)
=
diff_compare_whitespace_link
(
diffs
.
project
,
params
[
:from
],
params
[
:to
],
class:
'
d-none d-sm-block
'
)
.btn-group
.btn-group
=
inline_diff_btn
=
inline_diff_btn
=
parallel_diff_btn
=
parallel_diff_btn
...
...
app/views/projects/diffs/_file.html.haml
View file @
9bcf8f43
...
@@ -10,7 +10,7 @@
...
@@ -10,7 +10,7 @@
-
unless
diff_file
.
submodule?
-
unless
diff_file
.
submodule?
-
blob
=
diff_file
.
blob
-
blob
=
diff_file
.
blob
.file-actions.
hidden-xs
.file-actions.
d-none.d-sm-block
-
if
blob
&
.
readable_text?
-
if
blob
&
.
readable_text?
=
link_to
'#'
,
class:
'js-toggle-diff-comments btn active has-tooltip'
,
title:
"Toggle comments for this file"
,
disabled:
@diff_notes_disabled
do
=
link_to
'#'
,
class:
'js-toggle-diff-comments btn active has-tooltip'
,
title:
"Toggle comments for this file"
,
disabled:
@diff_notes_disabled
do
=
icon
(
'comment'
)
=
icon
(
'comment'
)
...
...
app/views/projects/hook_logs/_index.html.haml
View file @
9bcf8f43
...
@@ -18,7 +18,7 @@
...
@@ -18,7 +18,7 @@
%tr
%tr
%td
%td
=
render
partial:
'shared/hook_logs/status_label'
,
locals:
{
hook_log:
hook_log
}
=
render
partial:
'shared/hook_logs/status_label'
,
locals:
{
hook_log:
hook_log
}
%td
.
hidden-xs
%td
.
d-none.d-sm-block
%span
.label.label-gray.deploy-project-label
%span
.label.label-gray.deploy-project-label
=
hook_log
.
trigger
.
singularize
.
titleize
=
hook_log
.
trigger
.
singularize
.
titleize
%td
%td
...
...
app/views/projects/issues/_issue.html.haml
View file @
9bcf8f43
...
@@ -12,25 +12,25 @@
...
@@ -12,25 +12,25 @@
=
confidential_icon
(
issue
)
=
confidential_icon
(
issue
)
=
link_to
issue
.
title
,
issue_path
(
issue
)
=
link_to
issue
.
title
,
issue_path
(
issue
)
-
if
issue
.
tasks?
-
if
issue
.
tasks?
%span
.task-status.
hidden-xs
%span
.task-status.
d-none.d-sm-block
=
issue
.
task_status
=
issue
.
task_status
.issuable-info
.issuable-info
%span
.issuable-reference
%span
.issuable-reference
#{
issuable_reference
(
issue
)
}
#{
issuable_reference
(
issue
)
}
%span
.issuable-authored.
hidden-xs
%span
.issuable-authored.
d-none.d-sm-block
·
·
opened
#{
time_ago_with_tooltip
(
issue
.
created_at
,
placement:
'bottom'
)
}
opened
#{
time_ago_with_tooltip
(
issue
.
created_at
,
placement:
'bottom'
)
}
by
#{
link_to_member
(
@project
,
issue
.
author
,
avatar:
false
)
}
by
#{
link_to_member
(
@project
,
issue
.
author
,
avatar:
false
)
}
-
if
issue
.
milestone
-
if
issue
.
milestone
%span
.issuable-milestone.
hidden-xs
%span
.issuable-milestone.
d-none.d-sm-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
=
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'
)
=
icon
(
'clock-o'
)
=
issue
.
milestone
.
title
=
issue
.
milestone
.
title
-
if
issue
.
due_date
-
if
issue
.
due_date
%span
.issuable-due-date.
hidden-xs
.has-tooltip
{
class:
"#{'cred' if issue.overdue?}"
,
title:
_
(
'Due date'
)
}
%span
.issuable-due-date.
d-none.d-sm-block
.has-tooltip
{
class:
"#{'cred' if issue.overdue?}"
,
title:
_
(
'Due date'
)
}
=
icon
(
'calendar'
)
=
icon
(
'calendar'
)
=
issue
.
due_date
.
to_s
(
:medium
)
=
issue
.
due_date
.
to_s
(
:medium
)
...
@@ -50,5 +50,5 @@
...
@@ -50,5 +50,5 @@
=
render
'shared/issuable_meta_data'
,
issuable:
issue
=
render
'shared/issuable_meta_data'
,
issuable:
issue
.float-right.issuable-updated-at.
hidden-xs
.float-right.issuable-updated-at.
d-none.d-sm-block
%span
updated
#{
time_ago_with_tooltip
(
issue
.
updated_at
,
placement:
'bottom'
,
html_class:
'issue_update_ago'
)
}
%span
updated
#{
time_ago_with_tooltip
(
issue
.
updated_at
,
placement:
'bottom'
,
html_class:
'issue_update_ago'
)
}
app/views/projects/issues/show.html.haml
View file @
9bcf8f43
...
@@ -12,11 +12,11 @@
...
@@ -12,11 +12,11 @@
.detail-page-header-body
.detail-page-header-body
.issuable-status-box.status-box.status-box-issue-closed
{
class:
issue_button_visibility
(
@issue
,
false
)
}
.issuable-status-box.status-box.status-box-issue-closed
{
class:
issue_button_visibility
(
@issue
,
false
)
}
=
sprite_icon
(
'mobile-issue-close'
,
size:
16
,
css_class:
'd-block d-sm-none'
)
=
sprite_icon
(
'mobile-issue-close'
,
size:
16
,
css_class:
'd-block d-sm-none'
)
%span
.
hidden-xs
%span
.
d-none.d-sm-block
Closed
Closed
.issuable-status-box.status-box.status-box-open
{
class:
issue_button_visibility
(
@issue
,
true
)
}
.issuable-status-box.status-box.status-box-open
{
class:
issue_button_visibility
(
@issue
,
true
)
}
=
sprite_icon
(
'issue-open-m'
,
size:
16
,
css_class:
'd-block d-sm-none'
)
=
sprite_icon
(
'issue-open-m'
,
size:
16
,
css_class:
'd-block d-sm-none'
)
%span
.
hidden-xs
Open
%span
.
d-none.d-sm-block
Open
.issuable-meta
.issuable-meta
-
if
@issue
.
confidential
-
if
@issue
.
confidential
...
...
app/views/projects/jobs/_user.html.haml
View file @
9bcf8f43
by
by
%a
{
href:
user_path
(
@build
.
user
)
}
%a
{
href:
user_path
(
@build
.
user
)
}
%span
.
hidden-xs
%span
.
d-none.d-sm-block
=
image_tag
avatar_icon_for_user
(
@build
.
user
,
24
),
class:
"avatar s24"
=
image_tag
avatar_icon_for_user
(
@build
.
user
,
24
),
class:
"avatar s24"
%strong
{
data:
{
toggle:
'tooltip'
,
placement:
'top'
,
title:
@build
.
user
.
to_reference
}
}
%strong
{
data:
{
toggle:
'tooltip'
,
placement:
'top'
,
title:
@build
.
user
.
to_reference
}
}
=
@build
.
user
.
name
=
@build
.
user
.
name
...
...
app/views/projects/jobs/show.html.haml
View file @
9bcf8f43
...
@@ -58,7 +58,7 @@
...
@@ -58,7 +58,7 @@
-
if
@build
.
has_trace?
-
if
@build
.
has_trace?
.build-trace-container.prepend-top-default
.build-trace-container.prepend-top-default
.top-bar.js-top-bar
.top-bar.js-top-bar
.js-truncated-info.truncated-info.
hidden-xs
.float-left.hidden
<
.js-truncated-info.truncated-info.
d-none.d-sm-block
.float-left.hidden
<
Showing
last
Showing
last
%span
.js-truncated-info-size.truncated-info-size
><
%span
.js-truncated-info-size.truncated-info-size
><
of
log
-
of
log
-
...
...
app/views/projects/merge_requests/_merge_request.html.haml
View file @
9bcf8f43
...
@@ -9,19 +9,19 @@
...
@@ -9,19 +9,19 @@
%span
.merge-request-title-text
%span
.merge-request-title-text
=
link_to
merge_request
.
title
,
merge_request_path
(
merge_request
)
=
link_to
merge_request
.
title
,
merge_request_path
(
merge_request
)
-
if
merge_request
.
tasks?
-
if
merge_request
.
tasks?
%span
.task-status.
hidden-xs
%span
.task-status.
d-none.d-sm-block
=
merge_request
.
task_status
=
merge_request
.
task_status
.issuable-info
.issuable-info
%span
.issuable-reference
%span
.issuable-reference
#{
issuable_reference
(
merge_request
)
}
#{
issuable_reference
(
merge_request
)
}
%span
.issuable-authored.
hidden-xs
%span
.issuable-authored.
d-none.d-sm-block
·
·
opened
#{
time_ago_with_tooltip
(
merge_request
.
created_at
,
placement:
'bottom'
)
}
opened
#{
time_ago_with_tooltip
(
merge_request
.
created_at
,
placement:
'bottom'
)
}
by
#{
link_to_member
(
@project
,
merge_request
.
author
,
avatar:
false
)
}
by
#{
link_to_member
(
@project
,
merge_request
.
author
,
avatar:
false
)
}
-
if
merge_request
.
milestone
-
if
merge_request
.
milestone
%span
.issuable-milestone.
hidden-xs
%span
.issuable-milestone.
d-none.d-sm-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
=
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'
)
=
icon
(
'clock-o'
)
...
@@ -40,17 +40,17 @@
...
@@ -40,17 +40,17 @@
.issuable-meta
.issuable-meta
%ul
.controls
%ul
.controls
-
if
merge_request
.
merged?
-
if
merge_request
.
merged?
%li
.issuable-status.
hidden-xs
%li
.issuable-status.
d-none.d-sm-block
MERGED
MERGED
-
elsif
merge_request
.
closed?
-
elsif
merge_request
.
closed?
%li
.issuable-status.
hidden-xs
%li
.issuable-status.
d-none.d-sm-block
=
icon
(
'ban'
)
=
icon
(
'ban'
)
CLOSED
CLOSED
-
if
merge_request
.
head_pipeline
-
if
merge_request
.
head_pipeline
%li
.issuable-pipeline-status.
hidden-xs
%li
.issuable-pipeline-status.
d-none.d-sm-block
=
render_pipeline_status
(
merge_request
.
head_pipeline
)
=
render_pipeline_status
(
merge_request
.
head_pipeline
)
-
if
merge_request
.
open?
&&
merge_request
.
broken?
-
if
merge_request
.
open?
&&
merge_request
.
broken?
%li
.issuable-pipeline-broken.
hidden-xs
%li
.issuable-pipeline-broken.
d-none.d-sm-block
=
link_to
merge_request_path
(
merge_request
),
class:
"has-tooltip"
,
title:
_
(
'Cannot be merged automatically'
)
do
=
link_to
merge_request_path
(
merge_request
),
class:
"has-tooltip"
,
title:
_
(
'Cannot be merged automatically'
)
do
=
icon
(
'exclamation-triangle'
)
=
icon
(
'exclamation-triangle'
)
-
if
merge_request
.
assignee
-
if
merge_request
.
assignee
...
@@ -59,5 +59,5 @@
...
@@ -59,5 +59,5 @@
=
render
'shared/issuable_meta_data'
,
issuable:
merge_request
=
render
'shared/issuable_meta_data'
,
issuable:
merge_request
.float-right.issuable-updated-at.
hidden-xs
.float-right.issuable-updated-at.
d-none.d-sm-block
%span
updated
#{
time_ago_with_tooltip
(
merge_request
.
updated_at
,
placement:
'bottom'
,
html_class:
'merge_request_updated_ago'
)
}
%span
updated
#{
time_ago_with_tooltip
(
merge_request
.
updated_at
,
placement:
'bottom'
,
html_class:
'merge_request_updated_ago'
)
}
app/views/projects/merge_requests/_mr_title.html.haml
View file @
9bcf8f43
...
@@ -8,7 +8,7 @@
...
@@ -8,7 +8,7 @@
.detail-page-header-body
.detail-page-header-body
.issuable-status-box.status-box
{
class:
status_box_class
(
@merge_request
)
}
.issuable-status-box.status-box
{
class:
status_box_class
(
@merge_request
)
}
=
sprite_icon
(
@merge_request
.
state_icon_name
,
size:
16
,
css_class:
'd-block d-sm-none'
)
=
sprite_icon
(
@merge_request
.
state_icon_name
,
size:
16
,
css_class:
'd-block d-sm-none'
)
%span
.
hidden-xs
%span
.
d-none.d-sm-block
=
@merge_request
.
state_human_name
=
@merge_request
.
state_human_name
.issuable-meta
.issuable-meta
...
...
app/views/projects/merge_requests/diffs/_commit_widget.html.haml
View file @
9bcf8f43
-
if
@commit
-
if
@commit
.info-well.
hidden-xs
.prepend-top-default
.info-well.
d-none.d-sm-block
.prepend-top-default
.well-segment
.well-segment
%ul
.blob-commit-info
%ul
.blob-commit-info
=
render
'projects/commits/commit'
,
commit:
@commit
,
merge_request:
@merge_request
,
view_details:
true
=
render
'projects/commits/commit'
,
commit:
@commit
,
merge_request:
@merge_request
,
view_details:
true
app/views/projects/new.html.haml
View file @
9bcf8f43
...
@@ -31,15 +31,15 @@
...
@@ -31,15 +31,15 @@
%ul
.nav-links.gitlab-tabs
{
role:
'tablist'
}
%ul
.nav-links.gitlab-tabs
{
role:
'tablist'
}
%li
{
class:
active_when
(
active_tab
==
'blank'
),
role:
'presentation'
}
%li
{
class:
active_when
(
active_tab
==
'blank'
),
role:
'presentation'
}
%a
{
href:
'#blank-project-pane'
,
id:
'blank-project-tab'
,
data:
{
toggle:
'tab'
},
role:
'tab'
}
%a
{
href:
'#blank-project-pane'
,
id:
'blank-project-tab'
,
data:
{
toggle:
'tab'
},
role:
'tab'
}
%span
.
hidden-xs
Blank project
%span
.
d-none.d-sm-block
Blank project
%span
.visible-xs
Blank
%span
.visible-xs
Blank
%li
{
class:
active_when
(
active_tab
==
'template'
),
role:
'presentation'
}
%li
{
class:
active_when
(
active_tab
==
'template'
),
role:
'presentation'
}
%a
{
href:
'#create-from-template-pane'
,
id:
'create-from-template-tab'
,
data:
{
toggle:
'tab'
},
role:
'tab'
}
%a
{
href:
'#create-from-template-pane'
,
id:
'create-from-template-tab'
,
data:
{
toggle:
'tab'
},
role:
'tab'
}
%span
.
hidden-xs
Create from template
%span
.
d-none.d-sm-block
Create from template
%span
.visible-xs
Template
%span
.visible-xs
Template
%li
{
class:
active_when
(
active_tab
==
'import'
),
role:
'presentation'
}
%li
{
class:
active_when
(
active_tab
==
'import'
),
role:
'presentation'
}
%a
{
href:
'#import-project-pane'
,
id:
'import-project-tab'
,
data:
{
toggle:
'tab'
},
role:
'tab'
}
%a
{
href:
'#import-project-pane'
,
id:
'import-project-tab'
,
data:
{
toggle:
'tab'
},
role:
'tab'
}
%span
.
hidden-xs
Import project
%span
.
d-none.d-sm-block
Import project
%span
.visible-xs
Import
%span
.visible-xs
Import
.tab-content.gitlab-tab-content
.tab-content.gitlab-tab-content
...
...
app/views/projects/pages_domains/show.html.haml
View file @
9bcf8f43
...
@@ -31,7 +31,7 @@
...
@@ -31,7 +31,7 @@
.input-group
.input-group
=
text_field_tag
:domain_dns
,
dns_record
,
class:
"monospace js-select-on-focus form-control"
,
readonly:
true
=
text_field_tag
:domain_dns
,
dns_record
,
class:
"monospace js-select-on-focus form-control"
,
readonly:
true
.input-group-btn
.input-group-btn
=
clipboard_button
(
target:
'#domain_dns'
,
class:
'btn-default
hidden-xs
'
)
=
clipboard_button
(
target:
'#domain_dns'
,
class:
'btn-default
d-none d-sm-block
'
)
%p
.help-block
%p
.help-block
To access this domain create a new DNS record
To access this domain create a new DNS record
...
@@ -51,7 +51,7 @@
...
@@ -51,7 +51,7 @@
.input-group
.input-group
=
text_field_tag
:domain_verification
,
verification_record
,
class:
"monospace js-select-on-focus form-control"
,
readonly:
true
=
text_field_tag
:domain_verification
,
verification_record
,
class:
"monospace js-select-on-focus form-control"
,
readonly:
true
.input-group-btn
.input-group-btn
=
clipboard_button
(
target:
'#domain_verification'
,
class:
'btn-default
hidden-xs
'
)
=
clipboard_button
(
target:
'#domain_verification'
,
class:
'btn-default
d-none d-sm-block
'
)
%p
.help-block
%p
.help-block
-
help_link
=
help_page_path
(
'user/project/pages/getting_started_part_three.md'
,
anchor:
'dns-txt-record'
)
-
help_link
=
help_page_path
(
'user/project/pages/getting_started_part_three.md'
,
anchor:
'dns-txt-record'
)
To
#{
link_to
'verify ownership'
,
help_link
}
of your domain,
To
#{
link_to
'verify ownership'
,
help_link
}
of your domain,
...
...
app/views/projects/registry/repositories/_tag.html.haml
View file @
9bcf8f43
...
@@ -24,7 +24,7 @@
...
@@ -24,7 +24,7 @@
\-
\-
-
if
can?
(
current_user
,
:update_container_image
,
@project
)
-
if
can?
(
current_user
,
:update_container_image
,
@project
)
%td
.content
%td
.content
.controls.
hidden-xs
.float-right
.controls.
d-none.d-sm-block
.float-right
=
link_to
project_registry_repository_tag_path
(
@project
,
tag
.
repository
,
tag
.
name
),
=
link_to
project_registry_repository_tag_path
(
@project
,
tag
.
repository
,
tag
.
name
),
method: :delete
,
method: :delete
,
class:
'btn btn-remove has-tooltip'
,
class:
'btn btn-remove has-tooltip'
,
...
...
app/views/projects/services/_index.html.haml
View file @
9bcf8f43
...
@@ -8,13 +8,13 @@
...
@@ -8,13 +8,13 @@
%colgroup
%colgroup
%col
%col
%col
%col
%col
.
hidden-xs
%col
.
d-none.d-sm-block
%col
{
width:
"120"
}
%col
{
width:
"120"
}
%thead
%thead
%tr
%tr
%th
%th
%th
Service
%th
Service
%th
.
hidden-xs
Description
%th
.
d-none.d-sm-block
Description
%th
Last edit
%th
Last edit
-
@services
.
sort_by
(
&
:title
).
each
do
|
service
|
-
@services
.
sort_by
(
&
:title
).
each
do
|
service
|
%tr
%tr
...
@@ -23,7 +23,7 @@
...
@@ -23,7 +23,7 @@
%td
%td
=
link_to
edit_project_service_path
(
@project
,
service
.
to_param
)
do
=
link_to
edit_project_service_path
(
@project
,
service
.
to_param
)
do
%strong
=
service
.
title
%strong
=
service
.
title
%td
.
hidden-xs
%td
.
d-none.d-sm-block
=
service
.
description
=
service
.
description
%td
.light
%td
.light
-
if
service
.
updated_at
.
present?
-
if
service
.
updated_at
.
present?
...
...
app/views/projects/snippets/_actions.html.haml
View file @
9bcf8f43
-
return
unless
current_user
-
return
unless
current_user
.
hidden-xs
.
d-none.d-sm-block
-
if
can?
(
current_user
,
:update_project_snippet
,
@snippet
)
-
if
can?
(
current_user
,
:update_project_snippet
,
@snippet
)
=
link_to
edit_project_snippet_path
(
@project
,
@snippet
),
class:
"btn btn-grouped"
do
=
link_to
edit_project_snippet_path
(
@project
,
@snippet
),
class:
"btn btn-grouped"
do
Edit
Edit
...
...
app/views/projects/tree/_blob_item.html.haml
View file @
9bcf8f43
...
@@ -7,6 +7,6 @@
...
@@ -7,6 +7,6 @@
%span
=
file_name
%span
=
file_name
-
if
is_lfs_blob
-
if
is_lfs_blob
%span
.label.label-lfs.prepend-left-5
LFS
%span
.label.label-lfs.prepend-left-5
LFS
%td
.
hidden-xs
.tree-commit
%td
.
d-none.d-sm-block
.tree-commit
%td
.tree-time-ago.cgray.text-right
%td
.tree-time-ago.cgray.text-right
=
render
'projects/tree/spinner'
=
render
'projects/tree/spinner'
app/views/projects/tree/_submodule_item.html.haml
View file @
9bcf8f43
...
@@ -3,4 +3,4 @@
...
@@ -3,4 +3,4 @@
%i
.fa.fa-archive.fa-fw
%i
.fa.fa-archive.fa-fw
=
submodule_link
(
submodule_item
,
@ref
)
=
submodule_link
(
submodule_item
,
@ref
)
%td
%td
%td
.
hidden-xs
%td
.
d-none.d-sm-block
app/views/projects/tree/_tree_content.html.haml
View file @
9bcf8f43
...
@@ -4,7 +4,7 @@
...
@@ -4,7 +4,7 @@
%thead
%thead
%tr
%tr
%th
=
s_
(
'ProjectFileTree|Name'
)
%th
=
s_
(
'ProjectFileTree|Name'
)
%th
.
hidden-xs
%th
.
d-none.d-sm-block
.float-left
=
_
(
'Last commit'
)
.float-left
=
_
(
'Last commit'
)
%th
.text-right
=
_
(
'Last update'
)
%th
.text-right
=
_
(
'Last update'
)
-
if
@path
.
present?
-
if
@path
.
present?
...
@@ -12,7 +12,7 @@
...
@@ -12,7 +12,7 @@
%td
.tree-item-file-name
%td
.tree-item-file-name
=
link_to
".."
,
project_tree_path
(
@project
,
up_dir_path
),
class:
'prepend-left-10'
=
link_to
".."
,
project_tree_path
(
@project
,
up_dir_path
),
class:
'prepend-left-10'
%td
%td
%td
.
hidden-xs
%td
.
d-none.d-sm-block
=
render_tree
(
tree
)
=
render_tree
(
tree
)
...
...
app/views/projects/tree/_tree_item.html.haml
View file @
9bcf8f43
...
@@ -4,6 +4,6 @@
...
@@ -4,6 +4,6 @@
-
path
=
flatten_tree
(
@path
,
tree_item
)
-
path
=
flatten_tree
(
@path
,
tree_item
)
=
link_to
project_tree_path
(
@project
,
tree_join
(
@id
||
@commit
.
id
,
path
)),
class:
'str-truncated'
,
title:
path
do
=
link_to
project_tree_path
(
@project
,
tree_join
(
@id
||
@commit
.
id
,
path
)),
class:
'str-truncated'
,
title:
path
do
%span
=
path
%span
=
path
%td
.
hidden-xs
.tree-commit
%td
.
d-none.d-sm-block
.tree-commit
%td
.tree-time-ago.text-right
%td
.tree-time-ago.text-right
=
render
'projects/tree/spinner'
=
render
'projects/tree/spinner'
app/views/shared/_commit_well.html.haml
View file @
9bcf8f43
.info-well.
hidden-xs
.project-last-commit.append-bottom-default
.info-well.
d-none.d-sm-block
.project-last-commit.append-bottom-default
.well-segment
.well-segment
%ul
.blob-commit-info
%ul
.blob-commit-info
=
render
'projects/commits/commit'
,
commit:
commit
,
ref:
ref
,
project:
project
=
render
'projects/commits/commit'
,
commit:
commit
,
ref:
ref
,
project:
project
app/views/shared/_issuable_meta_data.html.haml
View file @
9bcf8f43
...
@@ -5,21 +5,21 @@
...
@@ -5,21 +5,21 @@
-
issuable_mr
=
@issuable_meta_data
[
issuable
.
id
].
merge_requests_count
-
issuable_mr
=
@issuable_meta_data
[
issuable
.
id
].
merge_requests_count
-
if
issuable_mr
>
0
-
if
issuable_mr
>
0
%li
.issuable-mr.
hidden-xs
.has-tooltip
{
title:
_
(
'Related merge requests'
)
}
%li
.issuable-mr.
d-none.d-sm-block
.has-tooltip
{
title:
_
(
'Related merge requests'
)
}
=
image_tag
(
'icon-merge-request-unmerged.svg'
,
class:
'icon-merge-request-unmerged'
)
=
image_tag
(
'icon-merge-request-unmerged.svg'
,
class:
'icon-merge-request-unmerged'
)
=
issuable_mr
=
issuable_mr
-
if
upvotes
>
0
-
if
upvotes
>
0
%li
.issuable-upvotes.
hidden-xs
.has-tooltip
{
title:
_
(
'Upvotes'
)
}
%li
.issuable-upvotes.
d-none.d-sm-block
.has-tooltip
{
title:
_
(
'Upvotes'
)
}
=
icon
(
'thumbs-up'
)
=
icon
(
'thumbs-up'
)
=
upvotes
=
upvotes
-
if
downvotes
>
0
-
if
downvotes
>
0
%li
.issuable-downvotes.
hidden-xs
.has-tooltip
{
title:
_
(
'Downvotes'
)
}
%li
.issuable-downvotes.
d-none.d-sm-block
.has-tooltip
{
title:
_
(
'Downvotes'
)
}
=
icon
(
'thumbs-down'
)
=
icon
(
'thumbs-down'
)
=
downvotes
=
downvotes
%li
.issuable-comments.
hidden-xs
%li
.issuable-comments.
d-none.d-sm-block
=
link_to
issuable_url
,
class:
[
'has-tooltip'
,
(
'no-comments'
if
note_count
.
zero?
)],
title:
_
(
'Comments'
)
do
=
link_to
issuable_url
,
class:
[
'has-tooltip'
,
(
'no-comments'
if
note_count
.
zero?
)],
title:
_
(
'Comments'
)
do
=
icon
(
'comments'
)
=
icon
(
'comments'
)
=
note_count
=
note_count
app/views/shared/_project_limit.html.haml
View file @
9bcf8f43
-
if
cookies
[
:hide_project_limit_message
].
blank?
&&
!
current_user
.
d
-
none_project_limit
&&
!
current_user
.
can_create_project?
&&
current_user
.
projects_limit
>
0
-
if
cookies
[
:hide_project_limit_message
].
blank?
&&
!
current_user
.
d
-
none_project_limit
&&
!
current_user
.
can_create_project?
&&
current_user
.
projects_limit
>
0
.project-limit-message.alert.alert-warning.
hidden-xs
.project-limit-message.alert.alert-warning.
d-none.d-sm-block
You won't be able to create new projects because you have reached your project limit.
You won't be able to create new projects because you have reached your project limit.
.float-right
.float-right
...
...
app/views/shared/groups/_group.html.haml
View file @
9bcf8f43
...
@@ -16,7 +16,7 @@
...
@@ -16,7 +16,7 @@
.avatar-container.s40
.avatar-container.s40
=
link_to
group
do
=
link_to
group
do
=
group_icon
(
group
,
class:
"avatar s40
hidden-xs
"
)
=
group_icon
(
group
,
class:
"avatar s40
d-none d-sm-block
"
)
.title
.title
=
link_to
group
.
full_name
,
group
,
class:
'group-name'
=
link_to
group
.
full_name
,
group
,
class:
'group-name'
...
...
app/views/shared/hook_logs/_content.html.haml
View file @
9bcf8f43
...
@@ -6,7 +6,7 @@
...
@@ -6,7 +6,7 @@
%p
%p
%strong
Trigger:
%strong
Trigger:
%td
.
hidden-xs
%td
.
d-none.d-sm-block
%span
.label.label-gray.deploy-project-label
%span
.label.label-gray.deploy-project-label
=
hook_log
.
trigger
.
singularize
.
titleize
=
hook_log
.
trigger
.
singularize
.
titleize
%p
%p
...
...
app/views/shared/members/_group.html.haml
View file @
9bcf8f43
...
@@ -42,4 +42,4 @@
...
@@ -42,4 +42,4 @@
class:
'btn btn-remove prepend-left-10'
do
class:
'btn btn-remove prepend-left-10'
do
%span
.d-block.d-sm-none
%span
.d-block.d-sm-none
Delete
Delete
=
icon
(
'trash'
,
class:
'
hidden-xs
'
)
=
icon
(
'trash'
,
class:
'
d-none d-sm-block
'
)
app/views/shared/members/_member.html.haml
View file @
9bcf8f43
...
@@ -53,7 +53,7 @@
...
@@ -53,7 +53,7 @@
-
if
member
.
can_resend_invite?
-
if
member
.
can_resend_invite?
=
link_to
icon
(
'paper-plane'
),
polymorphic_path
([
:resend_invite
,
member
]),
=
link_to
icon
(
'paper-plane'
),
polymorphic_path
([
:resend_invite
,
member
]),
method: :post
,
method: :post
,
class:
'btn btn-secondary prepend-left-10
hidden-xs
'
,
class:
'btn btn-secondary prepend-left-10
d-none d-sm-block
'
,
title:
'Resend invite'
title:
'Resend invite'
-
if
user
!=
current_user
&&
member
.
can_update?
-
if
user
!=
current_user
&&
member
.
can_update?
...
@@ -92,7 +92,7 @@
...
@@ -92,7 +92,7 @@
%span
{
class:
(
'.d-block.d-sm-none'
unless
force_mobile_view
)
}
%span
{
class:
(
'.d-block.d-sm-none'
unless
force_mobile_view
)
}
Grant access
Grant access
-
unless
force_mobile_view
-
unless
force_mobile_view
=
icon
(
'check inverse'
,
class:
'
hidden-xs
'
)
=
icon
(
'check inverse'
,
class:
'
d-none d-sm-block
'
)
-
if
member
.
can_remove?
-
if
member
.
can_remove?
-
if
current_user
==
user
-
if
current_user
==
user
...
@@ -109,6 +109,6 @@
...
@@ -109,6 +109,6 @@
%span
{
class:
(
'.d-block.d-sm-none'
unless
force_mobile_view
)
}
%span
{
class:
(
'.d-block.d-sm-none'
unless
force_mobile_view
)
}
Delete
Delete
-
unless
force_mobile_view
-
unless
force_mobile_view
=
icon
(
'trash'
,
class:
'
hidden-xs
'
)
=
icon
(
'trash'
,
class:
'
d-none d-sm-block
'
)
-
else
-
else
%span
.member-access-text
=
member
.
human_access
%span
.member-access-text
=
member
.
human_access
app/views/shared/snippets/_blob.html.haml
View file @
9bcf8f43
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
.js-file-title.file-title-flex-parent
.js-file-title.file-title-flex-parent
=
render
'projects/blob/header_content'
,
blob:
blob
=
render
'projects/blob/header_content'
,
blob:
blob
.file-actions.
hidden-xs
.file-actions.
d-none.d-sm-block
=
render
'projects/blob/viewer_switcher'
,
blob:
blob
=
render
'projects/blob/viewer_switcher'
,
blob:
blob
.btn-group
{
role:
"group"
}
<
.btn-group
{
role:
"group"
}
<
...
...
app/views/shared/snippets/_header.html.haml
View file @
9bcf8f43
...
@@ -7,7 +7,7 @@
...
@@ -7,7 +7,7 @@
%span
.creator
%span
.creator
Authored
Authored
=
time_ago_with_tooltip
(
@snippet
.
created_at
,
placement:
'bottom'
,
html_class:
'snippet_updated_ago'
)
=
time_ago_with_tooltip
(
@snippet
.
created_at
,
placement:
'bottom'
,
html_class:
'snippet_updated_ago'
)
by
#{
link_to_member
(
@project
,
@snippet
.
author
,
size:
24
,
author_class:
"author item-title"
,
avatar_class:
"
hidden-xs
"
)
}
by
#{
link_to_member
(
@project
,
@snippet
.
author
,
size:
24
,
author_class:
"author item-title"
,
avatar_class:
"
d-none d-sm-block
"
)
}
.detail-page-header-actions
.detail-page-header-actions
-
if
@snippet
.
project_id?
-
if
@snippet
.
project_id?
...
...
app/views/shared/snippets/_snippet.html.haml
View file @
9bcf8f43
-
link_project
=
local_assigns
.
fetch
(
:link_project
,
false
)
-
link_project
=
local_assigns
.
fetch
(
:link_project
,
false
)
%li
.snippet-row
%li
.snippet-row
=
image_tag
avatar_icon_for_user
(
snippet
.
author
),
class:
"avatar s40
hidden-xs
"
,
alt:
''
=
image_tag
avatar_icon_for_user
(
snippet
.
author
),
class:
"avatar s40
d-none d-sm-block
"
,
alt:
''
.title
.title
=
link_to
reliable_snippet_path
(
snippet
)
do
=
link_to
reliable_snippet_path
(
snippet
)
do
=
snippet
.
title
=
snippet
.
title
-
if
snippet
.
file_name
-
if
snippet
.
file_name
%span
.snippet-filename.monospace.
hidden-xs
%span
.snippet-filename.monospace.
d-none.d-sm-block
=
snippet
.
file_name
=
snippet
.
file_name
%ul
.controls
%ul
.controls
...
@@ -28,7 +28,7 @@
...
@@ -28,7 +28,7 @@
=
link_to
user_snippets_path
(
snippet
.
author
)
do
=
link_to
user_snippets_path
(
snippet
.
author
)
do
=
snippet
.
author_name
=
snippet
.
author_name
-
if
link_project
&&
snippet
.
project_id?
-
if
link_project
&&
snippet
.
project_id?
%span
.
hidden-xs
%span
.
d-none.d-sm-block
in
in
=
link_to
project_path
(
snippet
.
project
)
do
=
link_to
project_path
(
snippet
.
project
)
do
=
snippet
.
project
.
full_name
=
snippet
.
project
.
full_name
...
...
app/views/snippets/_actions.html.haml
View file @
9bcf8f43
-
return
unless
current_user
-
return
unless
current_user
.
hidden-xs
.
d-none.d-sm-block
-
if
can?
(
current_user
,
:update_personal_snippet
,
@snippet
)
-
if
can?
(
current_user
,
:update_personal_snippet
,
@snippet
)
=
link_to
edit_snippet_path
(
@snippet
),
class:
"btn btn-grouped"
do
=
link_to
edit_snippet_path
(
@snippet
),
class:
"btn btn-grouped"
do
Edit
Edit
...
...
app/views/snippets/index.html.haml
View file @
9bcf8f43
...
@@ -6,7 +6,7 @@
...
@@ -6,7 +6,7 @@
Snippets
Snippets
%li
.breadcrumb-item
%li
.breadcrumb-item
=
@user
.
name
=
@user
.
name
.float-right.
hidden-xs
.float-right.
d-none.d-sm-block
=
link_to
user_path
(
@user
)
do
=
link_to
user_path
(
@user
)
do
#{
@user
.
name
}
profile page
#{
@user
.
name
}
profile page
...
...
app/views/users/show.html.haml
View file @
9bcf8f43
...
@@ -107,7 +107,7 @@
...
@@ -107,7 +107,7 @@
.tab-content
.tab-content
-
if
profile_tab?
(
:activity
)
-
if
profile_tab?
(
:activity
)
#activity
.tab-pane
#activity
.tab-pane
.row-content-block.calender-block.white.second-block.
hidden-xs
.row-content-block.calender-block.white.second-block.
d-none.d-sm-block
.user-calendar
{
data:
{
calendar_path:
user_calendar_path
(
@user
,
:json
),
calendar_activities_path:
user_calendar_activities_path
,
utc_offset:
Time
.
zone
.
utc_offset
}
}
.user-calendar
{
data:
{
calendar_path:
user_calendar_path
(
@user
,
:json
),
calendar_activities_path:
user_calendar_activities_path
,
utc_offset:
Time
.
zone
.
utc_offset
}
}
%h4
.center.light
%h4
.center.light
%i
.fa.fa-spinner.fa-spin
%i
.fa.fa-spinner.fa-spin
...
...
spec/javascripts/notes_spec.js
View file @
9bcf8f43
...
@@ -975,7 +975,7 @@ import timeoutPromise from './helpers/set_timeout_promise_helper';
...
@@ -975,7 +975,7 @@ import timeoutPromise from './helpers/set_timeout_promise_helper';
).
toBeFalsy
();
).
toBeFalsy
();
expect
(
expect
(
$tempNoteHeader
$tempNoteHeader
.
find
(
'
.
hidden-xs
'
)
.
find
(
'
.
d-none.d-sm-block
'
)
.
text
()
.
text
()
.
trim
(),
.
trim
(),
).
toEqual
(
currentUserFullname
);
).
toEqual
(
currentUserFullname
);
...
@@ -1021,7 +1021,7 @@ import timeoutPromise from './helpers/set_timeout_promise_helper';
...
@@ -1021,7 +1021,7 @@ import timeoutPromise from './helpers/set_timeout_promise_helper';
const
$tempNoteHeader
=
$tempNote
.
find
(
'
.note-header
'
);
const
$tempNoteHeader
=
$tempNote
.
find
(
'
.note-header
'
);
expect
(
expect
(
$tempNoteHeader
$tempNoteHeader
.
find
(
'
.
hidden-xs
'
)
.
find
(
'
.
d-none.d-sm-block
'
)
.
text
()
.
text
()
.
trim
(),
.
trim
(),
).
toEqual
(
'
Foo <script>alert("XSS")</script>
'
);
).
toEqual
(
'
Foo <script>alert("XSS")</script>
'
);
...
...
spec/javascripts/projects_dropdown/components/search_spec.js
View file @
9bcf8f43
...
@@ -92,7 +92,7 @@ describe('SearchComponent', () => {
...
@@ -92,7 +92,7 @@ describe('SearchComponent', () => {
const
inputEl
=
vm
.
$el
.
querySelector
(
'
input.form-control
'
);
const
inputEl
=
vm
.
$el
.
querySelector
(
'
input.form-control
'
);
expect
(
vm
.
$el
.
classList
.
contains
(
'
search-input-container
'
)).
toBeTruthy
();
expect
(
vm
.
$el
.
classList
.
contains
(
'
search-input-container
'
)).
toBeTruthy
();
expect
(
vm
.
$el
.
classList
.
contains
(
'
hidden-xs
'
)).
toBeTruthy
();
expect
(
vm
.
$el
.
classList
.
contains
(
'
d-none d-sm-block
'
)).
toBeTruthy
();
expect
(
inputEl
).
not
.
toBe
(
null
);
expect
(
inputEl
).
not
.
toBe
(
null
);
expect
(
inputEl
.
getAttribute
(
'
placeholder
'
)).
toBe
(
'
Search your projects
'
);
expect
(
inputEl
.
getAttribute
(
'
placeholder
'
)).
toBe
(
'
Search your projects
'
);
expect
(
vm
.
$el
.
querySelector
(
'
.search-icon
'
)).
toBeDefined
();
expect
(
vm
.
$el
.
querySelector
(
'
.search-icon
'
)).
toBeDefined
();
...
...
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