diff options
author | Sean McGivern <sean@gitlab.com> | 2016-08-24 15:20:06 +0100 |
---|---|---|
committer | Sean McGivern <sean@gitlab.com> | 2016-08-25 12:34:54 +0100 |
commit | 4a3d1a5838685ff95a6c9416bb3e453ad143f50d (patch) | |
tree | f7066e25c845ed6efb75f9af056244fd832d5e7d /lib/gitlab/conflict/file.rb | |
parent | 7bbb523b23638c52b3c0ba43d8f3dbef8840aad6 (diff) | |
download | gitlab-ce-4a3d1a5838685ff95a6c9416bb3e453ad143f50d.tar.gz |
Handle case where conflicts aren't on disk yet
Diffstat (limited to 'lib/gitlab/conflict/file.rb')
-rw-r--r-- | lib/gitlab/conflict/file.rb | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/lib/gitlab/conflict/file.rb b/lib/gitlab/conflict/file.rb index 0a1fd27ced5..dff9e29c6a5 100644 --- a/lib/gitlab/conflict/file.rb +++ b/lib/gitlab/conflict/file.rb @@ -181,6 +181,17 @@ module Gitlab sections: sections } end + + # Don't try to print merge_request or repository. + def inspect + instance_variables = [:merge_file_result, :their_path, :our_path, :our_mode].map do |instance_variable| + value = instance_variable_get("@#{instance_variable}") + + "#{instance_variable}=\"#{value}\"" + end + + "#<#{self.class} #{instance_variables.join(' ')}>" + end end end end |