-
- Downloads
There was an error fetching the commit references. Please try again later.
Merge branch 'conflict-resolution-refactor' into 'master'
Conflict resolution refactor See merge request gitlab-org/gitlab-ce!14747
No related branches found
No related tags found
Showing
- app/controllers/projects/merge_requests/conflicts_controller.rb 1 addition, 1 deletion...ntrollers/projects/merge_requests/conflicts_controller.rb
- app/models/repository.rb 1 addition, 11 deletionsapp/models/repository.rb
- app/services/merge_requests/conflicts/list_service.rb 2 additions, 2 deletionsapp/services/merge_requests/conflicts/list_service.rb
- app/services/merge_requests/conflicts/resolve_service.rb 2 additions, 46 deletionsapp/services/merge_requests/conflicts/resolve_service.rb
- lib/api/commits.rb 1 addition, 1 deletionlib/api/commits.rb
- lib/api/v3/commits.rb 1 addition, 1 deletionlib/api/v3/commits.rb
- lib/github/representation/comment.rb 1 addition, 1 deletionlib/github/representation/comment.rb
- lib/gitlab/bitbucket_import/importer.rb 1 addition, 1 deletionlib/gitlab/bitbucket_import/importer.rb
- lib/gitlab/conflict/file.rb 17 additions, 71 deletionslib/gitlab/conflict/file.rb
- lib/gitlab/conflict/file_collection.rb 20 additions, 48 deletionslib/gitlab/conflict/file_collection.rb
- lib/gitlab/conflict/parser.rb 0 additions, 74 deletionslib/gitlab/conflict/parser.rb
- lib/gitlab/conflict/resolution_error.rb 0 additions, 5 deletionslib/gitlab/conflict/resolution_error.rb
- lib/gitlab/diff/file.rb 1 addition, 1 deletionlib/gitlab/diff/file.rb
- lib/gitlab/diff/line_code.rb 0 additions, 9 deletionslib/gitlab/diff/line_code.rb
- lib/gitlab/git.rb 4 additions, 0 deletionslib/gitlab/git.rb
- lib/gitlab/git/conflict/file.rb 86 additions, 0 deletionslib/gitlab/git/conflict/file.rb
- lib/gitlab/git/conflict/parser.rb 91 additions, 0 deletionslib/gitlab/git/conflict/parser.rb
- lib/gitlab/git/conflict/resolver.rb 91 additions, 0 deletionslib/gitlab/git/conflict/resolver.rb
- lib/gitlab/git/repository.rb 18 additions, 0 deletionslib/gitlab/git/repository.rb
- lib/gitlab/github_import/comment_formatter.rb 1 addition, 1 deletionlib/gitlab/github_import/comment_formatter.rb
Loading
Please register or sign in to comment