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
8e77f9e7
Commit
8e77f9e7
authored
Apr 03, 2019
by
GitLab Bot
Browse files
Options
Browse Files
Download
Plain Diff
Automatic merge of gitlab-org/gitlab-ce master
parents
734e9072
ec1edb2a
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
4 deletions
+8
-4
app/assets/stylesheets/pages/projects.scss
app/assets/stylesheets/pages/projects.scss
+1
-2
app/views/projects/_home_panel.html.haml
app/views/projects/_home_panel.html.haml
+2
-2
changelogs/unreleased/xanf-gitlab-ce-move-project-tags.yml
changelogs/unreleased/xanf-gitlab-ce-move-project-tags.yml
+5
-0
No files found.
app/assets/stylesheets/pages/projects.scss
View file @
8e77f9e7
...
...
@@ -209,8 +209,7 @@
}
}
.access-request-link
,
.home-panel-topic-list
{
.access-request-link
{
padding-left
:
$gl-padding-8
;
border-left
:
1px
solid
$gl-text-color-secondary
;
}
...
...
app/views/projects/_home_panel.html.haml
View file @
8e77f9e7
...
...
@@ -12,7 +12,7 @@
=
@project
.
name
%span
.visibility-icon.text-secondary.prepend-left-4.has-tooltip
{
data:
{
container:
'body'
},
title:
visibility_icon_description
(
@project
)
}
=
visibility_level_icon
(
@project
.
visibility_level
,
fw:
false
,
options:
{
class:
'icon'
})
.home-panel-metadata.d-flex.
align-items-center
.text-secondary
.home-panel-metadata.d-flex.
flex-wrap
.text-secondary
-
if
can?
(
current_user
,
:read_project
,
@project
)
%span
.text-secondary
=
s_
(
'ProjectPage|Project ID: %{project_id}'
)
%
{
project_id:
@project
.
id
}
...
...
@@ -20,7 +20,7 @@
%span
.access-request-links.prepend-left-8
=
render
'shared/members/access_request_links'
,
source:
@project
-
if
@project
.
tag_list
.
present?
%span
.home-panel-topic-list.
d-inline-flex.prepend-left-8
%span
.home-panel-topic-list.
mt-2.w-100.d-inline-flex
=
sprite_icon
(
'tag'
,
size:
16
,
css_class:
'icon append-right-4'
)
-
@project
.
topics_to_show
.
each
do
|
topic
|
...
...
changelogs/unreleased/xanf-gitlab-ce-move-project-tags.yml
0 → 100644
View file @
8e77f9e7
---
title
:
Move project tags to separate line
merge_request
:
26797
author
:
type
:
other
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