diff options
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/commit.rb | 2 | ||||
| -rw-r--r-- | app/models/key.rb | 4 | ||||
| -rw-r--r-- | app/models/merge_request.rb | 4 | ||||
| -rw-r--r-- | app/models/project/repository_trait.rb | 8 | ||||
| -rw-r--r-- | app/models/protected_branch.rb | 2 | ||||
| -rw-r--r-- | app/models/users_project.rb | 2 |
6 files changed, 11 insertions, 11 deletions
diff --git a/app/models/commit.rb b/app/models/commit.rb index ad6d7127e76..09635d0e21c 100644 --- a/app/models/commit.rb +++ b/app/models/commit.rb @@ -1,6 +1,6 @@ class Commit include ActiveModel::Conversion - include Gitlabhq::Encode + include Gitlab::Encode extend ActiveModel::Naming attr_accessor :commit diff --git a/app/models/key.rb b/app/models/key.rb index 1d7aae359f4..8fe8716cc63 100644 --- a/app/models/key.rb +++ b/app/models/key.rb @@ -38,14 +38,14 @@ class Key < ActiveRecord::Base end def update_repository - Gitlabhq::GitHost.system.new.configure do |c| + Gitlab::GitHost.system.new.configure do |c| c.update_keys(identifier, key) c.update_projects(projects) end end def repository_delete_key - Gitlabhq::GitHost.system.new.configure do |c| + Gitlab::GitHost.system.new.configure do |c| #delete key file is there is no identically deploy keys if !is_deploy_key || Key.where(:identifier => identifier).count() == 0 c.delete_key(identifier) diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index 248bbdacad4..ded12601417 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -82,7 +82,7 @@ class MergeRequest < ActiveRecord::Base end def check_if_can_be_merged - self.state = if GitlabMerge.new(self, self.author).can_be_merged? + self.state = if Gitlab::Merge.new(self, self.author).can_be_merged? CAN_BE_MERGED else CANNOT_BE_MERGED @@ -184,7 +184,7 @@ class MergeRequest < ActiveRecord::Base end def automerge!(current_user) - if GitlabMerge.new(self, current_user).merge + if Gitlab::Merge.new(self, current_user).merge self.merge!(current_user.id) true end diff --git a/app/models/project/repository_trait.rb b/app/models/project/repository_trait.rb index 8757d844217..a759ead569c 100644 --- a/app/models/project/repository_trait.rb +++ b/app/models/project/repository_trait.rb @@ -38,7 +38,7 @@ module Project::RepositoryTrait end def satellite - @satellite ||= Gitlabhq::Satellite.new(self) + @satellite ||= Gitlab::Satellite.new(self) end def write_hook(name, content) @@ -65,7 +65,7 @@ module Project::RepositoryTrait end def url_to_repo - Gitlabhq::GitHost.url_to_repo(path) + Gitlab::GitHost.url_to_repo(path) end def path_to_repo @@ -73,13 +73,13 @@ module Project::RepositoryTrait end def update_repository - Gitlabhq::GitHost.system.update_project(path, self) + Gitlab::GitHost.system.update_project(path, self) write_hooks if File.exists?(path_to_repo) end def destroy_repository - Gitlabhq::GitHost.system.destroy_project(self) + Gitlab::GitHost.system.destroy_project(self) end def repo_exists? diff --git a/app/models/protected_branch.rb b/app/models/protected_branch.rb index 36e65633f58..e24412b245f 100644 --- a/app/models/protected_branch.rb +++ b/app/models/protected_branch.rb @@ -7,7 +7,7 @@ class ProtectedBranch < ActiveRecord::Base after_destroy :update_repository def update_repository - Gitlabhq::GitHost.system.update_project(project.path, project) + Gitlab::GitHost.system.update_project(project.path, project) end def commit diff --git a/app/models/users_project.rb b/app/models/users_project.rb index b00ab96b6f2..808ed64ca4c 100644 --- a/app/models/users_project.rb +++ b/app/models/users_project.rb @@ -58,7 +58,7 @@ class UsersProject < ActiveRecord::Base end def update_repository - Gitlabhq::GitHost.system.new.configure do |c| + Gitlab::GitHost.system.new.configure do |c| c.update_project(project.path, project) end end |