Commit 8d6d84eb authored by James Lopez's avatar James Lopez

Merge branch 'fj-include-gitlab-shell-in-has-repository' into 'master'

Include Gitlab::Shell in Snippets

See merge request gitlab-org/gitlab!28852
parents 46d32da8 b5fd1d08
...@@ -11,6 +11,7 @@ module HasRepository ...@@ -11,6 +11,7 @@ module HasRepository
extend ActiveSupport::Concern extend ActiveSupport::Concern
include AfterCommitQueue include AfterCommitQueue
include Referable include Referable
include Gitlab::ShellAdapter
include Gitlab::Utils::StrongMemoize include Gitlab::Utils::StrongMemoize
delegate :base_dir, :disk_path, to: :storage delegate :base_dir, :disk_path, to: :storage
......
...@@ -4,7 +4,6 @@ require 'carrierwave/orm/activerecord' ...@@ -4,7 +4,6 @@ require 'carrierwave/orm/activerecord'
class Project < ApplicationRecord class Project < ApplicationRecord
include Gitlab::ConfigHelper include Gitlab::ConfigHelper
include Gitlab::ShellAdapter
include Gitlab::VisibilityLevel include Gitlab::VisibilityLevel
include AccessRequestable include AccessRequestable
include Avatarable include Avatarable
......
...@@ -167,6 +167,7 @@ RSpec.shared_examples 'model with repository' do ...@@ -167,6 +167,7 @@ RSpec.shared_examples 'model with repository' do
describe 'Respond to' do describe 'Respond to' do
it { is_expected.to respond_to(:base_dir) } it { is_expected.to respond_to(:base_dir) }
it { is_expected.to respond_to(:disk_path) } it { is_expected.to respond_to(:disk_path) }
it { is_expected.to respond_to(:gitlab_shell) }
end end
describe '.pick_repository_storage' do describe '.pick_repository_storage' do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment