Permalink
Browse files

replace Gitolited mixin with Gitlab::ShellAdapter

  • Loading branch information...
1 parent d6338a8 commit 0103363191d63d9a81bfeba61abf443532f47183 @dzaporozhets dzaporozhets committed Mar 21, 2013
View
@@ -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
@@ -1,5 +1,5 @@
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
@@ -1,6 +1,6 @@
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")
@@ -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
+
View
@@ -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

0 comments on commit 0103363

Please sign in to comment.