deac/gitlabhq
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

replace Gitolited mixin with Gitlab::ShellAdapter

Browse source
This commit is contained in:
Dmitriy Zaporozhets 2013-03-21 21:01:14 +02:00
parent d6338a8482
commit 0103363191
9 changed files with 21 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/models/project.rb
View file

@ -23,7 +23,7 @@
require "grit" require "grit"
class Project < ActiveRecord::Base class Project < ActiveRecord::Base
include Gitolited include Gitlab::ShellAdapter
extend Enumerize extend Enumerize
class TransferError < StandardError; end class TransferError < StandardError; end

2
app/models/protected_branch.rb
View file

@ -10,7 +10,7 @@
# #
class ProtectedBranch < ActiveRecord::Base class ProtectedBranch < ActiveRecord::Base
include Gitolited include Gitlab::ShellAdapter
attr_accessible :name attr_accessible :name

2
app/models/users_project.rb
View file

@ -11,7 +11,7 @@
# #
class UsersProject < ActiveRecord::Base class UsersProject < ActiveRecord::Base
include Gitolited include Gitlab::ShellAdapter
GUEST = 10 GUEST = 10
REPORTER = 20 REPORTER = 20

2
app/observers/key_observer.rb
View file

@ -1,5 +1,5 @@
class KeyObserver < ActiveRecord::Observer class KeyObserver < ActiveRecord::Observer
include Gitolited include Gitlab::ShellAdapter
def after_save(key) def after_save(key)
GitlabShellWorker.perform_async( GitlabShellWorker.perform_async(

2
app/services/project_transfer_service.rb
View file

@ -3,7 +3,7 @@
# Used for transfer project to another namespace # Used for transfer project to another namespace
# #
class ProjectTransferService class ProjectTransferService
include Gitolited include Gitlab::ShellAdapter
attr_accessor :project attr_accessor :project

2
app/workers/gitlab_shell_worker.rb
View file

@ -1,6 +1,6 @@
class GitlabShellWorker class GitlabShellWorker
include Sidekiq::Worker include Sidekiq::Worker
include Gitolited include Gitlab::ShellAdapter
sidekiq_options queue: :gitlab_shell sidekiq_options queue: :gitlab_shell

3
config/initializers/5_backend.rb
View file

@ -3,3 +3,6 @@ require Rails.root.join("lib", "gitlab", "backend", "grack_auth")
# GIT over SSH # GIT over SSH
require Rails.root.join("lib", "gitlab", "backend", "shell") require Rails.root.join("lib", "gitlab", "backend", "shell")
# GitLab shell adapter
require Rails.root.join("lib", "gitlab", "backend", "shell_adapter")

12
lib/gitlab/backend/shell_adapter.rb Normal file
View file

@ -0,0 +1,12 @@
# == GitLab Shell mixin
#
# Provide a shortcut to Gitlab::Shell instance by gitlab_shell
#
module Gitlab
module ShellAdapter
def gitlab_shell
Gitlab::Shell.new
end
end
end

11
lib/gitolited.rb
View file

@ -1,11 +0,0 @@
# == Gitolited mixin
#
# Provide a shortcut to Gitlab::Shell instance by gitlab_shell
#
# Used by Project, UsersProject, etc
#
module Gitolited
def gitlab_shell
Gitlab::Shell.new
end
end