diff options
| author | Robert Speicher <rspeicher@gmail.com> | 2017-01-04 13:43:06 -0500 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2017-01-04 19:09:28 -0500 |
| commit | a00578ce5cdf4bab95990bca9e806c6322bb1384 (patch) | |
| tree | 5aafe058fa55086038dbb3086121ad624447c0e4 /app/models/merge_request_diff.rb | |
| parent | aec04a47c16665f1dfb1fb61647c3f78a4dde20f (diff) | |
| download | gitlab-ce-a00578ce5cdf4bab95990bca9e806c6322bb1384.tar.gz | |
Absorb gitlab_git
Diffstat (limited to 'app/models/merge_request_diff.rb')
| -rw-r--r-- | app/models/merge_request_diff.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/merge_request_diff.rb b/app/models/merge_request_diff.rb index b8f36a2c958..64dd586c9e0 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 EncodingHelper + include Gitlab::Git::EncodingHelper # Prevent store of diff if commits amount more then 500 COMMITS_SAFE_SIZE = 100 |