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
Léo-Paul Géneau
gitlab-ce
Commits
4caa9b63
Commit
4caa9b63
authored
Apr 07, 2017
by
Douwe Maan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename displaying_blame to blame
parent
a5792a86
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
app/views/projects/blame/show.html.haml
app/views/projects/blame/show.html.haml
+1
-1
app/views/projects/blob/_header.html.haml
app/views/projects/blob/_header.html.haml
+3
-3
No files found.
app/views/projects/blame/show.html.haml
View file @
4caa9b63
...
...
@@ -7,7 +7,7 @@
#blob-content-holder
.tree-holder
.file-holder
=
render
"projects/blob/header"
,
blob:
@blob
,
displaying_
blame:
true
=
render
"projects/blob/header"
,
blob:
@blob
,
blame:
true
.table-responsive.file-content.blame.code.js-syntax-highlight
%table
...
...
app/views/projects/blob/_header.html.haml
View file @
4caa9b63
-
displaying_blame
=
local_assigns
.
fetch
(
:displaying_
blame
,
false
)
-
blame
=
local_assigns
.
fetch
(
:
blame
,
false
)
.js-file-title.file-title-flex-parent
.file-header-content
=
blob_icon
blob
.
mode
,
blob
.
name
...
...
@@ -13,14 +13,14 @@
.file-actions.hidden-xs
.btn-group
{
role:
"group"
}
<
=
copy_blob_content_button
(
blob
)
if
!
displaying_
blame
&&
blob_text_viewable?
(
blob
)
=
copy_blob_content_button
(
blob
)
if
!
blame
&&
blob_text_viewable?
(
blob
)
=
open_raw_file_button
(
namespace_project_raw_path
(
@project
.
namespace
,
@project
,
@id
))
=
view_on_environment_button
(
@commit
.
sha
,
@path
,
@environment
)
if
@environment
.btn-group
{
role:
"group"
}
<
-# only show normal/blame view links for text files
-
if
blob_text_viewable?
(
blob
)
-
if
displaying_
blame
-
if
blame
=
link_to
'Normal view'
,
namespace_project_blob_path
(
@project
.
namespace
,
@project
,
@id
),
class:
'btn btn-sm'
-
else
...
...
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