65e3a1e9e9
- Add a Gitlab::Git::Conflict::Resolution class to encapsulate resolution data - Simplify conflict file collection assembly
15 lines
305 B
Ruby
15 lines
305 B
Ruby
module Gitlab
|
|
module Git
|
|
module Conflict
|
|
class Resolution
|
|
attr_reader :user, :files, :commit_message
|
|
|
|
def initialize(user, files, commit_message)
|
|
@user = user
|
|
@files = files
|
|
@commit_message = commit_message
|
|
end
|
|
end
|
|
end
|
|
end
|
|
end
|