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
2a5c963b
Commit
2a5c963b
authored
9 years ago
by
Robert Speicher
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Render Group and Project descriptions with our Markdown pipeline
parent
d85a7437
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
6 deletions
+8
-6
app/assets/stylesheets/pages/projects.scss
app/assets/stylesheets/pages/projects.scss
+6
-4
app/views/groups/show.html.haml
app/views/groups/show.html.haml
+1
-1
app/views/projects/_home_panel.html.haml
app/views/projects/_home_panel.html.haml
+1
-1
No files found.
app/assets/stylesheets/pages/projects.scss
View file @
2a5c963b
...
@@ -48,14 +48,16 @@
...
@@ -48,14 +48,16 @@
}
}
.project-home-desc
{
.project-home-desc
{
color
:
$gray
;
float
:
left
;
font-size
:
16px
;
font-size
:
16px
;
line-height
:
1
.3
;
line-height
:
1
.3
;
margin-right
:
250px
;
margin-right
:
250px
;
}
.project-home-desc
{
// Render Markdown-generated HTML inline for this block
float
:
left
;
p
{
color
:
$gray
;
display
:
inline
;
}
}
}
}
}
...
...
This diff is collapsed.
Click to expand it.
app/views/groups/show.html.haml
View file @
2a5c963b
...
@@ -11,7 +11,7 @@
...
@@ -11,7 +11,7 @@
@
#{
@group
.
path
}
@
#{
@group
.
path
}
-
if
@group
.
description
.
present?
-
if
@group
.
description
.
present?
.description
.description
=
escaped_autolink
(
@group
.
description
)
=
markdown
(
@group
.
description
)
%hr
%hr
=
render
'shared/show_aside'
=
render
'shared/show_aside'
...
...
This diff is collapsed.
Click to expand it.
app/views/projects/_home_panel.html.haml
View file @
2a5c963b
...
@@ -5,7 +5,7 @@
...
@@ -5,7 +5,7 @@
.project-home-row.project-home-row-top
.project-home-row.project-home-row-top
.project-home-desc
.project-home-desc
-
if
@project
.
description
.
present?
-
if
@project
.
description
.
present?
=
escaped_autolink
(
@project
.
description
)
=
markdown
(
@project
.
description
)
-
if
can?
(
current_user
,
:admin_project
,
@project
)
-
if
can?
(
current_user
,
:admin_project
,
@project
)
–
–
=
link_to
'Edit'
,
edit_namespace_project_path
=
link_to
'Edit'
,
edit_namespace_project_path
...
...
This diff is collapsed.
Click to expand it.
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