Commit 532f4b39 authored by Georges Racinet's avatar Georges Racinet 🦑
Browse files

Merged heptapod-stable branch into heptapod

--HG--
branch : heptapod
Pipeline #20118 passed with stages
in 11 minutes and 3 seconds
......@@ -113,6 +113,7 @@
- "GITLAB_WORKHORSE_VERSION"
- "workhorse/**/*"
- ".gitlab/ci/workhorse.gitlab-ci.yml"
- "heptapod-ci.yml"
.yaml-lint-patterns: &yaml-lint-patterns
- ".gitlab-ci.yml"
......
......@@ -1375,9 +1375,9 @@ def broken?
def can_be_merged_by?(user)
access = ::Gitlab::UserAccess.new(user, container: project)
return access.hg_can_publish? if project.mercurial?
access.can_update_branch?(target_branch)
# TODO: will have to change when we have non-publishing MRs
# (e.g., targeting topics)
access.can_update_branch?(target_branch) && (!project.mercurial? || access.hg_can_publish?)
end
def can_be_merged_via_command_line_by?(user)
......
......@@ -52,7 +52,7 @@ variables:
DOCKER_VERSION: "19.03.0"
# Heptapod specific variables
# for jobs that use the CNG (Container Native) Gitaly image as a service
HEPTAPOD_CNG_GITALY_VERSION: "v13.9.4"
HEPTAPOD_CNG_GITALY_VERSION: "v13.10.0"
include:
- local: .gitlab/ci/global.gitlab-ci.yml
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment