summaryrefslogtreecommitdiff
path: root/lib/api/files.rb
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2016-02-12 17:40:40 +0000
committerDouwe Maan <douwe@gitlab.com>2016-02-12 17:40:40 +0000
commitc142bde51d05ad6fe2137c1b6bb0cd2485b4f1d9 (patch)
treec93e2ba8f8918b99f41994030fbc9893c7ef44f3 /lib/api/files.rb
parent0174263c9b60340e53635418da98681738cdddc3 (diff)
parent8172d5ca54f908d5ce9975dd18fb9bea0c992dbb (diff)
downloadgitlab-ce-c142bde51d05ad6fe2137c1b6bb0cd2485b4f1d9.tar.gz
Merge branch 'fix_500-commit-null' into 'master'
Don't try to mark broken MR as mergable In case merge request is broken, we shouldn't check if the sha is mergable, as it will be null, and there's no point, as we know that it's not mergable. See merge request !2783
Diffstat (limited to 'lib/api/files.rb')
0 files changed, 0 insertions, 0 deletions