summaryrefslogtreecommitdiff
path: root/app/models/gpg_key.rb
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2018-07-26 18:44:21 +0000
committerStan Hu <stanhu@gmail.com>2018-07-26 18:44:21 +0000
commitcaeb4597a5b24e0eaa96b24901ce9208c2eef4bf (patch)
tree293c4fd1a71a44797eeb2662fec4743b8ebaa7b5 /app/models/gpg_key.rb
parent20e63ba1567dc18878e48e59df95ff9c7729d071 (diff)
parent9e396d6e1c975aece20877623973dcd2d6941355 (diff)
downloadgitlab-ce-caeb4597a5b24e0eaa96b24901ce9208c2eef4bf.tar.gz
Merge branch 'mk/fix-callback-canceling-in-namespace-move-dir' into 'master'
Fix namespace move callback behavior, especially to fix Geo replication of namespace moves during certain exceptions Closes gitlab-ee#6252 See merge request gitlab-org/gitlab-ce!19297
Diffstat (limited to 'app/models/gpg_key.rb')
0 files changed, 0 insertions, 0 deletions