Class: Gitlab::Git::Conflict::Resolution

Inherits:
Object
  • Object
show all
Defined in:
lib/gitlab/git/conflict/resolution.rb

Instance Attribute Summary collapse

Instance Method Summary collapse

Constructor Details

#initialize(user, files, commit_message) ⇒ Resolution

Returns a new instance of Resolution.



9
10
11
12
13
 
# File 'lib/gitlab/git/conflict/resolution.rb', line 9

def initialize(user, files, commit_message)
  @user = user
  @files = files
  @commit_message = commit_message
end

Instance Attribute Details

#commit_message ⇒ Object (readonly)

Returns the value of attribute commit_message.



7
8
9
 
# File 'lib/gitlab/git/conflict/resolution.rb', line 7

def commit_message
  @commit_message
end

#files ⇒ Object (readonly)

Returns the value of attribute files.



7
8
9
 
# File 'lib/gitlab/git/conflict/resolution.rb', line 7

def files
  @files
end

#user ⇒ Object (readonly)

Returns the value of attribute user.



7
8
9
 
# File 'lib/gitlab/git/conflict/resolution.rb', line 7

def user
  @user
end