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
da4eff4a
Commit
da4eff4a
authored
Sep 29, 2014
by
Ciro Santilli
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Only show text wrap and diff notes for text in MR.
parent
376e004c
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
9 deletions
+10
-9
app/views/projects/diffs/_file.html.haml
app/views/projects/diffs/_file.html.haml
+10
-9
No files found.
app/views/projects/diffs/_file.html.haml
View file @
da4eff4a
...
@@ -15,15 +15,16 @@
...
@@ -15,15 +15,16 @@
%span
.file-mode
=
"
#{
diff_file
.
diff
.
a_mode
}
→
#{
diff_file
.
diff
.
b_mode
}
"
%span
.file-mode
=
"
#{
diff_file
.
diff
.
a_mode
}
→
#{
diff_file
.
diff
.
b_mode
}
"
.diff-btn-group
.diff-btn-group
-
unless
params
[
:view
]
==
'parallel'
-
if
blob
.
text?
%label
-
unless
params
[
:view
]
==
'parallel'
=
check_box_tag
nil
,
1
,
false
,
class:
"js-toggle-diff-line-wrap"
%label
Wrap text
=
check_box_tag
nil
,
1
,
false
,
class:
'js-toggle-diff-line-wrap'
Wrap text
=
link_to
"#"
,
class:
"js-toggle-diff-comments btn btn-small"
do
%i
.icon-chevron-down
=
link_to
'#'
,
class:
'js-toggle-diff-comments btn btn-small'
do
Diff comments
%i
.icon-chevron-down
Diff comments
-
if
@merge_request
&&
@merge_request
.
source_project
-
if
@merge_request
&&
@merge_request
.
source_project
=
link_to
project_edit_tree_path
(
@merge_request
.
source_project
,
tree_join
(
@merge_request
.
source_branch
,
diff_file
.
new_path
),
from_merge_request_id:
@merge_request
.
id
),
{
class:
'btn btn-small'
}
do
=
link_to
project_edit_tree_path
(
@merge_request
.
source_project
,
tree_join
(
@merge_request
.
source_branch
,
diff_file
.
new_path
),
from_merge_request_id:
@merge_request
.
id
),
{
class:
'btn btn-small'
}
do
...
...
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