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
Léo-Paul Géneau
gitlab-ce
Commits
44eec823
Commit
44eec823
authored
Aug 01, 2016
by
Paco Guzman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Avoid line_code and position calculation on line partial for plain view
parent
2f344eca
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
CHANGELOG
CHANGELOG
+1
-0
app/views/projects/diffs/_line.html.haml
app/views/projects/diffs/_line.html.haml
+3
-4
No files found.
CHANGELOG
View file @
44eec823
...
@@ -32,6 +32,7 @@ v 8.11.0 (unreleased)
...
@@ -32,6 +32,7 @@ v 8.11.0 (unreleased)
- Add the `sprockets-es6` gem
- Add the `sprockets-es6` gem
- Multiple trigger variables show in separate lines (Katarzyna Kobierska Ula Budziszewska)
- Multiple trigger variables show in separate lines (Katarzyna Kobierska Ula Budziszewska)
- Profile requests when a header is passed
- Profile requests when a header is passed
- Avoid calculation of line_code and position for _line partial when showing diff notes on discussion tab.
- Add commit stats in commit api. !5517 (dixpac)
- Add commit stats in commit api. !5517 (dixpac)
- Make error pages responsive (Takuya Noguchi)
- Make error pages responsive (Takuya Noguchi)
- Change requests_profiles resource constraint to catch virtually any file
- Change requests_profiles resource constraint to catch virtually any file
...
...
app/views/projects/diffs/_line.html.haml
View file @
44eec823
-
plain
=
local_assigns
.
fetch
(
:plain
,
false
)
-
plain
=
local_assigns
.
fetch
(
:plain
,
false
)
-
line_code
=
diff_file
.
line_code
(
line
)
-
position
=
diff_file
.
position
(
line
)
-
type
=
line
.
type
-
type
=
line
.
type
%tr
.line_holder
{
id:
line_code
,
class:
type
}
-
line_code
=
diff_file
.
line_code
(
line
)
unless
plain
%tr
.line_holder
{
plain
?
{
class:
type
}
:
{
class:
type
,
id:
line_code
}
}
-
case
type
-
case
type
-
when
'match'
-
when
'match'
=
render
"projects/diffs/match_line"
,
{
line:
line
.
text
,
=
render
"projects/diffs/match_line"
,
{
line:
line
.
text
,
...
@@ -24,4 +23,4 @@
...
@@ -24,4 +23,4 @@
=
link_text
=
link_text
-
else
-
else
%a
{
href:
"##{line_code}"
,
data:
{
linenumber:
link_text
}}
%a
{
href:
"##{line_code}"
,
data:
{
linenumber:
link_text
}}
%td
.line_content.noteable_line
{
class:
type
,
data:
(
diff_view_line_data
(
line_code
,
position
,
type
)
unless
plain
)
}=
diff_line_content
(
line
.
text
,
type
)
%td
.line_content.noteable_line
{
class:
type
,
data:
(
diff_view_line_data
(
line_code
,
diff_file
.
position
(
line
)
,
type
)
unless
plain
)
}=
diff_line_content
(
line
.
text
,
type
)
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