Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
A
autogitmerge
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jérome Perrin
autogitmerge
Commits
ac5892af
Commit
ac5892af
authored
Jun 20, 2022
by
Jérome Perrin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
remove a leftover log and fix notification message
parent
eed9c523
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
2 deletions
+1
-2
autogitmerge.mjs
autogitmerge.mjs
+1
-2
No files found.
autogitmerge.mjs
View file @
ac5892af
...
@@ -56,13 +56,12 @@ while (true) {
...
@@ -56,13 +56,12 @@ while (true) {
const
url
=
new
URL
(
config
.
notification
[
'
merge-request-url
'
]);
const
url
=
new
URL
(
config
.
notification
[
'
merge-request-url
'
]);
let
[
projectId
,
mergeRequestIid
]
=
url
.
pathname
.
substring
(
1
).
split
(
'
/merge_requests/
'
);
let
[
projectId
,
mergeRequestIid
]
=
url
.
pathname
.
substring
(
1
).
split
(
'
/merge_requests/
'
);
url
.
pathname
=
`/api/v4/projects/
${
encodeURIComponent
(
projectId
)}
/merge_requests/
${
mergeRequestIid
}
/notes`
url
.
pathname
=
`/api/v4/projects/
${
encodeURIComponent
(
projectId
)}
/merge_requests/
${
mergeRequestIid
}
/notes`
console
.
log
(
url
.
toString
())
let
body
=
config
.
notification
.
message
let
body
=
config
.
notification
.
message
if
(
body
===
undefined
)
{
if
(
body
===
undefined
)
{
// merge again capturing the output this time
// merge again capturing the output this time
await
$
`git reset --hard project/
${
config
.
project
.
branch
}
`
await
$
`git reset --hard project/
${
config
.
project
.
branch
}
`
const
gitOutput
=
(
await
$
`git merge upstream/
${
config
.
upstream
.
branch
}
`
.
nothrow
()).
toString
()
const
gitOutput
=
(
await
$
`git merge upstream/
${
config
.
upstream
.
branch
}
`
.
nothrow
()).
toString
()
body
=
`Error while merging upstream changes
body
=
`Error while merging upstream changes
.
\`\`\`console
\`\`\`console
$ git merge upstream/
${
config
.
upstream
.
branch
}
$ git merge upstream/
${
config
.
upstream
.
branch
}
${
gitOutput
}
${
gitOutput
}
...
...
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