summaryrefslogtreecommitdiff
path: root/lib/api/files.rb
diff options
context:
space:
mode:
authorSean McGivern <sean@mcgivern.me.uk>2017-10-30 11:18:04 +0000
committerSean McGivern <sean@mcgivern.me.uk>2017-10-30 11:18:04 +0000
commit609f4048dd8159871104b43831a26cbeec9c14f2 (patch)
tree7eb70244e720ccda4835527cfe03f29d1b5d64e4 /lib/api/files.rb
parent2573818f6d53f5d89a2615b78551253a3bab4cfa (diff)
parentc4124fce48e83db603d69a83bb912ae5d0d54f65 (diff)
downloadgitlab-ce-609f4048dd8159871104b43831a26cbeec9c14f2.tar.gz
Merge branch 'make-merge-jid-handling-less-stateful' into 'master'
Fix widget of locked merge requests not being presented See merge request gitlab-org/gitlab-ce!15069
Diffstat (limited to 'lib/api/files.rb')
0 files changed, 0 insertions, 0 deletions