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
a3bb9546
Commit
a3bb9546
authored
Mar 20, 2018
by
Micaël Bergeron
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
remove out-of-context changes
parent
fc1256b2
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
2 deletions
+4
-2
app/models/merge_request_diff.rb
app/models/merge_request_diff.rb
+4
-0
config/sidekiq_queues.yml
config/sidekiq_queues.yml
+0
-2
No files found.
app/models/merge_request_diff.rb
View file @
a3bb9546
...
...
@@ -197,6 +197,10 @@ class MergeRequestDiff < ActiveRecord::Base
CompareService
.
new
(
project
,
head_commit_sha
).
execute
(
project
,
sha
,
straight:
true
)
end
def
commits_count
super
||
merge_request_diff_commits
.
size
end
private
def
create_merge_request_diff_files
(
diffs
)
...
...
config/sidekiq_queues.yml
View file @
a3bb9546
...
...
@@ -89,8 +89,6 @@
- [elastic_indexer, 1]
- [elastic_commit_indexer, 1]
- [export_csv, 1]
- [object_storage_upload, 1]
- [object_storage, 1]
# Deprecated queues
:
Remove after
10.7
-
geo_base_scheduler
...
...
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