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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
d4d723ca
Commit
d4d723ca
authored
Aug 27, 2014
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #7616 from yglukhov/fix-parallel-diff-on-new-mr
Fixed parralel diff button on 'merge_requests/new' page
parents
c4a8663b
f44a68a0
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
2 deletions
+5
-2
app/views/projects/commits/_diffs.html.haml
app/views/projects/commits/_diffs.html.haml
+5
-2
No files found.
app/views/projects/commits/_diffs.html.haml
View file @
d4d723ca
...
...
@@ -4,9 +4,12 @@
.col-md-4
%ul
.nav.nav-tabs
%li
.pull-right
{
class:
params
[
:view
]
==
'parallel'
?
'active'
:
''
}
=
link_to
"Side-by-side Diff"
,
url_for
(
view:
'parallel'
),
{
id:
"commit-diff-viewtype"
}
-
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'
:
''
}
=
link_to
"Inline Diff"
,
url_for
(
view:
'inline'
),
{
id:
"commit-diff-viewtype"
}
-
params_copy
[
:view
]
=
'inline'
=
link_to
"Inline Diff"
,
url_for
(
params_copy
),
{
id:
"commit-diff-viewtype"
}
-
if
show_diff_size_warninig?
(
diffs
)
=
render
'projects/commits/diff_warning'
,
diffs:
diffs
...
...
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