diff options
| author | Ash McKenzie <amckenzie@gitlab.com> | 2018-07-26 18:19:43 +1000 |
|---|---|---|
| committer | Ash McKenzie <amckenzie@gitlab.com> | 2018-08-01 00:24:16 +1000 |
| commit | 7a2c47f2e1ba2baacfe0ad228898aa341055a141 (patch) | |
| tree | f9967544ae331450d4cdde116ddd36dcfb4d1d1c /lib | |
| parent | aa4d2ba8c109948a13f58787a269205be1abd11d (diff) | |
| download | gitlab-shell-7a2c47f2e1ba2baacfe0ad228898aa341055a141.tar.gz | |
Move common exceptions into errors.rb
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/errors.rb | 4 | ||||
| -rw-r--r-- | lib/gitlab_access.rb | 5 | ||||
| -rw-r--r-- | lib/gitlab_shell.rb | 3 |
3 files changed, 7 insertions, 5 deletions
diff --git a/lib/errors.rb b/lib/errors.rb new file mode 100644 index 0000000..7bef3b4 --- /dev/null +++ b/lib/errors.rb @@ -0,0 +1,4 @@ +class UnknownError < StandardError; end +class AccessDeniedError < StandardError; end +class InvalidRepositoryPathError < StandardError; end +class DisallowedCommandError < StandardError; end diff --git a/lib/gitlab_access.rb b/lib/gitlab_access.rb index e1a5e35..37f79d4 100644 --- a/lib/gitlab_access.rb +++ b/lib/gitlab_access.rb @@ -1,3 +1,6 @@ +require 'json' + +require_relative 'errors' require_relative 'gitlab_init' require_relative 'gitlab_net' require_relative 'gitlab_access_status' @@ -7,8 +10,6 @@ require_relative 'object_dirs_helper' require 'json' class GitlabAccess - class AccessDeniedError < StandardError; end - include NamesHelper attr_reader :config, :gl_repository, :repo_path, :changes, :protocol diff --git a/lib/gitlab_shell.rb b/lib/gitlab_shell.rb index 6c5f097..6077c02 100644 --- a/lib/gitlab_shell.rb +++ b/lib/gitlab_shell.rb @@ -5,9 +5,6 @@ require_relative 'gitlab_net' require_relative 'gitlab_metrics' class GitlabShell # rubocop:disable Metrics/ClassLength - class AccessDeniedError < StandardError; end - class DisallowedCommandError < StandardError; end - class InvalidRepositoryPathError < StandardError; end GIT_COMMANDS = %w(git-upload-pack git-receive-pack git-upload-archive git-lfs-authenticate).freeze GITALY_MIGRATED_COMMANDS = { |