summaryrefslogtreecommitdiff
path: root/app/views
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2018-01-24 15:09:16 +0000
committerDouwe Maan <douwe@gitlab.com>2018-01-24 15:09:16 +0000
commit9f5390d81d63ae4186554aced85094a4b08e1aff (patch)
tree7073d9694f859e63a63b13e320e793ef9c6c0ee4 /app/views
parentc28ffa1da3aaed0c189a1787a17ed2c944882f09 (diff)
parent38ef39550c18124f7a62568900ffff799abf5b97 (diff)
downloadgitlab-ce-9f5390d81d63ae4186554aced85094a4b08e1aff.tar.gz
Merge branch 'osw-updates-merge-status-on-api-actions' into 'master'
Return more consistent values for merge_status on V4 MR APIs Closes #20639 See merge request gitlab-org/gitlab-ce!16626
Diffstat (limited to 'app/views')
0 files changed, 0 insertions, 0 deletions