summaryrefslogtreecommitdiff
path: root/lib/api/commit_statuses.rb
diff options
context:
space:
mode:
authorSean McGivern <sean@gitlab.com>2017-02-28 11:01:04 +0000
committerSean McGivern <sean@gitlab.com>2017-02-28 11:54:02 +0000
commit90666937a0967c422ca4b6009a30bdcd8a9e41ab (patch)
treea71f52f88589ded69ab33c0b6c90ba06c2659382 /lib/api/commit_statuses.rb
parentcd92c84b5617970ee4b143687120668c6efa4a72 (diff)
downloadgitlab-ce-90666937a0967c422ca4b6009a30bdcd8a9e41ab.tar.gz
If any method called by `MergeService#execute` raises a `MergeError`, that error's message will be logged, the model will be updated, and the merge will fail.
Diffstat (limited to 'lib/api/commit_statuses.rb')
0 files changed, 0 insertions, 0 deletions