summaryrefslogtreecommitdiff
path: root/www/gitlab/files/patch-new-gitlab-git
diff options
context:
space:
mode:
Diffstat (limited to 'www/gitlab/files/patch-new-gitlab-git')
-rw-r--r--www/gitlab/files/patch-new-gitlab-git104
1 files changed, 104 insertions, 0 deletions
diff --git a/www/gitlab/files/patch-new-gitlab-git b/www/gitlab/files/patch-new-gitlab-git
new file mode 100644
index 000000000000..9204ca0712c5
--- /dev/null
+++ b/www/gitlab/files/patch-new-gitlab-git
@@ -0,0 +1,104 @@
+--- app/controllers/projects/tags_controller.rb.orig 2016-11-09 05:10:18 UTC
++++ app/controllers/projects/tags_controller.rb
+@@ -17,7 +17,7 @@ class Projects::TagsController < Project
+ @tag = @repository.find_tag(params[:id])
+
+ @release = @project.releases.find_or_initialize_by(tag: @tag.name)
+- @commit = @repository.commit(@tag.target)
++ @commit = @repository.commit(@tag.dereferenced_target)
+ end
+
+ def create
+--- app/services/delete_branch_service.rb.orig 2016-11-09 05:10:18 UTC
++++ app/services/delete_branch_service.rb
+@@ -42,7 +42,7 @@ class DeleteBranchService < BaseService
+ Gitlab::DataBuilder::Push.build(
+ project,
+ current_user,
+- branch.target.sha,
++ branch.dereferenced_target.sha,
+ Gitlab::Git::BLANK_SHA,
+ "#{Gitlab::Git::BRANCH_REF_PREFIX}#{branch.name}",
+ [])
+--- app/services/delete_tag_service.rb.orig 2016-11-09 05:10:18 UTC
++++ app/services/delete_tag_service.rb
+@@ -36,7 +36,7 @@ class DeleteTagService < BaseService
+ Gitlab::DataBuilder::Push.build(
+ project,
+ current_user,
+- tag.target.sha,
++ tag.dereferenced_target.sha,
+ Gitlab::Git::BLANK_SHA,
+ "#{Gitlab::Git::TAG_REF_PREFIX}#{tag.name}",
+ [])
+--- app/services/git_tag_push_service.rb.orig 2016-11-09 05:10:18 UTC
++++ app/services/git_tag_push_service.rb
+@@ -27,8 +27,8 @@ class GitTagPushService < BaseService
+ tag_name = Gitlab::Git.ref_name(params[:ref])
+ tag = project.repository.find_tag(tag_name)
+
+- if tag && tag.object_sha == params[:newrev]
+- commit = project.commit(tag.target)
++ if tag && tag.target == params[:newrev]
++ commit = project.commit(tag.dereferenced_target)
+ commits = [commit].compact
+ message = tag.message
+ end
+--- app/views/projects/branches/_branch.html.haml.orig 2016-11-09 05:10:18 UTC
++++ app/views/projects/branches/_branch.html.haml
+@@ -1,4 +1,4 @@
+-- commit = @repository.commit(branch.target)
++- commit = @repository.commit(branch.dereferenced_target)
+ - bar_graph_width_factor = @max_commits > 0 ? 100.0/@max_commits : 0
+ - diverging_commit_counts = @repository.diverging_commit_counts(branch)
+ - number_commits_behind = diverging_commit_counts[:behind]
+--- app/views/projects/issues/_related_branches.html.haml.orig 2016-11-09 05:10:18 UTC
++++ app/views/projects/issues/_related_branches.html.haml
+@@ -4,7 +4,7 @@
+ %ul.unstyled-list
+ - @related_branches.each do |branch|
+ %li
+- - target = @project.repository.find_branch(branch).target
++ - target = @project.repository.find_branch(branch).dereferenced_target
+ - pipeline = @project.pipeline(target.sha, branch) if target
+ - if pipeline
+ %span.related-branch-ci-status
+--- app/views/projects/tags/_tag.html.haml.orig 2016-11-09 05:10:18 UTC
++++ app/views/projects/tags/_tag.html.haml
+@@ -1,4 +1,4 @@
+-- commit = @repository.commit(tag.target)
++- commit = @repository.commit(tag.dereferenced_target)
+ - release = @releases.find { |release| release.tag == tag.name }
+ %li
+ %div
+--- lib/api/entities.rb.orig 2016-11-09 05:10:18 UTC
++++ lib/api/entities.rb
+@@ -125,7 +125,7 @@ module API
+ expose :name
+
+ expose :commit do |repo_branch, options|
+- options[:project].repository.commit(repo_branch.target)
++ options[:project].repository.commit(repo_branch.dereferenced_target)
+ end
+
+ expose :protected do |repo_branch, options|
+@@ -449,7 +449,7 @@ module API
+ expose :name, :message
+
+ expose :commit do |repo_tag, options|
+- options[:project].repository.commit(repo_tag.target)
++ options[:project].repository.commit(repo_tag.dereferenced_target)
+ end
+
+ expose :release, using: Entities::Release do |repo_tag, options|
+--- lib/gitlab/data_builder/push.rb.orig 2016-11-09 05:10:18 UTC
++++ lib/gitlab/data_builder/push.rb
+@@ -83,7 +83,7 @@ module Gitlab
+ tag = repository.find_tag(tag_name)
+
+ if tag
+- commit = repository.commit(tag.target)
++ commit = repository.commit(tag.dereferenced_target)
+ commit.try(:sha)
+ end
+ else