diff options
| author | DJ Mountney <david@twkie.net> | 2017-09-06 16:09:20 -0700 |
|---|---|---|
| committer | DJ Mountney <david@twkie.net> | 2017-09-06 16:09:20 -0700 |
| commit | b373c56c7b2898fc0cac16a26a41c7019ab7ca3e (patch) | |
| tree | 749c8661edb7cae36cae8f4eec548206b8a5ac5d /lib/github | |
| parent | ac38f36abe017dfe80a30c2e646a14c4c69c08b0 (diff) | |
| parent | 21935d85382989e38dd4cc12de55966e0c9b6eba (diff) | |
| download | gitlab-ce-b373c56c7b2898fc0cac16a26a41c7019ab7ca3e.tar.gz | |
Merge remote-tracking branch 'origin/master' into dev-master
Diffstat (limited to 'lib/github')
| -rw-r--r-- | lib/github/representation/branch.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/github/representation/branch.rb b/lib/github/representation/branch.rb index c6fa928d565..823e8e9a9c4 100644 --- a/lib/github/representation/branch.rb +++ b/lib/github/representation/branch.rb @@ -41,7 +41,7 @@ module Github def remove!(name) repository.delete_branch(name) - rescue Rugged::ReferenceError => e + rescue Gitlab::Git::Repository::DeleteBranchError => e Rails.logger.error("#{self.class.name}: Could not remove branch #{name}: #{e}") end |