Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
heptapod
heptapod
Commits
5b5fc4f44dff
Commit
532f4b39
authored
Apr 01, 2021
by
Georges Racinet
🦑
Browse files
Merged heptapod-stable branch into heptapod
--HG-- branch : heptapod
parents
c5e1a42b2b5c
01c7a9a59a93
Pipeline
#20118
passed with stages
in 11 minutes and 3 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
.gitlab/ci/rules.gitlab-ci.yml
View file @
5b5fc4f4
...
...
@@ -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"
...
...
app/models/merge_request.rb
View file @
5b5fc4f4
...
...
@@ -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
)
...
...
heptapod-ci.yml
View file @
5b5fc4f4
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment