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
51570c70
Commit
51570c70
authored
Jan 11, 2022
by
Robert May
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update flag name and add comment
parent
839bc405
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
3 deletions
+7
-3
app/views/projects/diffs/_email_line.html.haml
app/views/projects/diffs/_email_line.html.haml
+4
-0
app/views/projects/diffs/_text_file.html.haml
app/views/projects/diffs/_text_file.html.haml
+1
-1
config/feature_flags/development/inline_haml_diff_line_rendering.yml
...ure_flags/development/inline_haml_diff_line_rendering.yml
+2
-2
No files found.
app/views/projects/diffs/_email_line.html.haml
View file @
51570c70
-# This template is used when rendering diffs in email notifications
-# Called inside: app/views/notify/repository_push_email.html.haml
-# app/views/notify/_note_email.html.haml
%tr
.line_holder
{
class:
line
.
type
}
-
case
line
.
type
-
when
'match'
...
...
app/views/projects/diffs/_text_file.html.haml
View file @
51570c70
...
...
@@ -4,7 +4,7 @@
%a
.show-suppressed-diff.cursor-pointer.js-show-suppressed-diff
=
_
(
"Changes suppressed. Click to show."
)
%table
.text-file.diff-wrap-lines.code.code-commit.js-syntax-highlight.commit-diff
{
data:
diff_view_data
,
class:
too_big
?
'hide'
:
''
}
-
if
Feature
.
enabled?
(
:inline_diff_line_rendering
,
@project
,
default_enabled: :yaml
)
-
if
Feature
.
enabled?
(
:inline_
haml_
diff_line_rendering
,
@project
,
default_enabled: :yaml
)
-
diff_file
.
highlighted_diff_lines
.
each
do
|
line
|
-
line_code
=
diff_file
.
line_code
(
line
)
...
...
config/feature_flags/development/inline_diff_line_rendering.yml
→
config/feature_flags/development/inline_
haml_
diff_line_rendering.yml
View file @
51570c70
---
name
:
inline_diff_line_rendering
name
:
inline_
haml_
diff_line_rendering
introduced_by_url
:
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/57237
rollout_issue_url
:
https://gitlab.com/gitlab-org/gitlab/-/issues/330582
milestone
:
'
14.
6
'
milestone
:
'
14.
7
'
type
:
development
group
:
group::source code
default_enabled
:
false
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