app/models/repository.rb · 85640c5cbbf3e08f562ecbebfeabc64862e85bed · Forest Godfrey / gitlab-ce · GitLab

BigW Consortium Gitlab

Blame History Permalink

Merge branch 'conflict-resolution-refactor' into 'master' · b2553840
Sean McGivern authored Oct 16, 2017
```
Conflict resolution refactor

See merge request gitlab-org/gitlab-ce!14747
```
b2553840

repository.rb 29.9 KB