summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-11-08 09:22:50 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-11-08 09:22:50 +0200
commit02484930e161f773a205bb1c1d29a8664755fd60 (patch)
tree295016eb6fbc00e7c373a194353a58a384df2b8d /app
parentc28786ecbeb7ba2e630896b37481b918af4ed39e (diff)
downloadgitlab-ce-02484930e161f773a205bb1c1d29a8664755fd60.tar.gz
Removed Project#discover_default_branch since it not needed any more
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app')
-rw-r--r--app/contexts/projects/create_context.rb2
-rw-r--r--app/controllers/projects_controller.rb4
-rw-r--r--app/models/project.rb8
-rw-r--r--app/services/git_push_service.rb1
-rw-r--r--app/workers/repository_import_worker.rb1
5 files changed, 0 insertions, 16 deletions
diff --git a/app/contexts/projects/create_context.rb b/app/contexts/projects/create_context.rb
index 1c60a5de141..904c60a0f23 100644
--- a/app/contexts/projects/create_context.rb
+++ b/app/contexts/projects/create_context.rb
@@ -47,8 +47,6 @@ module Projects
@project.creator = current_user
if @project.save
- @project.discover_default_branch
-
unless @project.group
@project.users_projects.create(
project_access: UsersProject::MASTER,
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 7264128691e..66d6edd810c 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -62,10 +62,6 @@ class ProjectsController < ApplicationController
@events = event_filter.apply_filter(@events)
@events = @events.limit(limit).offset(params[:offset] || 0)
- # Ensure project default branch is set if it possible
- # Normally it defined on push or during creation
- @project.discover_default_branch
-
respond_to do |format|
format.html do
if @project.empty_repo?
diff --git a/app/models/project.rb b/app/models/project.rb
index 65d42b6b870..0b32c90f09b 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -302,14 +302,6 @@ class Project < ActiveRecord::Base
end
end
- def discover_default_branch
- # Discover the default branch, but only if it hasn't already been set to
- # something else
- if repository.exists? && default_branch.nil?
- update_attributes(default_branch: self.repository.discover_default_branch)
- end
- end
-
def update_merge_requests(oldrev, newrev, ref, user)
return true unless ref =~ /heads/
branch_name = ref.gsub("refs/heads/", "")
diff --git a/app/services/git_push_service.rb b/app/services/git_push_service.rb
index 3ad41de397f..e732b5fd1e6 100644
--- a/app/services/git_push_service.rb
+++ b/app/services/git_push_service.rb
@@ -24,7 +24,6 @@ class GitPushService
create_push_event
project.ensure_satellite_exists
- project.discover_default_branch
project.repository.expire_cache
if push_to_existing_branch?(ref, oldrev)
diff --git a/app/workers/repository_import_worker.rb b/app/workers/repository_import_worker.rb
index a3b4bd0c9b5..95b80bca7c0 100644
--- a/app/workers/repository_import_worker.rb
+++ b/app/workers/repository_import_worker.rb
@@ -14,7 +14,6 @@ class RepositoryImportWorker
project.imported = true
project.save
project.satellite.create unless project.satellite.exists?
- project.discover_default_branch
else
project.imported = false
end