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
0b7377d8
Commit
0b7377d8
authored
Sep 24, 2014
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #7820 from skv-headless/move_blame_to_rugged
blame with rugged
parents
79a4da90
a286f920
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
11 deletions
+5
-11
Gemfile.lock
Gemfile.lock
+1
-1
app/views/projects/blame/show.html.haml
app/views/projects/blame/show.html.haml
+4
-10
No files found.
Gemfile.lock
View file @
0b7377d8
...
@@ -179,7 +179,7 @@ GEM
...
@@ -179,7 +179,7 @@ GEM
mime-types (~> 1.19)
mime-types (~> 1.19)
gitlab_emoji (0.0.1.1)
gitlab_emoji (0.0.1.1)
emoji (~> 1.0.1)
emoji (~> 1.0.1)
gitlab_git (6.
2.1
)
gitlab_git (6.
3.0
)
activesupport (~> 4.0)
activesupport (~> 4.0)
charlock_holmes (~> 0.6)
charlock_holmes (~> 0.6)
gitlab-grit (~> 2.6)
gitlab-grit (~> 2.6)
...
...
app/views/projects/blame/show.html.haml
View file @
0b7377d8
...
@@ -10,8 +10,7 @@
...
@@ -10,8 +10,7 @@
%span
.options
=
render
"projects/blob/actions"
%span
.options
=
render
"projects/blob/actions"
.file-content.blame.highlight
.file-content.blame.highlight
%table
%table
-
current_line
=
1
-
@blame
.
each
do
|
commit
,
lines
,
since
|
-
@blame
.
each
do
|
commit
,
lines
|
-
commit
=
Commit
.
new
(
commit
)
-
commit
=
Commit
.
new
(
commit
)
%tr
%tr
%td
.blame-commit
%td
.blame-commit
...
@@ -23,14 +22,9 @@
...
@@ -23,14 +22,9 @@
=
link_to_gfm
truncate
(
commit
.
title
,
length:
20
),
project_commit_path
(
@project
,
commit
.
id
),
class:
"row_title"
=
link_to_gfm
truncate
(
commit
.
title
,
length:
20
),
project_commit_path
(
@project
,
commit
.
id
),
class:
"row_title"
%td
.lines.blame-numbers
%td
.lines.blame-numbers
%pre
%pre
-
if
lines
.
empty?
-
(
since
...
(
since
+
lines
.
count
)).
each
do
|
i
|
=
current_line
=
i
-
current_line
+=
1
-
else
-
lines
.
each
do
|
line
|
=
current_line
\
\
-
current_line
+=
1
%td
.lines
%td
.lines
%pre
%pre
%code
{
class:
highlightjs_class
(
@blob
.
name
)
}
%code
{
class:
highlightjs_class
(
@blob
.
name
)
}
...
...
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