Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
GitLab
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Commits
Open sidebar
projects.thm.de
GitLab
Commits
70709425
Commit
70709425
authored
Dec 16, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce
parents
664384e7
6374bdb3
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
5 deletions
+7
-5
_commit_status.html.haml
app/views/projects/commit_statuses/_commit_status.html.haml
+4
-4
renderer.rb
lib/banzai/renderer.rb
+3
-1
No files found.
app/views/projects/commit_statuses/_commit_status.html.haml
View file @
70709425
...
...
@@ -19,11 +19,11 @@
-
if
defined?
(
commit_sha
)
&&
commit_sha
%td
=
link_to
commit_status
.
short_sha
,
namespace_project_commit_path
(
@project
.
namespace
,
@
project
,
commit_status
.
sha
),
class:
"monospace"
=
link_to
commit_status
.
short_sha
,
namespace_project_commit_path
(
commit_status
.
project
.
namespace
,
commit_status
.
project
,
commit_status
.
sha
),
class:
"monospace"
%td
-
if
commit_status
.
ref
=
link_to
commit_status
.
ref
,
namespace_project_commits_path
(
@project
.
namespace
,
@
project
,
commit_status
.
ref
)
=
link_to
commit_status
.
ref
,
namespace_project_commits_path
(
commit_status
.
project
.
namespace
,
commit_status
.
project
,
commit_status
.
ref
)
-
else
.light
none
...
...
@@ -66,7 +66,7 @@
%td
.pull-right
-
if
current_user
&&
can?
(
current_user
,
:download_build_artifacts
,
@
project
)
&&
commit_status
.
download_url
-
if
current_user
&&
can?
(
current_user
,
:download_build_artifacts
,
commit_status
.
project
)
&&
commit_status
.
download_url
=
link_to
commit_status
.
download_url
,
title:
'Download artifacts'
do
%i
.fa.fa-download
-
if
current_user
&&
can?
(
current_user
,
:manage_builds
,
commit_status
.
project
)
...
...
lib/banzai/renderer.rb
View file @
70709425
module
Banzai
module
Renderer
CACHE_ENABLED
=
false
# Convert a Markdown String into an HTML-safe String of HTML
#
# Note that while the returned HTML will have been sanitized of dangerous
...
...
@@ -18,7 +20,7 @@ module Banzai
cache_key
=
context
.
delete
(
:cache_key
)
cache_key
=
full_cache_key
(
cache_key
,
context
[
:pipeline
])
if
cache_key
if
cache_key
&&
CACHE_ENABLED
Rails
.
cache
.
fetch
(
cache_key
)
do
cacheless_render
(
text
,
context
)
end
...
...
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