Index: www/gitlab/Makefile =================================================================== --- www/gitlab/Makefile (revision 431181) +++ www/gitlab/Makefile (working copy) @@ -4,7 +4,7 @@ PORTNAME= gitlab PORTVERSION= 8.11.11 DISTVERSIONPREFIX= v -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= www devel MAINTAINER= tz@FreeBSD.org @@ -133,7 +133,7 @@ rubygem-gon>=6.1.0:www/rubygem-gon \ rubygem-jquery-atwho-rails-rails4>=1.3.2:www/rubygem-jquery-atwho-rails-rails4 \ rubygem-jquery-rails4>=4.1.0:www/rubygem-jquery-rails4 \ - rubygem-jquery-ui-rails-rails4>=5.0.0:www/rubygem-jquery-ui-rails-rails4 \ + rubygem-jquery-ui-rails5-rails4>=5.0.0:www/rubygem-jquery-ui-rails5-rails4 \ rubygem-request_store>=1.3.0:devel/rubygem-request_store \ rubygem-select2-rails>=3.5.9:www/rubygem-select2-rails \ rubygem-virtus>=1.0.1:devel/rubygem-virtus \ Index: www/gitlab/files/patch-6130 =================================================================== --- www/gitlab/files/patch-6130 (nonexistent) +++ www/gitlab/files/patch-6130 (working copy) @@ -0,0 +1,210 @@ +diff --git a/app/models/repository.rb b/app/models/repository.rb +index f891e83..b064425 100644 +--- app/models/repository.rb ++++ app/models/repository.rb +@@ -149,7 +149,7 @@ class Repository + return false unless target + + GitHooksService.new.execute(user, path_to_repo, oldrev, target, ref) do +- rugged.branches.create(branch_name, target) ++ update_ref!(ref, target, oldrev) + end + + after_create_branch +@@ -181,7 +181,7 @@ class Repository + ref = Gitlab::Git::BRANCH_REF_PREFIX + branch_name + + GitHooksService.new.execute(user, path_to_repo, oldrev, newrev, ref) do +- rugged.branches.delete(branch_name) ++ update_ref!(ref, newrev, oldrev) + end + + after_remove_branch +@@ -215,6 +215,21 @@ class Repository + rugged.references.exist?(ref) + end + ++ def update_ref!(name, newrev, oldrev) ++ # We use 'git update-ref' because libgit2/rugged currently does not ++ # offer 'compare and swap' ref updates. Without compare-and-swap we can ++ # (and have!) accidentally reset the ref to an earlier state, clobbering ++ # commits. See also https://github.com/libgit2/libgit2/issues/1534. ++ command = %w[git update-ref --stdin -z] ++ output, status = Gitlab::Popen.popen(command, path_to_repo) do |stdin| ++ stdin.write("update #{name}\x00#{newrev}\x00#{oldrev}\x00") ++ end ++ ++ return if status.zero? ++ ++ raise CommitError.new("error updating ref #{name} #{oldrev}->#{newrev}\n#{output}") ++ end ++ + # Makes sure a commit is kept around when Git garbage collection runs. + # Git GC will delete commits from the repository that are no longer in any + # branches or tags, but we want to keep some of these commits around, for +@@ -1014,15 +1029,10 @@ class Repository + def commit_with_hooks(current_user, branch) + update_autocrlf_option + +- oldrev = Gitlab::Git::BLANK_SHA + ref = Gitlab::Git::BRANCH_REF_PREFIX + branch + target_branch = find_branch(branch) + was_empty = empty? + +- if !was_empty && target_branch +- oldrev = target_branch.target.id +- end +- + # Make commit + newrev = yield(ref) + +@@ -1030,24 +1040,15 @@ class Repository + raise CommitError.new('Failed to create commit') + end + ++ oldrev = rugged.lookup(newrev).parent_ids.first || Gitlab::Git::BLANK_SHA ++ + GitHooksService.new.execute(current_user, path_to_repo, oldrev, newrev, ref) do ++ update_ref!(ref, newrev, oldrev) ++ + if was_empty || !target_branch +- # Create branch +- rugged.references.create(ref, newrev) +- + # If repo was empty expire cache + after_create if was_empty + after_create_branch +- else +- # Update head +- current_head = find_branch(branch).target.id +- +- # Make sure target branch was not changed during pre-receive hook +- if current_head == oldrev +- rugged.references.update(ref, newrev) +- else +- raise CommitError.new('Commit was rejected because branch received new push') +- end + end + end + +diff --git a/lib/gitlab/popen.rb b/lib/gitlab/popen.rb +index ca23cce..a0fd411 100644 +--- lib/gitlab/popen.rb ++++ lib/gitlab/popen.rb +@@ -21,9 +21,9 @@ module Gitlab + @cmd_output = "" + @cmd_status = 0 + Open3.popen3(vars, *cmd, options) do |stdin, stdout, stderr, wait_thr| +- # We are not using stdin so we should close it, in case the command we +- # are running waits for input. ++ yield(stdin) if block_given? + stdin.close ++ + @cmd_output << stdout.read + @cmd_output << stderr.read + @cmd_status = wait_thr.value.exitstatus +diff --git a/spec/lib/gitlab/popen_spec.rb b/spec/lib/gitlab/popen_spec.rb +index e8b2364..4ae216d 100644 +--- spec/lib/gitlab/popen_spec.rb ++++ spec/lib/gitlab/popen_spec.rb +@@ -40,4 +40,13 @@ describe 'Gitlab::Popen', lib: true, no_db: true do + it { expect(@status).to be_zero } + it { expect(@output).to include('spec') } + end ++ ++ context 'use stdin' do ++ before do ++ @output, @status = @klass.new.popen(%w[cat]) { |stdin| stdin.write 'hello' } ++ end ++ ++ it { expect(@status).to be_zero } ++ it { expect(@output).to eq('hello') } ++ end + end +diff --git a/spec/models/repository_spec.rb b/spec/models/repository_spec.rb +index 812c72c..afc7dc5 100644 +--- spec/models/repository_spec.rb ++++ spec/models/repository_spec.rb +@@ -443,31 +443,32 @@ describe Repository, models: true do + + describe '#commit_with_hooks' do + let(:old_rev) { '0b4bc9a49b562e85de7cc9e834518ea6828729b9' } # git rev-parse feature ++ let(:new_rev) { 'a74ae73c1ccde9b974a70e82b901588071dc142a' } # commit whose parent is old_rev + + context 'when pre hooks were successful' do + before do + expect_any_instance_of(GitHooksService).to receive(:execute). +- with(user, repository.path_to_repo, old_rev, sample_commit.id, 'refs/heads/feature'). ++ with(user, repository.path_to_repo, old_rev, new_rev, 'refs/heads/feature'). + and_yield.and_return(true) + end + + it 'runs without errors' do + expect do +- repository.commit_with_hooks(user, 'feature') { sample_commit.id } ++ repository.commit_with_hooks(user, 'feature') { new_rev } + end.not_to raise_error + end + + it 'ensures the autocrlf Git option is set to :input' do + expect(repository).to receive(:update_autocrlf_option) + +- repository.commit_with_hooks(user, 'feature') { sample_commit.id } ++ repository.commit_with_hooks(user, 'feature') { new_rev } + end + + context "when the branch wasn't empty" do + it 'updates the head' do + expect(repository.find_branch('feature').target.id).to eq(old_rev) +- repository.commit_with_hooks(user, 'feature') { sample_commit.id } +- expect(repository.find_branch('feature').target.id).to eq(sample_commit.id) ++ repository.commit_with_hooks(user, 'feature') { new_rev } ++ expect(repository.find_branch('feature').target.id).to eq(new_rev) + end + end + end +@@ -477,7 +478,7 @@ describe Repository, models: true do + allow_any_instance_of(Gitlab::Git::Hook).to receive(:trigger).and_return([false, '']) + + expect do +- repository.commit_with_hooks(user, 'feature') { sample_commit.id } ++ repository.commit_with_hooks(user, 'feature') { new_rev } + end.to raise_error(GitHooksService::PreReceiveError) + end + end +@@ -485,6 +486,7 @@ describe Repository, models: true do + context 'when target branch is different from source branch' do + before do + allow_any_instance_of(Gitlab::Git::Hook).to receive(:trigger).and_return([true, '']) ++ allow(repository).to receive(:update_ref!) + end + + it 'expires branch cache' do +@@ -495,7 +497,7 @@ describe Repository, models: true do + expect(repository).to receive(:expire_has_visible_content_cache) + expect(repository).to receive(:expire_branch_count_cache) + +- repository.commit_with_hooks(user, 'new-feature') { sample_commit.id } ++ repository.commit_with_hooks(user, 'new-feature') { new_rev } + end + end + +@@ -1268,4 +1270,18 @@ describe Repository, models: true do + File.delete(path) + end + end ++ ++ describe '#update_ref!' do ++ it 'can create a ref' do ++ repository.update_ref!('refs/heads/foobar', 'refs/heads/master', Gitlab::Git::BLANK_SHA) ++ ++ expect(repository.find_branch('foobar')).not_to be_nil ++ end ++ ++ it 'raises CommitError when the ref update fails' do ++ expect do ++ repository.update_ref!('refs/heads/master', 'refs/heads/master', Gitlab::Git::BLANK_SHA) ++ end.to raise_error(Repository::CommitError) ++ end ++ end + end Property changes on: www/gitlab/files/patch-6130 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: www/gitlab/files/patch-Gemfile =================================================================== --- www/gitlab/files/patch-Gemfile (revision 431181) +++ www/gitlab/files/patch-Gemfile (working copy) @@ -1,5 +1,5 @@ ---- Gemfile.orig 2016-11-09 05:10:18 UTC -+++ Gemfile +--- Gemfile.orig 2017-01-04 21:07:00.413929000 -0500 ++++ Gemfile 2017-01-04 21:06:45.052347000 -0500 @@ -1,6 +1,6 @@ source 'https://rubygems.org' @@ -27,12 +27,18 @@ # Authentication libraries gem 'devise', '~> 4.0' -@@ -30,12 +29,11 @@ gem 'omniauth-facebook', '~> 3.0.0' +@@ -26,20 +25,19 @@ gem 'omniauth-auth0', '~> 1.4.1' + gem 'omniauth-azure-oauth2', '~> 0.0.6' + gem 'omniauth-bitbucket', '~> 0.0.2' + gem 'omniauth-cas3', '~> 1.1.2' +-gem 'omniauth-facebook', '~> 3.0.0' ++gem 'omniauth-facebook', '>= 3.0.0' gem 'omniauth-github', '~> 1.1.1' gem 'omniauth-gitlab', '~> 1.0.0' gem 'omniauth-google-oauth2', '~> 0.4.1' -gem 'omniauth-kerberos', '~> 0.3.0', group: :kerberos - gem 'omniauth-saml', '~> 1.6.0' +-gem 'omniauth-saml', '~> 1.6.0' ++gem 'omniauth-saml', '>= 1.6.0' gem 'omniauth-shibboleth', '~> 1.2.0' gem 'omniauth-twitter', '~> 1.2.0' gem 'omniauth_crowd', '~> 2.2.0' @@ -41,7 +47,12 @@ gem 'jwt' # Spam and anti-bot protection -@@ -66,11 +64,11 @@ gem 'gollum-lib', '~> 4.2', require: fal +-gem 'recaptcha', '~> 3.0', require: 'recaptcha/rails' ++gem 'recaptcha', '>= 3.0', require: 'recaptcha/rails' + gem 'akismet', '~> 2.0' + + # Two-factor authentication +@@ -66,21 +64,21 @@ gem 'gollum-lib', '~> 4.2', require: fal gem 'gollum-rugged_adapter', '~> 0.4.2', require: false # Language detection @@ -56,9 +67,12 @@ gem 'rack-cors', '~> 0.4.0', require: 'rack/cors' # Pagination -@@ -80,7 +78,7 @@ gem 'kaminari', '~> 0.17.0' - gem 'hamlit', '~> 2.6.1' + gem 'kaminari', '~> 0.17.0' + # HAML +-gem 'hamlit', '~> 2.6.1' ++gem 'hamlit', '>= 2.6.1' + # Files attachments -gem 'carrierwave', '~> 0.10.0' +gem 'carrierwave', '>= 0.10.0' @@ -65,9 +79,12 @@ # Drag and Drop UI gem 'dropzonejs-rails', '~> 0.7.1' -@@ -109,10 +107,10 @@ gem 'task_list', '~> 1.0.2', require +@@ -107,25 +105,25 @@ gem 'seed-fu', '~> 2.3.5' + gem 'html-pipeline', '~> 1.11.0' + gem 'task_list', '~> 1.0.2', require: 'task_list/railtie' gem 'github-markup', '~> 1.4' - gem 'redcarpet', '~> 3.3.3' +-gem 'redcarpet', '~> 3.3.3' ++gem 'redcarpet', '>= 3.3.3' gem 'RedCloth', '~> 4.3.2' -gem 'rdoc', '~>3.6' +gem 'rdoc', '>= 3.6' @@ -78,8 +95,10 @@ gem 'asciidoctor', '~> 1.5.2' gem 'rouge', '~> 2.0' -@@ -121,11 +119,11 @@ gem 'rouge', '~> 2.0' - gem 'nokogiri', '~> 1.6.7', '>= 1.6.7.2' + # See https://groups.google.com/forum/#!topic/ruby-security-ann/aSbgDiwb24s + # and https://groups.google.com/forum/#!topic/ruby-security-ann/Dy7YiKb_pMM +-gem 'nokogiri', '~> 1.6.7', '>= 1.6.7.2' ++gem 'nokogiri', '>= 1.6.7.2' # Diffs -gem 'diffy', '~> 3.0.3' @@ -135,7 +154,7 @@ # Ace editor gem 'ace-rails-ap', '~> 4.1.0' -@@ -215,22 +213,22 @@ gem 'chronic_duration', '~> 0.10.6' +@@ -215,125 +213,42 @@ gem 'chronic_duration', '~> 0.10.6' gem 'sass-rails', '~> 5.0.0' gem 'coffee-rails', '~> 4.1.0' @@ -147,7 +166,8 @@ -gem 'addressable', '~> 2.3.8' +gem 'addressable', '>= 2.3.8' gem 'bootstrap-sass', '~> 3.3.0' - gem 'font-awesome-rails', '~> 4.6.1' +-gem 'font-awesome-rails', '~> 4.6.1' ++gem 'font-awesome-rails', '>= 4.6.1' gem 'gemojione', '~> 3.0' gem 'gon', '~> 6.1.0' gem 'jquery-atwho-rails', '~> 1.3.2' @@ -163,7 +183,8 @@ gem 'base32', '~> 0.3.0' # Sentry integration -@@ -238,89 +236,6 @@ gem 'sentry-raven', '~> 2.0.0' +-gem 'sentry-raven', '~> 2.0.0' ++gem 'sentry-raven', '>= 2.0.0' gem 'premailer-rails', '~> 1.9.0' @@ -253,9 +274,28 @@ group :production do gem 'gitlab_meta', '7.0' end -@@ -349,5 +264,7 @@ gem 'paranoia', '~> 2.0' - gem 'health_check', '~> 2.1.0' + gem 'newrelic_rpm', '~> 3.16' + +-gem 'octokit', '~> 4.3.0' ++gem 'octokit', '>= 4.3.0' + + gem 'mail_room', '~> 0.8' + + gem 'email_reply_parser', '~> 0.5.8' + +-gem 'ruby-prof', '~> 0.15.9' ++gem 'ruby-prof', '>= 0.15.9' + + ## CI + gem 'activerecord-session_store', '~> 1.0.0' +@@ -346,8 +261,10 @@ gem 'oauth2', '~> 1.2.0' + gem 'paranoia', '~> 2.0' + + # Health check +-gem 'health_check', '~> 2.1.0' ++gem 'health_check', '>= 2.1.0' + # System information -gem 'vmstat', '~> 2.2' +gem 'vmstat', '>= 2.1.1' Index: www/gitlab/files/patch-new-gitlab-git =================================================================== --- www/gitlab/files/patch-new-gitlab-git (nonexistent) +++ www/gitlab/files/patch-new-gitlab-git (working copy) @@ -0,0 +1,178 @@ +--- app/controllers/projects/tags_controller.rb ++++ app/controllers/projects/tags_controller.rb +@@ -23,7 +23,7 @@ class Projects::TagsController < Projects::ApplicationController + return render_404 unless @tag + + @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/models/repository.rb ++++ app/models/repository.rb +@@ -181,7 +181,7 @@ class Repository + before_remove_branch + + branch = find_branch(branch_name) +- oldrev = branch.try(:target).try(:id) ++ oldrev = branch.try(:dereferenced_target).try(:id) + newrev = Gitlab::Git::BLANK_SHA + ref = Gitlab::Git::BRANCH_REF_PREFIX + branch_name + +@@ -297,10 +297,10 @@ class Repository + # Rugged seems to throw a `ReferenceError` when given branch_names rather + # than SHA-1 hashes + number_commits_behind = raw_repository. +- count_commits_between(branch.target.sha, root_ref_hash) ++ count_commits_between(branch.dereferenced_target.sha, root_ref_hash) + + number_commits_ahead = raw_repository. +- count_commits_between(root_ref_hash, branch.target.sha) ++ count_commits_between(root_ref_hash, branch.dereferenced_target.sha) + + { behind: number_commits_behind, ahead: number_commits_ahead } + end +@@ -682,11 +682,11 @@ class Repository + branches.sort_by(&:name) + when 'updated_desc' + branches.sort do |a, b| +- commit(b.target).committed_date <=> commit(a.target).committed_date ++ commit(b.dereferenced_target).committed_date <=> commit(a.dereferenced_target).committed_date + end + when 'updated_asc' + branches.sort do |a, b| +- commit(a.target).committed_date <=> commit(b.target).committed_date ++ commit(a.dereferenced_target).committed_date <=> commit(b.dereferenced_target).committed_date + end + else + branches +@@ -948,7 +948,7 @@ class Repository + end + + def revert(user, commit, base_branch, revert_tree_id = nil) +- source_sha = find_branch(base_branch).target.sha ++ source_sha = find_branch(base_branch).dereferenced_target.sha + revert_tree_id ||= check_revert_content(commit, base_branch) + + return false unless revert_tree_id +@@ -965,7 +965,7 @@ class Repository + end + + def cherry_pick(user, commit, base_branch, cherry_pick_tree_id = nil) +- source_sha = find_branch(base_branch).target.sha ++ source_sha = find_branch(base_branch).dereferenced_target.sha + cherry_pick_tree_id ||= check_cherry_pick_content(commit, base_branch) + + return false unless cherry_pick_tree_id +@@ -994,7 +994,7 @@ class Repository + end + + def check_revert_content(commit, base_branch) +- source_sha = find_branch(base_branch).target.sha ++ source_sha = find_branch(base_branch).dereferenced_target.sha + args = [commit.id, source_sha] + args << { mainline: 1 } if commit.merge_commit? + +@@ -1008,7 +1008,7 @@ class Repository + end + + def check_cherry_pick_content(commit, base_branch) +- source_sha = find_branch(base_branch).target.sha ++ source_sha = find_branch(base_branch).dereferenced_target.sha + args = [commit.id, source_sha] + args << 1 if commit.merge_commit? + +--- app/services/delete_branch_service.rb ++++ 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 ++++ 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 ++++ 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 ++++ 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 ++++ 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 ++++ 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 ++++ lib/api/entities.rb +@@ -138,7 +138,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| +@@ -523,7 +523,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 ++++ 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 Property changes on: www/gitlab/files/patch-new-gitlab-git ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property