Commit 02484930e161f773a205bb1c1d29a8664755fd60
1 parent
c28786ec
Exists in
master
and in
4 other branches
Removed Project#discover_default_branch since it not needed any more
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Showing
5 changed files
with
0 additions
and
16 deletions
Show diff stats
app/contexts/projects/create_context.rb
| @@ -47,8 +47,6 @@ module Projects | @@ -47,8 +47,6 @@ module Projects | ||
| 47 | @project.creator = current_user | 47 | @project.creator = current_user |
| 48 | 48 | ||
| 49 | if @project.save | 49 | if @project.save |
| 50 | - @project.discover_default_branch | ||
| 51 | - | ||
| 52 | unless @project.group | 50 | unless @project.group |
| 53 | @project.users_projects.create( | 51 | @project.users_projects.create( |
| 54 | project_access: UsersProject::MASTER, | 52 | project_access: UsersProject::MASTER, |
app/controllers/projects_controller.rb
| @@ -62,10 +62,6 @@ class ProjectsController < ApplicationController | @@ -62,10 +62,6 @@ class ProjectsController < ApplicationController | ||
| 62 | @events = event_filter.apply_filter(@events) | 62 | @events = event_filter.apply_filter(@events) |
| 63 | @events = @events.limit(limit).offset(params[:offset] || 0) | 63 | @events = @events.limit(limit).offset(params[:offset] || 0) |
| 64 | 64 | ||
| 65 | - # Ensure project default branch is set if it possible | ||
| 66 | - # Normally it defined on push or during creation | ||
| 67 | - @project.discover_default_branch | ||
| 68 | - | ||
| 69 | respond_to do |format| | 65 | respond_to do |format| |
| 70 | format.html do | 66 | format.html do |
| 71 | if @project.empty_repo? | 67 | if @project.empty_repo? |
app/models/project.rb
| @@ -302,14 +302,6 @@ class Project < ActiveRecord::Base | @@ -302,14 +302,6 @@ class Project < ActiveRecord::Base | ||
| 302 | end | 302 | end |
| 303 | end | 303 | end |
| 304 | 304 | ||
| 305 | - def discover_default_branch | ||
| 306 | - # Discover the default branch, but only if it hasn't already been set to | ||
| 307 | - # something else | ||
| 308 | - if repository.exists? && default_branch.nil? | ||
| 309 | - update_attributes(default_branch: self.repository.discover_default_branch) | ||
| 310 | - end | ||
| 311 | - end | ||
| 312 | - | ||
| 313 | def update_merge_requests(oldrev, newrev, ref, user) | 305 | def update_merge_requests(oldrev, newrev, ref, user) |
| 314 | return true unless ref =~ /heads/ | 306 | return true unless ref =~ /heads/ |
| 315 | branch_name = ref.gsub("refs/heads/", "") | 307 | branch_name = ref.gsub("refs/heads/", "") |
app/services/git_push_service.rb
| @@ -24,7 +24,6 @@ class GitPushService | @@ -24,7 +24,6 @@ class GitPushService | ||
| 24 | create_push_event | 24 | create_push_event |
| 25 | 25 | ||
| 26 | project.ensure_satellite_exists | 26 | project.ensure_satellite_exists |
| 27 | - project.discover_default_branch | ||
| 28 | project.repository.expire_cache | 27 | project.repository.expire_cache |
| 29 | 28 | ||
| 30 | if push_to_existing_branch?(ref, oldrev) | 29 | if push_to_existing_branch?(ref, oldrev) |
app/workers/repository_import_worker.rb
| @@ -14,7 +14,6 @@ class RepositoryImportWorker | @@ -14,7 +14,6 @@ class RepositoryImportWorker | ||
| 14 | project.imported = true | 14 | project.imported = true |
| 15 | project.save | 15 | project.save |
| 16 | project.satellite.create unless project.satellite.exists? | 16 | project.satellite.create unless project.satellite.exists? |
| 17 | - project.discover_default_branch | ||
| 18 | else | 17 | else |
| 19 | project.imported = false | 18 | project.imported = false |
| 20 | end | 19 | end |