Age | Commit message (Expand) | Author |
---|---|---|
2018-07-18 | Enable more frozen string in app/services/**/*.rb | gfyoung |
2018-03-08 | Cache `#can_be_resolved_in_ui?` git operations | Alejandro Rodríguez |
2017-12-27 | Incorporate ConflictsService.ListConflictFiles Gitaly RPC | Alejandro Rodríguez |
2017-10-13 | Create a Gitlab::Git submodule for conlict-related files | Alejandro Rodríguez |
2017-10-13 | Refactor conflict resolution to contain git ops within Gitlab::Git | Alejandro Rodríguez |
2017-10-13 | Encapsulate git operations for conflict resolution into lib | Alejandro Rodríguez |
2017-06-21 | Enable Style/DotPosition Rubocop :cop: | Grzegorz Bizon |
2017-06-01 | Keep trailing newline when picking conflict sections | Sean McGivern |
2017-05-18 | Stop MR conflict code from blowing up when branches are missing | Douwe Maan |
2017-05-12 | Fix conflict resolution from corrupted upstream | Sean McGivern |