diff options
| author | Sam Rose <sam@gitlab.com> | 2016-12-21 18:29:47 +0300 |
|---|---|---|
| committer | Sam Rose <sam@gitlab.com> | 2016-12-28 17:40:19 +0300 |
| commit | 822534c4c4c05cc53606fc45ca002d4a3d218256 (patch) | |
| tree | 7fc56412744a7aac239a303da5617f3e5fee1710 /changelogs | |
| parent | 0dcbd4c7f6cfc69d3190c4622bbc73da718056c7 (diff) | |
Replace link to Resolve conflicts with buttons
Use variables for display logic conditional checks
Diffstat (limited to 'changelogs')
| -rw-r--r-- | changelogs/unreleased/21135-resolve-these-conflicts-link-is-too-subtle.yml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/changelogs/unreleased/21135-resolve-these-conflicts-link-is-too-subtle.yml b/changelogs/unreleased/21135-resolve-these-conflicts-link-is-too-subtle.yml new file mode 100644 index 00000000000..574c322803c --- /dev/null +++ b/changelogs/unreleased/21135-resolve-these-conflicts-link-is-too-subtle.yml @@ -0,0 +1,4 @@ +--- +title: Improve visibility of "Resolve conflicts" and "Merge locally" actions +merge_request: 8229 +author: |