summaryrefslogtreecommitdiff
path: root/spec/tasks/tokens_spec.rb
diff options
context:
space:
mode:
authorJacob Vosmaer <jacob@gitlab.com>2017-12-22 16:58:05 +0100
committerJacob Vosmaer <jacob@gitlab.com>2018-01-03 12:02:37 +0100
commit8cf0ea4469290815daa1d64c4f3e16cbba8c00c1 (patch)
treea82a85ea9dbe7bba6efa9f196f85c238eb3dd14d /spec/tasks/tokens_spec.rb
parent48dacd5e74d17db6c058ea79301d237330980b0e (diff)
downloadgitlab-ce-8cf0ea4469290815daa1d64c4f3e16cbba8c00c1.tar.gz
Handle Gitaly aborted merge due to branch update
Diffstat (limited to 'spec/tasks/tokens_spec.rb')
0 files changed, 0 insertions, 0 deletions