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
Kazuhiko Shiozaki
gitlab-ce
Commits
c741fcab
Commit
c741fcab
authored
Sep 08, 2014
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix all broken stuff after diff refactoring
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
531f16be
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
5 additions
and
30 deletions
+5
-30
app/views/projects/commits/_diffs.html.haml
app/views/projects/commits/_diffs.html.haml
+0
-26
app/views/projects/compare/show.html.haml
app/views/projects/compare/show.html.haml
+1
-1
app/views/projects/diffs/_diff_file.html.haml
app/views/projects/diffs/_diff_file.html.haml
+1
-1
app/views/projects/diffs/_diff_warning.html.haml
app/views/projects/diffs/_diff_warning.html.haml
+1
-1
app/views/projects/diffs/_image.html.haml
app/views/projects/diffs/_image.html.haml
+1
-0
app/views/projects/merge_requests/_new_submit.html.haml
app/views/projects/merge_requests/_new_submit.html.haml
+1
-1
No files found.
app/views/projects/commits/_diffs.html.haml
deleted
100644 → 0
View file @
531f16be
.row
.col-md-8
=
render
'projects/commits/diff_stats'
,
diffs:
diffs
.col-md-4
%ul
.nav.nav-tabs
%li
.pull-right
{
class:
params
[
:view
]
==
'parallel'
?
'active'
:
''
}
-
params_copy
=
params
.
dup
-
params_copy
[
:view
]
=
'parallel'
=
link_to
"Side-by-side Diff"
,
url_for
(
params_copy
),
{
id:
"commit-diff-viewtype"
}
%li
.pull-right
{
class:
params
[
:view
]
!=
'parallel'
?
'active'
:
''
}
-
params_copy
[
:view
]
=
'inline'
=
link_to
"Inline Diff"
,
url_for
(
params_copy
),
{
id:
"commit-diff-viewtype"
}
-
if
show_diff_size_warninig?
(
diffs
)
=
render
'projects/diffs/diff_warning'
,
diffs:
diffs
.files
-
safe_diff_files
(
diffs
).
each_with_index
do
|
diff
,
i
|
=
render
'projects/diffs/diff_file'
,
diff:
diff_file
,
i:
i
,
project:
project
-
if
@diff_timeout
.alert.alert-danger
%h4
Failed to collect changes
%p
Maybe diff is really big and operation failed with timeout. Try to get diff localy
app/views/projects/compare/show.html.haml
View file @
c741fcab
...
@@ -18,7 +18,7 @@
...
@@ -18,7 +18,7 @@
-
else
-
else
%ul
.well-list
=
render
Commit
.
decorate
(
@commits
),
project:
@project
%ul
.well-list
=
render
Commit
.
decorate
(
@commits
),
project:
@project
=
render
"projects/
commit
s/diffs"
,
diffs:
@diffs
,
project:
@project
=
render
"projects/
diff
s/diffs"
,
diffs:
@diffs
,
project:
@project
-
else
-
else
.light-well
.light-well
...
...
app/views/projects/diffs/_diff_file.html.haml
View file @
c741fcab
...
@@ -41,7 +41,7 @@
...
@@ -41,7 +41,7 @@
=
render
"projects/diffs/text_file"
,
diff_file:
diff_file
,
index:
i
=
render
"projects/diffs/text_file"
,
diff_file:
diff_file
,
index:
i
-
elsif
blob
.
image?
-
elsif
blob
.
image?
-
old_file
=
project
.
repository
.
prev_blob_for_diff
(
@commit
,
diff_file
)
-
old_file
=
project
.
repository
.
prev_blob_for_diff
(
@commit
,
diff_file
)
=
render
"projects/diffs/image"
,
diff_file:
diff_file
,
old_file:
old_file
,
blob
:
blob
,
index:
i
=
render
"projects/diffs/image"
,
diff_file:
diff_file
,
old_file:
old_file
,
file
:
blob
,
index:
i
-
else
-
else
.nothing-here-block
No preview for this file type
.nothing-here-block
No preview for this file type
app/views/projects/diffs/_diff_warning.html.haml
View file @
c741fcab
...
@@ -14,6 +14,6 @@
...
@@ -14,6 +14,6 @@
=
link_to
"Email patch"
,
project_merge_request_path
(
@project
,
@merge_request
,
format: :patch
),
class:
"btn btn-warning btn-small"
=
link_to
"Email patch"
,
project_merge_request_path
(
@project
,
@merge_request
,
format: :patch
),
class:
"btn btn-warning btn-small"
%p
%p
To preserve performance only
To preserve performance only
%strong
#{
safe_diff_files
(
diffs
).
size
}
of
#{
diffs
.
size
}
%strong
#{
safe_diff_files
(
@project
,
diffs
).
size
}
of
#{
diffs
.
size
}
files displayed.
files displayed.
app/views/projects/diffs/_image.html.haml
View file @
c741fcab
-
diff
=
diff_file
.
diff
-
if
diff
.
renamed_file
||
diff
.
new_file
||
diff
.
deleted_file
-
if
diff
.
renamed_file
||
diff
.
new_file
||
diff
.
deleted_file
.image
.image
%span
.wrap
%span
.wrap
...
...
app/views/projects/merge_requests/_new_submit.html.haml
View file @
c741fcab
...
@@ -75,7 +75,7 @@
...
@@ -75,7 +75,7 @@
%h4
Changes
%h4
Changes
-
if
@diffs
.
present?
-
if
@diffs
.
present?
=
render
"projects/
commit
s/diffs"
,
diffs:
@diffs
,
project:
@project
=
render
"projects/
diff
s/diffs"
,
diffs:
@diffs
,
project:
@project
-
elsif
@commits
.
size
>
MergeRequestDiff
::
COMMITS_SAFE_SIZE
-
elsif
@commits
.
size
>
MergeRequestDiff
::
COMMITS_SAFE_SIZE
.bs-callout.bs-callout-danger
.bs-callout.bs-callout-danger
%h4
This comparison includes more than
#{
MergeRequestDiff
::
COMMITS_SAFE_SIZE
}
commits.
%h4
This comparison includes more than
#{
MergeRequestDiff
::
COMMITS_SAFE_SIZE
}
commits.
...
...
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