summaryrefslogtreecommitdiff
path: root/spec/controllers
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzegorz@gitlab.com>2017-01-21 21:41:29 +0000
committerGrzegorz Bizon <grzegorz@gitlab.com>2017-01-21 21:41:29 +0000
commitf6f52b43b59641f5e0c6f7aa47b1354ca3aeee32 (patch)
treea6490f060c6d3179661de14b9bc2622513867829 /spec/controllers
parentbddd09c46534809876339e3c998440185c0f0036 (diff)
parentd50b64dc752cfcf344311455c1ff640e8df72ed4 (diff)
downloadgitlab-ce-f6f52b43b59641f5e0c6f7aa47b1354ca3aeee32.tar.gz
Merge branch 'fix_auto_merging' into 'master'
Fix Merge When Pipeline Succeeds immediate merge bug Closes #26969 See merge request !8685
Diffstat (limited to 'spec/controllers')
0 files changed, 0 insertions, 0 deletions