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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
70df6055
Commit
70df6055
authored
Feb 12, 2014
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix link for MR diff download
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
59769fdb
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
5 deletions
+7
-5
app/views/projects/merge_requests/show/_diffs.html.haml
app/views/projects/merge_requests/show/_diffs.html.haml
+7
-5
No files found.
app/views/projects/merge_requests/show/_diffs.html.haml
View file @
70df6055
...
@@ -3,8 +3,10 @@
...
@@ -3,8 +3,10 @@
-
elsif
@merge_request_diff
.
empty?
-
elsif
@merge_request_diff
.
empty?
%h4
.nothing_here_message
Nothing to merge from
#{
@merge_request
.
source_branch
}
into
#{
@merge_request
.
target_branch
}
%h4
.nothing_here_message
Nothing to merge from
#{
@merge_request
.
source_branch
}
into
#{
@merge_request
.
target_branch
}
-
else
-
else
%h4
.nothing_here_message
.bs-callout.bs-callout-warning
Can't load diff.
%h4
You can
Diff for this comparison is extremely large.
=
link_to
"download it"
,
project_merge_request_path
(
@merge_request
.
source_project
,
@merge_request
),
format: :diff
,
class:
"vlink"
%p
instead.
You can
=
link_to
"download it"
,
project_merge_request_path
(
@merge_request
.
source_project
,
@merge_request
,
format: :diff
),
class:
"vlink"
instead.
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