Commit 01033631 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files

replace Gitolited mixin with Gitlab::ShellAdapter

parent d540493f1555
......@@ -23,7 +23,7 @@
require "grit"
class Project < ActiveRecord::Base
include Gitolited
include Gitlab::ShellAdapter
extend Enumerize
class TransferError < StandardError; end
......
......@@ -10,7 +10,7 @@
#
class ProtectedBranch < ActiveRecord::Base
include Gitolited
include Gitlab::ShellAdapter
attr_accessible :name
......
......@@ -11,7 +11,7 @@
#
class UsersProject < ActiveRecord::Base
include Gitolited
include Gitlab::ShellAdapter
GUEST = 10
REPORTER = 20
......
class KeyObserver < ActiveRecord::Observer
include Gitolited
include Gitlab::ShellAdapter
def after_save(key)
GitlabShellWorker.perform_async(
......
......@@ -3,7 +3,7 @@
# Used for transfer project to another namespace
#
class ProjectTransferService
include Gitolited
include Gitlab::ShellAdapter
attr_accessor :project
......
class GitlabShellWorker
include Sidekiq::Worker
include Gitolited
include Gitlab::ShellAdapter
sidekiq_options queue: :gitlab_shell
......
......@@ -3,3 +3,6 @@
# GIT over SSH
require Rails.root.join("lib", "gitlab", "backend", "shell")
# GitLab shell adapter
require Rails.root.join("lib", "gitlab", "backend", "shell_adapter")
# == Gitolited mixin
# == GitLab Shell mixin
#
# Provide a shortcut to Gitlab::Shell instance by gitlab_shell
#
# Used by Project, UsersProject, etc
#
module Gitolited
def gitlab_shell
Gitlab::Shell.new
module Gitlab
module ShellAdapter
def gitlab_shell
Gitlab::Shell.new
end
end
end
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