diff options
| author | Zeger-Jan van de Weg <zegerjan@gitlab.com> | 2018-05-18 11:01:06 +0300 |
|---|---|---|
| committer | Zeger-Jan van de Weg <zegerjan@gitlab.com> | 2018-05-18 11:01:06 +0300 |
| commit | 2d2695b2fb946c409a0f315bb2c2282085594a46 (patch) | |
| tree | fb39b98541b5dd720f226c7d9a48d0c50e6ddbac | |
| parent | 3d4aba8d0999541c16b4a90833bf613252e2ba43 (diff) | |
| parent | ddff3253463d2c6c15473fd8403da1461397aa85 (diff) | |
Merge branch 'zj-add-branch-mandatory' into 'master'
Unvendor Repository#add_branch
See merge request gitlab-org/gitaly!717
| -rw-r--r-- | changelogs/unreleased/zj-add-branch-mandatory.yml | 5 | ||||
| -rw-r--r-- | ruby/lib/gitlab/git/repository.rb | 10 |
2 files changed, 15 insertions, 0 deletions
diff --git a/changelogs/unreleased/zj-add-branch-mandatory.yml b/changelogs/unreleased/zj-add-branch-mandatory.yml new file mode 100644 index 000000000..045f14f54 --- /dev/null +++ b/changelogs/unreleased/zj-add-branch-mandatory.yml @@ -0,0 +1,5 @@ +--- +title: Unvendor Repository#add_branch +merge_request: 717 +author: +type: changed diff --git a/ruby/lib/gitlab/git/repository.rb b/ruby/lib/gitlab/git/repository.rb index 35a8b2acc..b61c03b97 100644 --- a/ruby/lib/gitlab/git/repository.rb +++ b/ruby/lib/gitlab/git/repository.rb @@ -67,6 +67,16 @@ module Gitlab @gitlab_projects = gitlab_projects end + def add_branch(branch_name, user:, target:) + target_object = Ref.dereference_object(lookup(target)) + raise InvalidRef.new("target not found: #{target}") unless target_object + + OperationService.new(user, self).add_branch(branch_name, target_object.oid) + find_branch(branch_name) + rescue Rugged::ReferenceError => ex + raise InvalidRef, ex + end + def circuit_breaker FakeCircuitBreaker end |