lib/ refactoring. Module Gitlabhq renamed to Gitlab

randx
1 parent 8ceb9408
Showing 25 changed files with 326 additions and 324 deletions Show diff stats
app/controllers/application_controller.rb
app/controllers/projects_controller.rb
app/helpers/application_helper.rb
app/models/commit.rb
app/models/key.rb
app/models/merge_request.rb
app/models/project/repository_trait.rb
app/models/protected_branch.rb
app/models/users_project.rb
config/environment.rb
config/initializers/gitlabhq/20_grit_ext.rb
lib/gitlab/encode.rb
lib/gitlab/git_host.rb
lib/gitlab/gitolite.rb
lib/gitlab/logger.rb
lib/gitlab/merge.rb
lib/gitlab/satellite.rb
lib/gitlab_merge.rb
lib/gitlabhq/encode.rb
lib/gitlabhq/git_host.rb
@@ -5,7 +5,7 @@ class ApplicationController &lt; ActionController::Base
   protect_from_forgery
   helper_method :abilities, :can?
-  rescue_from Gitlabhq::Gitolite::AccessDenied do |exception|
+  rescue_from Gitlab::Gitolite::AccessDenied do |exception|
     render "errors/gitolite", :layout => "error"
   end
@@ -45,7 +45,7 @@ class ProjectsController &lt; ApplicationController
         format.js
       end
     end
-  rescue Gitlabhq::Gitolite::AccessDenied
+  rescue Gitlab::Gitolite::AccessDenied
     render :js => "location.href = '#{errors_githost_path}'" and return
   rescue StandardError => ex
     @project.errors.add(:base, "Cant save project. Please try again later")
@@ -143,6 +143,6 @@ module ApplicationHelper
   end
   def string_to_utf8 str
-    Gitlabhq::Encode.utf8 str
+    Gitlab::Encode.utf8 str
   end
 end
 class Commit
   include ActiveModel::Conversion
-  include Gitlabhq::Encode
+  include Gitlab::Encode
   extend ActiveModel::Naming
   attr_accessor :commit
