diff options
| author | Nick Thomas <nick@gitlab.com> | 2019-01-08 15:05:43 +0000 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2019-01-08 15:05:43 +0000 |
| commit | 5a827e0c00066a6b4ce4051108f91c798d07e5bf (patch) | |
| tree | 31a16933f9cfbb3afee3763e4313c0341a0aa8be /spec/javascripts/lib | |
| parent | 148969947ffd3d2b69c786b9babaed64bba3df9d (diff) | |
| parent | aae6d174948a238abf05af2d3038d80b5e8750f4 (diff) | |
| download | gitlab-ce-5a827e0c00066a6b4ce4051108f91c798d07e5bf.tar.gz | |
Merge branch 'mr-widget-conflicts-protected-branch' into 'master'
Disable resolve conflicts for protected branches
Closes #53463
See merge request gitlab-org/gitlab-ce!23842
Diffstat (limited to 'spec/javascripts/lib')
0 files changed, 0 insertions, 0 deletions