summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorP.S.V.R <pmq2001@gmail.com>2016-02-17 19:31:54 +0800
committerRémy Coutable <remy@rymai.me>2016-04-13 17:18:49 +0200
commita5755812847d6866c51738a0b36927aa809b47d2 (patch)
treebcfc4fac020daf4c3037a5b06515d0f18b8e3d6d
parent94e130cec30a8cfa6687d254e1cabce568a22634 (diff)
downloadgitlab-ce-a5755812847d6866c51738a0b36927aa809b47d2.tar.gz
Use rugged to change HEAD
-rw-r--r--CHANGELOG1
-rw-r--r--app/models/project.rb4
2 files changed, 4 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 2ab0cc11248..42f73259fee 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -32,6 +32,7 @@ v 8.7.0 (unreleased)
- Add default scope to projects to exclude projects pending deletion
- Allow to close merge requests which source projects(forks) are deleted.
- Ensure empty recipients are rejected in BuildsEmailService
+ - Use rugged to change HEAD in Project#change_head (P.S.V.R)
- API: Ability to filter milestones by state `active` and `closed` (Robert Schilling)
- API: Fix milestone filtering by `iid` (Robert Schilling)
- API: Delete notes of issues, snippets, and merge requests (Robert Schilling)
diff --git a/app/models/project.rb b/app/models/project.rb
index fadc8bb2c9e..c4b0e484347 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -865,7 +865,9 @@ class Project < ActiveRecord::Base
def change_head(branch)
repository.before_change_head
- gitlab_shell.update_repository_head(self.path_with_namespace, branch)
+ repository.rugged.references.create('HEAD',
+ "refs/heads/#{branch}",
+ force: true)
reload_default_branch
end