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
037e5d39
Commit
037e5d39
authored
Oct 10, 2019
by
Douglas Barbosa Alexandre
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix undefined method log_geo_deleted_event for MergeRequestDiff
parent
e5228347
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
19 additions
and
0 deletions
+19
-0
app/models/merge_request_diff.rb
app/models/merge_request_diff.rb
+2
-0
ee/app/models/ee/merge_request_diff.rb
ee/app/models/ee/merge_request_diff.rb
+10
-0
ee/spec/models/ee/merge_request_diff_spec.rb
ee/spec/models/ee/merge_request_diff_spec.rb
+7
-0
No files found.
app/models/merge_request_diff.rb
View file @
037e5d39
...
@@ -591,3 +591,5 @@ class MergeRequestDiff < ApplicationRecord
...
@@ -591,3 +591,5 @@ class MergeRequestDiff < ApplicationRecord
end
end
end
end
end
end
MergeRequestDiff
.
prepend_if_ee
(
'EE::MergeRequestDiff'
)
ee/app/models/ee/merge_request_diff.rb
0 → 100644
View file @
037e5d39
# frozen_string_literal: true
module
EE
module
MergeRequestDiff
def
log_geo_deleted_event
# Keep empty for now. Should be addressed in future
# by https://gitlab.com/gitlab-org/gitlab/issues/33817
end
end
end
ee/spec/models/ee/merge_request_diff_spec.rb
0 → 100644
View file @
037e5d39
# frozen_string_literal: true
require
'spec_helper'
describe
MergeRequestDiff
do
it
{
is_expected
.
to
respond_to
(
:log_geo_deleted_event
)
}
end
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