@@ -38,14 +38,14 @@ class Key &lt; 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)
@@ -82,7 +82,7 @@ class MergeRequest &lt; 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 &lt; 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
@@ -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?
@@ -7,7 +7,7 @@ class ProtectedBranch &lt; 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
@@ -58,7 +58,7 @@ class UsersProject &lt; 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
@@ -4,4 +4,4 @@ require File.expand_path(&#39;../application&#39;, __FILE__)
 # Initialize the rails application
 Gitlab::Application.initialize!
-require File.join(Rails.root, "lib", "gitlabhq", "git_host")
+require File.join(Rails.root, "lib", "gitlab", "git_host")
@@ -15,11 +15,11 @@ end
 Grit::Diff.class_eval do
   def old_path
-    Gitlabhq::Encode.utf8 a_path
+    Gitlab::Encode.utf8 a_path
   end
   def new_path
-    Gitlabhq::Encode.utf8 b_path
+    Gitlab::Encode.utf8 b_path
   end
 end
@@ -0,0 +1,20 @@
+module Gitlab
+  module Encode 
+    extend self
+
+    def utf8 message
+      return nil unless message
+
+      hash = CharlockHolmes::EncodingDetector.detect(message) rescue {}
+      if hash[:encoding]
+        CharlockHolmes::Converter.convert(message, hash[:encoding], 'UTF-8')
+      else
+        message
+      end.force_encoding("utf-8")
+    # Prevent app from crash cause of 
+    # encoding errors
+    rescue
+      ""
+    end
+  end
+end
@@ -0,0 +1,21 @@
+require File.join(Rails.root, "lib", "gitlab", "gitolite")
+
+module Gitlab
+  class GitHost
+    def self.system
+      Gitlab::Gitolite
+    end
+
+    def self.admin_uri
+      GIT_HOST["admin_uri"]
+    end
+
+    def self.url_to_repo(path)
+      if !GIT_HOST["port"] or GIT_HOST["port"] == 22
+        "#{GIT_HOST["git_user"]}@#{GIT_HOST["host"]}:#{path}.git"
+      else
+        "ssh://#{GIT_HOST["git_user"]}@#{GIT_HOST["host"]}:#{GIT_HOST["port"]}/#{path}.git"
+      end
+    end
+  end
+end
@@ -0,0 +1,157 @@
+require 'gitolite'
+require 'timeout'
+require 'fileutils'
+
+module Gitlab
+  class Gitolite
+    class AccessDenied < StandardError; end
+
+    def self.update_project(path, project)
+      self.new.configure { |git| git.update_project(path, project) }
+    end
+
+    def self.destroy_project(project)
+      self.new.configure { |git| git.destroy_project(project) }
+    end
+
+    def pull
+      # create tmp dir
+      @local_dir = File.join(Dir.tmpdir,"gitlabhq-gitolite-#{Time.now.to_i}")
+      Dir.mkdir @local_dir
+
+      `git clone #{GitHost.admin_uri} #{@local_dir}/gitolite`
+    end
+
+    def push
+      Dir.chdir(File.join(@local_dir, "gitolite"))
+      `git add -A`
+      `git commit -am "Gitlab"`
+      `git push`
+      Dir.chdir(Rails.root)
+
+      FileUtils.rm_rf(@local_dir)
+    end
+
+    def configure
+      status = Timeout::timeout(20) do
+        File.open(File.join(Dir.tmpdir,"gitlabhq-gitolite.lock"), "w+") do |f|
+          begin 
+            f.flock(File::LOCK_EX)
+            pull
+            yield(self)
+            push
+          ensure
+            f.flock(File::LOCK_UN)
+          end
+        end
+      end
+    rescue Exception => ex
+      Gitlab::Logger.error(ex.message)
+      raise Gitolite::AccessDenied.new("gitolite timeout")
+    end
+
+    def destroy_project(project)
+      FileUtils.rm_rf(project.path_to_repo)
+
+      ga_repo = ::Gitolite::GitoliteAdmin.new(File.join(@local_dir,'gitolite'))
+      conf = ga_repo.config
+      conf.rm_repo(project.path)
+      ga_repo.save
+    end
+
+    #update or create
+    def update_keys(user, key)
+      File.open(File.join(@local_dir, 'gitolite/keydir',"#{user}.pub"), 'w') {|f| f.write(key.gsub(/\n/,'')) }
+    end
+
+    def delete_key(user)
+      File.unlink(File.join(@local_dir, 'gitolite/keydir',"#{user}.pub"))
+      `cd #{File.join(@local_dir,'gitolite')} ; git rm keydir/#{user}.pub`
+    end
+
+    # update or create
+    def update_project(repo_name, project)
+      ga_repo = ::Gitolite::GitoliteAdmin.new(File.join(@local_dir,'gitolite'))
+      conf = ga_repo.config
+      repo = update_project_config(project, conf)
+      conf.add_repo(repo, true)
+      
+      ga_repo.save
+    end
+
+    # Updates many projects and uses project.path as the repo path
+    # An order of magnitude faster than update_project
+    def update_projects(projects)
+      ga_repo = ::Gitolite::GitoliteAdmin.new(File.join(@local_dir,'gitolite'))
+      conf = ga_repo.config
+
+      projects.each do |project|
+        repo = update_project_config(project, conf)
+        conf.add_repo(repo, true)
+      end
+
+      ga_repo.save
+    end
+
+    def update_project_config(project, conf)
+      repo_name = project.path
+
+      repo = if conf.has_repo?(repo_name)
+               conf.get_repo(repo_name)
+             else 
+               ::Gitolite::Config::Repo.new(repo_name)
+             end
+
+      name_readers = project.repository_readers
+      name_writers = project.repository_writers
+      name_masters = project.repository_masters
+
+      pr_br = project.protected_branches.map(&:name).join(" ")
+
+      repo.clean_permissions
+
+      # Deny access to protected branches for writers
+      unless name_writers.blank? || pr_br.blank?
+        repo.add_permission("-", pr_br, name_writers)
+      end
+
+      # Add read permissions
+      repo.add_permission("R", "", name_readers) unless name_readers.blank?
+
+      # Add write permissions
+      repo.add_permission("RW+", "", name_writers) unless name_writers.blank?
+      repo.add_permission("RW+", "", name_masters) unless name_masters.blank?
+
+      repo
+    end
+
+    def admin_all_repo
+      ga_repo = ::Gitolite::GitoliteAdmin.new(File.join(@local_dir,'gitolite'))
+      conf = ga_repo.config
+      owner_name = ""
+
+      # Read gitolite-admin user
+      #
+      begin 
+        repo = conf.get_repo("gitolite-admin")
+        owner_name = repo.permissions[0]["RW+"][""][0]
+        raise StandardError if owner_name.blank?
+      rescue => ex
+        puts "Cant determine gitolite-admin owner".red
+        raise StandardError
+      end
+
+      # @ALL repos premission for gitolite owner
+      repo_name = "@all"
+      repo = if conf.has_repo?(repo_name)
+               conf.get_repo(repo_name)
+             else 
+               ::Gitolite::Config::Repo.new(repo_name)
+             end
+
+      repo.add_permission("RW+", "", owner_name)
+      conf.add_repo(repo, true)
+      ga_repo.save
+    end
+  end
+end
@@ -0,0 +1,8 @@
+module Gitlab
+  class Logger
+    def self.error(message)
+      @@logger ||= ::Logger.new(File.join(Rails.root, "log/githost.log"))
+      @@logger.error(message)
+    end
+  end
+end
@@ -0,0 +1,60 @@
+module Gitlab
+  class Merge
+    attr_accessor :project, :merge_request, :user
+
+    def initialize(merge_request, user)
+      self.user = user
+      self.merge_request = merge_request
+      self.project = merge_request.project
+    end
+
+    def can_be_merged?
+      result = false
+      process do |repo, output|
+        result = !(output =~ /CONFLICT/)
+      end
+      result
+    end
+
+    def merge
+      process do |repo, output|
+        if output =~ /CONFLICT/
+          false  
+        else 
+          repo.git.push({}, "origin", merge_request.target_branch)
+          true
+        end
+      end
+    end
+
+    def process
+      Grit::Git.with_timeout(30.seconds) do
+        lock_file = File.join(Rails.root, "tmp", "merge_repo_#{project.path}.lock")
+
+        File.open(lock_file, "w+") do |f|
+          f.flock(File::LOCK_EX)
+
+          unless project.satellite.exists?
+            raise "You should run: rake gitlab:app:enable_automerge"
+          end
+
+          project.satellite.clear
+
+          Dir.chdir(project.satellite.path) do
+            merge_repo = Grit::Repo.new('.')
+            merge_repo.git.sh "git reset --hard"
+            merge_repo.git.sh "git fetch origin"
+            merge_repo.git.sh "git config user.name \"#{user.name}\""
+            merge_repo.git.sh "git config user.email \"#{user.email}\""
+            merge_repo.git.sh "git checkout -b #{merge_request.target_branch} origin/#{merge_request.target_branch}"
+            output = merge_repo.git.pull({}, "--no-ff", "origin", merge_request.source_branch)
+            yield(merge_repo, output)
+          end
+        end
+      end
+
+    rescue Grit::Git::GitTimeout
+      return false
+    end
+  end
+end
@@ -0,0 +1,41 @@
+module Gitlab
+  class Satellite
+    
+    PARKING_BRANCH = "__parking_branch"
+
+    attr_accessor :project
+
+    def initialize project
+      self.project = project
+    end
+
+    def create
+      `git clone #{project.url_to_repo} #{path}`
+    end
+
+    def path
+      File.join(Rails.root, "tmp", "repo_satellites", project.path)
+    end
+
+    def exists?
+      File.exists? path
+    end
+
+    #will be deleted all branches except PARKING_BRANCH
+    def clear
+      Dir.chdir(path) do
+        heads = Grit::Repo.new(".").heads.map{|head| head.name}
+        if heads.include? PARKING_BRANCH
+          `git checkout #{PARKING_BRANCH}`
+        else
+          `git checkout -b #{PARKING_BRANCH}`
+        end
+        heads.delete(PARKING_BRANCH)
+        heads.each do |head|
+          `git branch -D #{head}`
+        end
+      end
+    end
+    
+  end
+end
@@ -1,58 +0,0 @@
-class GitlabMerge
-  attr_accessor :project, :merge_request, :user
-
-  def initialize(merge_request, user)
-    self.user = user
-    self.merge_request = merge_request
-    self.project = merge_request.project
-  end
-
-  def can_be_merged?
-    result = false
-    process do |repo, output|
-      result = !(output =~ /CONFLICT/)
-    end
-    result
-  end
-
-  def merge
-    process do |repo, output|
-      if output =~ /CONFLICT/
-        false  
-      else 
-        repo.git.push({}, "origin", merge_request.target_branch)
-        true
-      end
-    end
-  end
-
-  def process
-    Grit::Git.with_timeout(30.seconds) do
-      lock_file = File.join(Rails.root, "tmp", "merge_repo_#{project.path}.lock")
-
-      File.open(lock_file, "w+") do |f|
-        f.flock(File::LOCK_EX)
-        
-        unless project.satellite.exists?
-          raise "You should run: rake gitlab:app:enable_automerge"
-        end
-
-        project.satellite.clear
-
-        Dir.chdir(project.satellite.path) do
-          merge_repo = Grit::Repo.new('.')
-          merge_repo.git.sh "git reset --hard"
-          merge_repo.git.sh "git fetch origin"
-          merge_repo.git.sh "git config user.name \"#{user.name}\""
-          merge_repo.git.sh "git config user.email \"#{user.email}\""
-          merge_repo.git.sh "git checkout -b #{merge_request.target_branch} origin/#{merge_request.target_branch}"
-          output = merge_repo.git.pull({}, "--no-ff", "origin", merge_request.source_branch)
-          yield(merge_repo, output)
-        end
-      end
-    end
-
-  rescue Grit::Git::GitTimeout
-    return false
-  end
-end
@@ -1,20 +0,0 @@
-module Gitlabhq
-  module Encode 
-    extend self
-
-    def utf8 message
-      return nil unless message
-
-      hash = CharlockHolmes::EncodingDetector.detect(message) rescue {}
-      if hash[:encoding]
-        CharlockHolmes::Converter.convert(message, hash[:encoding], 'UTF-8')
-      else
-        message
-      end.force_encoding("utf-8")
-    # Prevent app from crash cause of 
-    # encoding errors
-    rescue
-      ""
-    end
-  end
-end
@@ -1,21 +0,0 @@
-require File.join(Rails.root, "lib", "gitlabhq", "gitolite")
-
-module Gitlabhq
-  class GitHost
-    def self.system
-      Gitlabhq::Gitolite
-    end
-
-    def self.admin_uri
-      GIT_HOST["admin_uri"]
-    end
-
-    def self.url_to_repo(path)
-      if !GIT_HOST["port"] or GIT_HOST["port"] == 22
-        "#{GIT_HOST["git_user"]}@#{GIT_HOST["host"]}:#{path}.git"
-      else
-        "ssh://#{GIT_HOST["git_user"]}@#{GIT_HOST["host"]}:#{GIT_HOST["port"]}/#{path}.git"
-      end
-    end
-  end
-end
@@ -1,157 +0,0 @@
-require 'gitolite'
-require 'timeout'
-require 'fileutils'
-
-module Gitlabhq
-  class Gitolite
-    class AccessDenied < StandardError; end
-
-    def self.update_project(path, project)
-      self.new.configure { |git| git.update_project(path, project) }
-    end
-
-    def self.destroy_project(project)
-      self.new.configure { |git| git.destroy_project(project) }
-    end
-
-    def pull
-      # create tmp dir
-      @local_dir = File.join(Dir.tmpdir,"gitlabhq-gitolite-#{Time.now.to_i}")
-      Dir.mkdir @local_dir
-
-      `git clone #{GitHost.admin_uri} #{@local_dir}/gitolite`
-    end
-
-    def push
-      Dir.chdir(File.join(@local_dir, "gitolite"))
-      `git add -A`
-      `git commit -am "Gitlab"`
-      `git push`
-      Dir.chdir(Rails.root)
-
-      FileUtils.rm_rf(@local_dir)
-    end
-
-    def configure
-      status = Timeout::timeout(20) do
-        File.open(File.join(Dir.tmpdir,"gitlabhq-gitolite.lock"), "w+") do |f|
-          begin 
-            f.flock(File::LOCK_EX)
-            pull
-            yield(self)
-            push
-          ensure
-            f.flock(File::LOCK_UN)
-          end
-        end
-      end
-    rescue Exception => ex
-      Gitlabhq::Logger.error(ex.message)
-      raise Gitolite::AccessDenied.new("gitolite timeout")
-    end
-
-    def destroy_project(project)
-      FileUtils.rm_rf(project.path_to_repo)
-
-      ga_repo = ::Gitolite::GitoliteAdmin.new(File.join(@local_dir,'gitolite'))
-      conf = ga_repo.config
-      conf.rm_repo(project.path)
-      ga_repo.save
-    end
-
-    #update or create
-    def update_keys(user, key)
-      File.open(File.join(@local_dir, 'gitolite/keydir',"#{user}.pub"), 'w') {|f| f.write(key.gsub(/\n/,'')) }
-    end
-
-    def delete_key(user)
-      File.unlink(File.join(@local_dir, 'gitolite/keydir',"#{user}.pub"))
-      `cd #{File.join(@local_dir,'gitolite')} ; git rm keydir/#{user}.pub`
-    end
-
-    # update or create
-    def update_project(repo_name, project)
-      ga_repo = ::Gitolite::GitoliteAdmin.new(File.join(@local_dir,'gitolite'))
-      conf = ga_repo.config
-      repo = update_project_config(project, conf)
-      conf.add_repo(repo, true)
-      
-      ga_repo.save
-    end
-
-    # Updates many projects and uses project.path as the repo path
-    # An order of magnitude faster than update_project
-    def update_projects(projects)
-      ga_repo = ::Gitolite::GitoliteAdmin.new(File.join(@local_dir,'gitolite'))
-      conf = ga_repo.config
-
-      projects.each do |project|
-        repo = update_project_config(project, conf)
-        conf.add_repo(repo, true)
-      end
-
-      ga_repo.save
-    end
-
-    def update_project_config(project, conf)
-      repo_name = project.path
-
-      repo = if conf.has_repo?(repo_name)
-               conf.get_repo(repo_name)
-             else 
-               ::Gitolite::Config::Repo.new(repo_name)
-             end
-
-      name_readers = project.repository_readers
-      name_writers = project.repository_writers
-      name_masters = project.repository_masters
-
-      pr_br = project.protected_branches.map(&:name).join(" ")
-
-      repo.clean_permissions
-
-      # Deny access to protected branches for writers
-      unless name_writers.blank? || pr_br.blank?
-        repo.add_permission("-", pr_br, name_writers)
-      end
-
-      # Add read permissions
-      repo.add_permission("R", "", name_readers) unless name_readers.blank?
-
-      # Add write permissions
-      repo.add_permission("RW+", "", name_writers) unless name_writers.blank?
-      repo.add_permission("RW+", "", name_masters) unless name_masters.blank?
-
-      repo
-    end
-
-    def admin_all_repo
-      ga_repo = ::Gitolite::GitoliteAdmin.new(File.join(@local_dir,'gitolite'))
-      conf = ga_repo.config
-      owner_name = ""
-
-      # Read gitolite-admin user
-      #
-      begin 
-        repo = conf.get_repo("gitolite-admin")
-        owner_name = repo.permissions[0]["RW+"][""][0]
-        raise StandardError if owner_name.blank?
-      rescue => ex
-        puts "Cant determine gitolite-admin owner".red
-        raise StandardError
-      end
-
-      # @ALL repos premission for gitolite owner
-      repo_name = "@all"
-      repo = if conf.has_repo?(repo_name)
-               conf.get_repo(repo_name)
-             else 
-               ::Gitolite::Config::Repo.new(repo_name)
-             end
-
-      repo.add_permission("RW+", "", owner_name)
-      conf.add_repo(repo, true)
-      ga_repo.save
-    end
-  end
-end
@@ -1,8 +0,0 @@
-module Gitlabhq
-  class Logger
-    def self.error(message)
-      @@logger ||= ::Logger.new(File.join(Rails.root, "log/githost.log"))
-      @@logger.error(message)
-    end
-  end
-end
@@ -1,41 +0,0 @@
-module Gitlabhq
-  class Satellite
-    
-    PARKING_BRANCH = "__parking_branch"
-
-    attr_accessor :project
-
-    def initialize project
-      self.project = project
-    end
-
-    def create
-      `git clone #{project.url_to_repo} #{path}`
-    end
-
-    def path
-      File.join(Rails.root, "tmp", "repo_satellites", project.path)
-    end
-
-    def exists?
-      File.exists? path
-    end
-
-    #will be deleted all branches except PARKING_BRANCH
-    def clear
-      Dir.chdir(path) do
-        heads = Grit::Repo.new(".").heads.map{|head| head.name}
-        if heads.include? PARKING_BRANCH
-          `git checkout #{PARKING_BRANCH}`
-        else
-          `git checkout -b #{PARKING_BRANCH}`
-        end
-        heads.delete(PARKING_BRANCH)
-        heads.each do |head|
-          `git branch -D #{head}`
-        end
-      end
-    end
-    
-  end
-end
@@ -2,7 +2,7 @@ namespace :gitlab do
   namespace :app do
     desc "GITLAB | Enable auto merge"
     task :enable_automerge => :environment  do
-      Gitlabhq::GitHost.system.new.configure do |git|
+      Gitlab::GitHost.system.new.configure do |git|
         git.admin_all_repo
       end
@@ -43,7 +43,7 @@ describe ProtectedBranch do
     subject { ProtectedBranch.new(:project => project) }
     it "updates the branch's project repo permissions" do
-      Gitlabhq::GitHost.should_receive(:system).and_return(gitolite)
+      Gitlab::GitHost.should_receive(:system).and_return(gitolite)
       gitolite.should_receive(:update_project).with(project.path, project)
       subject.update_repository
	@@ -5,7 +5,7 @@ class ApplicationController < ActionController::Base		@@ -5,7 +5,7 @@ class ApplicationController < ActionController::Base
5	protect_from_forgery	5	protect_from_forgery
6	helper_method :abilities, :can?	6	helper_method :abilities, :can?
7		7
8	- rescue_from Gitlabhq::Gitolite::AccessDenied do \|exception\|	8	+ rescue_from Gitlab::Gitolite::AccessDenied do \|exception\|
9	render "errors/gitolite", :layout => "error"	9	render "errors/gitolite", :layout => "error"
10	end	10	end
11		11
	@@ -45,7 +45,7 @@ class ProjectsController < ApplicationController		@@ -45,7 +45,7 @@ class ProjectsController < ApplicationController
45	format.js	45	format.js
46	end	46	end
47	end	47	end
48	- rescue Gitlabhq::Gitolite::AccessDenied	48	+ rescue Gitlab::Gitolite::AccessDenied
49	render :js => "location.href = '#{errors_githost_path}'" and return	49	render :js => "location.href = '#{errors_githost_path}'" and return
50	rescue StandardError => ex	50	rescue StandardError => ex
51	@project.errors.add(:base, "Cant save project. Please try again later")	51	@project.errors.add(:base, "Cant save project. Please try again later")
	@@ -143,6 +143,6 @@ module ApplicationHelper		@@ -143,6 +143,6 @@ module ApplicationHelper
143	end	143	end
144		144
145	def string_to_utf8 str	145	def string_to_utf8 str
146	- Gitlabhq::Encode.utf8 str	146	+ Gitlab::Encode.utf8 str
147	end	147	end
148	end	148	end
1	class Commit	1	class Commit
2	include ActiveModel::Conversion	2	include ActiveModel::Conversion
3	- include Gitlabhq::Encode	3	+ include Gitlab::Encode
4	extend ActiveModel::Naming	4	extend ActiveModel::Naming
5		5
6	attr_accessor :commit	6	attr_accessor :commit
	@@ -38,14 +38,14 @@ class Key < ActiveRecord::Base		@@ -38,14 +38,14 @@ class Key < ActiveRecord::Base
38	end	38	end
39		39
40	def update_repository	40	def update_repository
41	- Gitlabhq::GitHost.system.new.configure do \|c\|	41	+ Gitlab::GitHost.system.new.configure do \|c\|
42	c.update_keys(identifier, key)	42	c.update_keys(identifier, key)
43	c.update_projects(projects)	43	c.update_projects(projects)
44	end	44	end
45	end	45	end
46		46
47	def repository_delete_key	47	def repository_delete_key
48	- Gitlabhq::GitHost.system.new.configure do \|c\|	48	+ Gitlab::GitHost.system.new.configure do \|c\|
49	#delete key file is there is no identically deploy keys	49	#delete key file is there is no identically deploy keys
50	if !is_deploy_key \|\| Key.where(:identifier => identifier).count() == 0	50	if !is_deploy_key \|\| Key.where(:identifier => identifier).count() == 0
51	c.delete_key(identifier)	51	c.delete_key(identifier)
	@@ -82,7 +82,7 @@ class MergeRequest < ActiveRecord::Base		@@ -82,7 +82,7 @@ class MergeRequest < ActiveRecord::Base
82	end	82	end
83		83
84	def check_if_can_be_merged	84	def check_if_can_be_merged
85	- self.state = if GitlabMerge.new(self, self.author).can_be_merged?	85	+ self.state = if Gitlab::Merge.new(self, self.author).can_be_merged?
86	CAN_BE_MERGED	86	CAN_BE_MERGED
87	else	87	else
88	CANNOT_BE_MERGED	88	CANNOT_BE_MERGED
	@@ -184,7 +184,7 @@ class MergeRequest < ActiveRecord::Base		@@ -184,7 +184,7 @@ class MergeRequest < ActiveRecord::Base
184	end	184	end
185		185
186	def automerge!(current_user)	186	def automerge!(current_user)
187	- if GitlabMerge.new(self, current_user).merge	187	+ if Gitlab::Merge.new(self, current_user).merge
188	self.merge!(current_user.id)	188	self.merge!(current_user.id)
189	true	189	true
190	end	190	end
	@@ -38,7 +38,7 @@ module Project::RepositoryTrait		@@ -38,7 +38,7 @@ module Project::RepositoryTrait
38	end	38	end
39		39
40	def satellite	40	def satellite
41	- @satellite \|\|= Gitlabhq::Satellite.new(self)	41	+ @satellite \|\|= Gitlab::Satellite.new(self)
42	end	42	end
43		43
44	def write_hook(name, content)	44	def write_hook(name, content)
	@@ -65,7 +65,7 @@ module Project::RepositoryTrait		@@ -65,7 +65,7 @@ module Project::RepositoryTrait
65	end	65	end
66		66
67	def url_to_repo	67	def url_to_repo
68	- Gitlabhq::GitHost.url_to_repo(path)	68	+ Gitlab::GitHost.url_to_repo(path)
69	end	69	end
70		70
71	def path_to_repo	71	def path_to_repo
	@@ -73,13 +73,13 @@ module Project::RepositoryTrait		@@ -73,13 +73,13 @@ module Project::RepositoryTrait
73	end	73	end
74		74
75	def update_repository	75	def update_repository
76	- Gitlabhq::GitHost.system.update_project(path, self)	76	+ Gitlab::GitHost.system.update_project(path, self)
77		77
78	write_hooks if File.exists?(path_to_repo)	78	write_hooks if File.exists?(path_to_repo)
79	end	79	end
80		80
81	def destroy_repository	81	def destroy_repository
82	- Gitlabhq::GitHost.system.destroy_project(self)	82	+ Gitlab::GitHost.system.destroy_project(self)
83	end	83	end
84		84
85	def repo_exists?	85	def repo_exists?
	@@ -7,7 +7,7 @@ class ProtectedBranch < ActiveRecord::Base		@@ -7,7 +7,7 @@ class ProtectedBranch < ActiveRecord::Base
7	after_destroy :update_repository	7	after_destroy :update_repository
8		8
9	def update_repository	9	def update_repository
10	- Gitlabhq::GitHost.system.update_project(project.path, project)	10	+ Gitlab::GitHost.system.update_project(project.path, project)
11	end	11	end
12		12
13	def commit	13	def commit
	@@ -58,7 +58,7 @@ class UsersProject < ActiveRecord::Base		@@ -58,7 +58,7 @@ class UsersProject < ActiveRecord::Base
58	end	58	end
59		59
60	def update_repository	60	def update_repository
61	- Gitlabhq::GitHost.system.new.configure do \|c\|	61	+ Gitlab::GitHost.system.new.configure do \|c\|
62	c.update_project(project.path, project)	62	c.update_project(project.path, project)
63	end	63	end
64	end	64	end
	@@ -4,4 +4,4 @@ require File.expand_path('../application', __FILE__)		@@ -4,4 +4,4 @@ require File.expand_path('../application', __FILE__)
4	# Initialize the rails application	4	# Initialize the rails application
5	Gitlab::Application.initialize!	5	Gitlab::Application.initialize!
6		6
7	-require File.join(Rails.root, "lib", "gitlabhq", "git_host")	7	+require File.join(Rails.root, "lib", "gitlab", "git_host")