summaryrefslogtreecommitdiff
path: root/app/models/merge_request_diff.rb
diff options
context:
space:
mode:
authorBob Van Landuyt <bob@gitlab.com>2017-06-01 21:21:14 +0000
committerRobert Speicher <robert@gitlab.com>2017-06-01 21:21:14 +0000
commite564fe971f3dacb1a2a38ad984b865ae23e54400 (patch)
treee0170db376606eb8796d4cafb5fae7c58730814d /app/models/merge_request_diff.rb
parent8d131eb85ddc1ee6cd4a27830b2607617d767f28 (diff)
downloadgitlab-ce-e564fe971f3dacb1a2a38ad984b865ae23e54400.tar.gz
Rename `Gitlab::Git::EncodingHelper` to `Gitlab::EncodingHelper`
Diffstat (limited to 'app/models/merge_request_diff.rb')
-rw-r--r--app/models/merge_request_diff.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/merge_request_diff.rb b/app/models/merge_request_diff.rb
index 1c2f335f95e..99dd2130188 100644
--- a/app/models/merge_request_diff.rb
+++ b/app/models/merge_request_diff.rb
@@ -1,7 +1,7 @@
class MergeRequestDiff < ActiveRecord::Base
include Sortable
include Importable
- include Gitlab::Git::EncodingHelper
+ include Gitlab::EncodingHelper
# Prevent store of diff if commits amount more then 500
COMMITS_SAFE_SIZE = 100