diff options
| author | Alejandro RodrÃguez <alejorro70@gmail.com> | 2017-11-30 20:04:57 -0300 |
|---|---|---|
| committer | Alejandro RodrÃguez <alejorro70@gmail.com> | 2017-12-04 16:11:54 -0300 |
| commit | 2286681e1ca5cfbdbb6167cc4f31f0933ee584a5 (patch) | |
| tree | e8a13f771532c7564311705719573527898cc441 | |
| parent | 6e12e83d71b0b3783344c2258a9b4c2af000c90a (diff) | |
| download | gitlab-ce-2286681e1ca5cfbdbb6167cc4f31f0933ee584a5.tar.gz | |
Add missing attr_accessor to Gitlab::Git::Conflict::File
| -rw-r--r-- | lib/gitlab/git/conflict/file.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/git/conflict/file.rb b/lib/gitlab/git/conflict/file.rb index fc1595f1faf..b2a625e08fa 100644 --- 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 |