app/views/projects/merge_requests/widget/open/_conflicts.html.haml · af7e75162efe07e9fcb1186462e56bd2325018de · Forest Godfrey / gitlab-ce · GitLab

BigW Consortium Gitlab

Blame History Permalink

Don't ask the user to "merge this request manually". · af7e7516
Timothy Andrew authored Jul 04, 2016
```
1. If they are a developer with "Developers can Merge" switched on.
```
af7e7516

_conflicts.html.haml 429 Bytes