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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
1eaa8e18
Commit
1eaa8e18
authored
Aug 20, 2014
by
Jacob Vosmaer
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #7553 from Razer6/fix_project_description
Fix project description on explore page, fixes #7458
parents
16500a20
5e7f5ee8
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
25 additions
and
20 deletions
+25
-20
app/assets/stylesheets/sections/dashboard.scss
app/assets/stylesheets/sections/dashboard.scss
+4
-0
app/views/explore/projects/_project.html.haml
app/views/explore/projects/_project.html.haml
+21
-20
No files found.
app/assets/stylesheets/sections/dashboard.scss
View file @
1eaa8e18
...
@@ -89,6 +89,10 @@
...
@@ -89,6 +89,10 @@
}
}
}
}
.project-description
{
overflow
:
hidden
;
}
.project-access-icon
{
.project-access-icon
{
margin-left
:
10px
;
margin-left
:
10px
;
float
:
left
;
float
:
left
;
...
...
app/views/explore/projects/_project.html.haml
View file @
1eaa8e18
%li
%li
%h4
.project-title
.project-access-icon
.project-access-icon
=
visibility_level_icon
(
project
.
visibility_level
)
=
visibility_level_icon
(
project
.
visibility_level
)
=
link_to
project
.
name_with_namespace
,
project
-
if
current_page?
(
starred_explore_projects_path
)
.project-description
%strong
.pull-right
%h4
.project-title
=
pluralize
project
.
star_count
,
'star'
=
link_to
project
.
name_with_namespace
,
project
-
if
project
.
description
.
present?
-
if
current_page?
(
starred_explore_projects_path
)
%p
.project-description.str-truncated
%strong
.pull-right
=
project
.
description
=
pluralize
project
.
star_count
,
'star'
.repo-info
-
if
project
.
description
.
present?
-
unless
project
.
empty_repo?
%p
.project-description.str-truncated
=
link_to
pluralize
(
project
.
repository
.
round_commit_count
,
'commit'
),
project_commits_path
(
project
,
project
.
default_branch
)
=
project
.
description
·
=
link_to
pluralize
(
project
.
repository
.
branch_names
.
count
,
'branch'
),
project_branches_path
(
project
)
·
=
link_to
pluralize
(
project
.
repository
.
tag_names
.
count
,
'tag'
),
project_tags_path
(
project
)
-
else
%i
.icon-warning-sign
Empty repository
.repo-info
-
unless
project
.
empty_repo?
=
link_to
pluralize
(
project
.
repository
.
round_commit_count
,
'commit'
),
project_commits_path
(
project
,
project
.
default_branch
)
·
=
link_to
pluralize
(
project
.
repository
.
branch_names
.
count
,
'branch'
),
project_branches_path
(
project
)
·
=
link_to
pluralize
(
project
.
repository
.
tag_names
.
count
,
'tag'
),
project_tags_path
(
project
)
-
else
%i
.icon-warning-sign
Empty repository
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