diff options
| author | Douwe Maan <douwe@selenight.nl> | 2016-11-17 20:40:28 +0200 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2016-11-18 15:40:04 +0200 |
| commit | 23c8332f133e55a8c88cc4771ad25cea17294a34 (patch) | |
| tree | d4f16bd25b325ee25694d4819de815c4a529076d /app/models/merge_request_diff.rb | |
| parent | aea8baed3093c513560e9ac5ac0c5c99508d3001 (diff) | |
| download | gitlab-ce-absorb-gitlab-git.tar.gz | |
Absorb gitlab_git @ 6b077df2b68158cf8e069e3ffd6359aff038a438absorb-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 dd65a9a8b86..3e1bec1c521 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 |