Add missing attr_accessor to Gitlab::Git::Conflict::File

2286681e · Alejandro Rodríguez · 6e12e83d · 2286681e
Commit 2286681e authored Nov 30, 2017 by Alejandro Rodríguez
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

lib/gitlab/git/conflict/file.rb lib/gitlab/git/conflict/file.rb +1 -1

No files found.
--- a/lib/gitlab/git/conflict/file.rb
+++ b/lib/gitlab/git/conflict/file.rb
@@ -2,7 +2,7 @@ module Gitlab
  module Git
    module Conflict
      class File
-        attr_reader :content, :their_path, :our_path, :our_mode, :repository
+        attr_reader :content, :their_path, :our_path, :our_mode, :repository, :commit_oid
        def initialize(repository, commit_oid, conflict, content)
          @repository = repository