diff options
| author | Ash McKenzie <amckenzie@gitlab.com> | 2018-07-25 15:06:06 +1000 |
|---|---|---|
| committer | Ash McKenzie <amckenzie@gitlab.com> | 2018-07-25 15:06:06 +1000 |
| commit | 8515b885ca1dd35e2c2a9e5bc5b1eb10831d7605 (patch) | |
| tree | 6a24d2d6e47808b091c750499198cb13f0e49491 | |
| parent | bfe400969eadb5ba602b47a23417f0d0058a2bd0 (diff) | |
| download | gitlab-shell-ash.mckenzie/git-push-ssh-proxy-refactor.tar.gz | |
GitAccessStatus no longer neededash.mckenzie/git-push-ssh-proxy-refactor
| -rw-r--r-- | lib/git_access_status.rb | 28 | ||||
| -rw-r--r-- | lib/gitlab_access.rb | 1 | ||||
| -rw-r--r-- | spec/gitlab_net_spec.rb | 1 | ||||
| -rw-r--r-- | spec/gitlab_shell_spec.rb | 3 |
4 files changed, 1 insertions, 32 deletions
diff --git a/lib/git_access_status.rb b/lib/git_access_status.rb deleted file mode 100644 index 783bc0c..0000000 --- a/lib/git_access_status.rb +++ /dev/null @@ -1,28 +0,0 @@ -require 'json' - -class GitAccessStatus - attr_reader :message, :gl_repository, :gl_username, :repository_path, :gitaly - - def initialize(status, message, gl_repository:, gl_username:, repository_path:, gitaly:) - @status = status - @message = message - @gl_repository = gl_repository - @gl_username = gl_username - @repository_path = repository_path - @gitaly = gitaly - end - - def self.create_from_json(json) - values = JSON.parse(json) - new(values["status"], - values["message"], - gl_repository: values["gl_repository"], - gl_username: values["gl_username"], - repository_path: values["repository_path"], - gitaly: values["gitaly"]) - end - - def allowed? - @status - end -end diff --git a/lib/gitlab_access.rb b/lib/gitlab_access.rb index 5ed6718..fd4dca0 100644 --- a/lib/gitlab_access.rb +++ b/lib/gitlab_access.rb @@ -1,6 +1,5 @@ require_relative 'gitlab_init' require_relative 'gitlab_net' -require_relative 'git_access_status' require_relative 'names_helper' require_relative 'gitlab_metrics' require_relative 'object_dirs_helper' diff --git a/spec/gitlab_net_spec.rb b/spec/gitlab_net_spec.rb index 3ad1d39..12a8044 100644 --- a/spec/gitlab_net_spec.rb +++ b/spec/gitlab_net_spec.rb @@ -1,6 +1,5 @@ require_relative 'spec_helper' require_relative '../lib/gitlab_net' -require_relative '../lib/git_access_status' describe GitlabNet, vcr: true do let(:gitlab_net) { described_class.new } diff --git a/spec/gitlab_shell_spec.rb b/spec/gitlab_shell_spec.rb index c034cc7..e02e452 100644 --- a/spec/gitlab_shell_spec.rb +++ b/spec/gitlab_shell_spec.rb @@ -1,7 +1,6 @@ require_relative 'spec_helper' require_relative '../lib/gitlab_shell' -require_relative '../lib/git_access_status' -require_relative '../lib/custom_action_status' +require_relative '../lib/action' describe GitlabShell do before do |