diff options
| author | Sean McGivern <sean@gitlab.com> | 2017-03-01 14:00:37 +0300 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2017-03-01 18:28:10 +0300 |
| commit | 811e598f607235d89e71d09d99538ee4dee3ffed (patch) | |
| tree | 7608961ebb9c672836dd2e3f03eb56920e7b4ef3 /app/services/merge_requests | |
| parent | 8dd097a91530e4b047c4b391f21047c7d29d310d (diff) | |
Enable and autocorrect the CustomErrorClass cop
Diffstat (limited to 'app/services/merge_requests')
| -rw-r--r-- | app/services/merge_requests/resolve_service.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/app/services/merge_requests/resolve_service.rb b/app/services/merge_requests/resolve_service.rb index d22a1d3e0ad..82cd89d9a0b 100644 --- a/app/services/merge_requests/resolve_service.rb +++ b/app/services/merge_requests/resolve_service.rb @@ -1,7 +1,6 @@ module MergeRequests class ResolveService < MergeRequests::BaseService - class MissingFiles < Gitlab::Conflict::ResolutionError - end + MissingFiles = Class.new(Gitlab::Conflict::ResolutionError) attr_accessor :conflicts, :rugged, :merge_index, :merge_request |