diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-08-01 10:40:36 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-08-01 10:40:36 +0000 |
| commit | c8a8d13dbb52dc0ffcc64de00496d8e0f805bdbe (patch) | |
| tree | fdfd899b3cdfb82e072ab9cf27e76d853174a5f4 /lib | |
| parent | 07a4cf41841478f1f48d715d2b3f3bd533363150 (diff) | |
| parent | 7b18c424644f98f04e527dd0c5e10b1c23f5bae4 (diff) | |
| download | gitlab-ce-c8a8d13dbb52dc0ffcc64de00496d8e0f805bdbe.tar.gz | |
Merge branch 'remove-content-commit' into 'master'
Remove unused Gitlab::Diff code
See merge request !13195
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/diff/file.rb | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/lib/gitlab/diff/file.rb b/lib/gitlab/diff/file.rb index d2863a4da71..6d7de52cb80 100644 --- a/lib/gitlab/diff/file.rb +++ b/lib/gitlab/diff/file.rb @@ -79,13 +79,6 @@ module Gitlab @new_content_sha = refs&.head_sha end - def new_content_commit - return @new_content_commit if defined?(@new_content_commit) - - sha = new_content_commit - @new_content_commit = repository.commit(sha) if sha - end - def old_content_sha return if new_file? return @old_content_sha if defined?(@old_content_sha) @@ -94,13 +87,6 @@ module Gitlab @old_content_sha = refs&.base_sha end - def old_content_commit - return @old_content_commit if defined?(@old_content_commit) - - sha = old_content_sha - @old_content_commit = repository.commit(sha) if sha - end - def new_blob return @new_blob if defined?(@new_blob) @@ -123,10 +109,6 @@ module Gitlab new_content_sha || old_content_sha end - def content_commit - new_content_commit || old_content_commit - end - def blob new_blob || old_blob end |
