summaryrefslogtreecommitdiff
path: root/lib/gitlab/git.rb
diff options
context:
space:
mode:
authorBob Van Landuyt <bob@vanlanduyt.co>2018-07-31 16:38:03 +0200
committerBob Van Landuyt <bob@vanlanduyt.co>2018-08-13 11:58:54 +0200
commit7466df872cf4e933cd91e6aa95dbfa8bd3d33f31 (patch)
treed7cf52c6454f44d539c7f81b8c3d3ebbf39df238 /lib/gitlab/git.rb
parent456a4ddebc28f1ee5f9ed595bad0e2224b20848f (diff)
downloadgitlab-ce-7466df872cf4e933cd91e6aa95dbfa8bd3d33f31.tar.gz
Get the `merge-base` of 2 refs trough the API
This adds an endpoint to get the common ancestor of 2 refs from the API.
Diffstat (limited to 'lib/gitlab/git.rb')
-rw-r--r--lib/gitlab/git.rb8
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/gitlab/git.rb b/lib/gitlab/git.rb
index 55236a1122f..2913a3e416d 100644
--- a/lib/gitlab/git.rb
+++ b/lib/gitlab/git.rb
@@ -10,9 +10,11 @@ module Gitlab
TAG_REF_PREFIX = "refs/tags/".freeze
BRANCH_REF_PREFIX = "refs/heads/".freeze
- CommandError = Class.new(StandardError)
- CommitError = Class.new(StandardError)
- OSError = Class.new(StandardError)
+ BaseError = Class.new(StandardError)
+ CommandError = Class.new(BaseError)
+ CommitError = Class.new(BaseError)
+ OSError = Class.new(BaseError)
+ UnknownRef = Class.new(BaseError)
class << self
include Gitlab::EncodingHelper