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
Tatuya Kamada
gitlab-ce
Commits
b9a0f96d
Commit
b9a0f96d
authored
Dec 04, 2015
by
Marin Jankovski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Don't show diffs for lfs pointers.
parent
ea52a81d
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
4 deletions
+2
-4
app/models/lfs_object.rb
app/models/lfs_object.rb
+0
-2
app/views/projects/diffs/_file.html.haml
app/views/projects/diffs/_file.html.haml
+2
-2
No files found.
app/models/lfs_object.rb
View file @
b9a0f96d
...
@@ -6,8 +6,6 @@ class LfsObject < ActiveRecord::Base
...
@@ -6,8 +6,6 @@ class LfsObject < ActiveRecord::Base
mount_uploader
:file
,
LfsObjectUploader
mount_uploader
:file
,
LfsObjectUploader
MATCH_FROM_POINTER_REGEX
=
"(?<=sha256:)([0-9a-f]{64})"
def
storage_project
(
project
)
def
storage_project
(
project
)
if
project
&&
project
.
forked?
if
project
&&
project
.
forked?
project
.
forked_from_project
project
.
forked_from_project
...
...
app/views/projects/diffs/_file.html.haml
View file @
b9a0f96d
...
@@ -25,7 +25,7 @@
...
@@ -25,7 +25,7 @@
=
"
#{
diff_file
.
diff
.
a_mode
}
→
#{
diff_file
.
diff
.
b_mode
}
"
=
"
#{
diff_file
.
diff
.
a_mode
}
→
#{
diff_file
.
diff
.
b_mode
}
"
.diff-controls
.diff-controls
-
if
blob
.
text?
-
if
blob
.
text?
&&
!
blob
.
lfs_pointer?
=
link_to
'#'
,
class:
'js-toggle-diff-comments btn btn-sm active has_tooltip'
,
title:
"Toggle comments for this file"
do
=
link_to
'#'
,
class:
'js-toggle-diff-comments btn btn-sm active has_tooltip'
,
title:
"Toggle comments for this file"
do
%i
.fa.fa-comments
%i
.fa.fa-comments
...
@@ -40,7 +40,7 @@
...
@@ -40,7 +40,7 @@
.diff-content.diff-wrap-lines
.diff-content.diff-wrap-lines
-# Skipp all non non-supported blobs
-# Skipp all non non-supported blobs
-
return
unless
blob
.
respond_to?
(
'text?'
)
-
return
unless
blob
.
respond_to?
(
'text?'
)
-
if
blob
.
text?
-
if
blob
.
text?
&&
!
blob
.
lfs_pointer?
-
if
diff_view
==
'parallel'
-
if
diff_view
==
'parallel'
=
render
"projects/diffs/parallel_view"
,
diff_file:
diff_file
,
project:
project
,
blob:
blob
,
index:
i
=
render
"projects/diffs/parallel_view"
,
diff_file:
diff_file
,
project:
project
,
blob:
blob
,
index:
i
-
else
-
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