| 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 |
| * | Refactor conflict resolution to contain git ops within Gitlab::Git | Alejandro RodrÃguez | 2017-10-12 | 1 | -1/+1 |
| * | Encapsulate git operations for conflict resolution into lib | Alejandro RodrÃguez | 2017-10-12 | 1 | -46/+2 |
| * | Enable Style/DotPosition Rubocop :cop: | Grzegorz Bizon | 2017-06-21 | 1 | -4/+4 |
| * | Keep trailing newline when picking conflict sections32983-merge-conflict-resolution-removed-the-newline-in-the-end-of-file | Sean McGivern | 2017-06-01 | 1 | -5/+7 |
| * | Fix conflict resolution from corrupted upstreamfix-conflict-resolution-with-corrupt-repos | Sean McGivern | 2017-05-12 | 1 | -0/+53 |
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |