| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Enable more frozen string in app/services/**/*.rbrepo-forks/gitlab-ce-frozen-string-enable-apps-services-inner-more | gfyoung | 2018-07-17 | 1 | -0/+2 |
| * | Cache `#can_be_resolved_in_ui?` git operationscache-refactor | Alejandro Rodríguez | 2018-03-08 | 1 | -9/+1 |
| * | Incorporate ConflictsService.ListConflictFiles Gitaly RPC | Alejandro Rodríguez | 2017-12-27 | 1 | -1/+1 |
| * | Create a Gitlab::Git submodule for conlict-related files | Alejandro Rodríguez | 2017-10-12 | 1 | -1/+1 |
| * | Refactor conflict resolution to contain git ops within Gitlab::Git | Alejandro Rodríguez | 2017-10-12 | 1 | -2/+2 |
| * | Stop MR conflict code from blowing up when branches are missingdm-no-conflicts-when-branches-are-missing | Douwe Maan | 2017-05-18 | 1 | -0/+1 |
| * | Fix conflict resolution from corrupted upstreamfix-conflict-resolution-with-corrupt-repos | Sean McGivern | 2017-05-12 | 1 | -0/+35 |
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |