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
d88a5c1d
Commit
d88a5c1d
authored
May 25, 2017
by
Douwe Maan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Address feedback
parent
68f7fd8b
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
5 deletions
+3
-5
app/views/notify/repository_push_email.html.haml
app/views/notify/repository_push_email.html.haml
+2
-4
lib/gitlab/diff/file_collection/base.rb
lib/gitlab/diff/file_collection/base.rb
+1
-1
No files found.
app/views/notify/repository_push_email.html.haml
View file @
d88a5c1d
...
...
@@ -26,10 +26,8 @@
%h4
#{
pluralize
@message
.
diffs_count
,
"changed file"
}
:
-
diff_files
=
@message
.
diffs
%ul
-
diff_file
s
.
each
do
|
diff_file
|
-
@message
.
diff
s
.
each
do
|
diff_file
|
%li
.file-stats
%a
{
href:
"#{@message.target_url if @message.disable_diffs?}##{hexdigest(diff_file.file_path)}"
}
-
if
diff_file
.
deleted_file?
...
...
@@ -52,7 +50,7 @@
%h5
The diff was not included because it is too large.
-
else
%h4
Changes:
-
diff_file
s
.
each
do
|
diff_file
|
-
@message
.
diff
s
.
each
do
|
diff_file
|
-
file_hash
=
hexdigest
(
diff_file
.
file_path
)
%li
{
id:
file_hash
}
%a
{
href:
@message
.
target_url
+
"##{file_hash}"
}
<
...
...
lib/gitlab/diff/file_collection/base.rb
View file @
d88a5c1d
...
...
@@ -2,7 +2,7 @@ module Gitlab
module
Diff
module
FileCollection
class
Base
attr_reader
:project
,
:diff_options
,
:diff_
view
,
:diff_
refs
,
:fallback_diff_refs
attr_reader
:project
,
:diff_options
,
:diff_refs
,
:fallback_diff_refs
delegate
:count
,
:size
,
:real_size
,
to: :diff_files
...
...
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