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

2017-11-30 20:04:57 -03:00 · 2017-11-30 20:04:57 -03:00 · 2286681e1c
parent 6e12e83d71
commit 2286681e1c
1 changed files with 1 additions and 1 deletions
--- 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