Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
renovate
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
SmartDataLab
public
applications
renovate
Commits
f6d8eb7a
Commit
f6d8eb7a
authored
6 years ago
by
Rhys Arkins
Browse files
Options
Downloads
Patches
Plain Diff
Revert "refactor(gitlab): always debug merge err"
This reverts commit
6237a7f4
.
parent
db46eb64
No related branches found
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
lib/platform/gitlab/index.js
+1
-1
1 addition, 1 deletion
lib/platform/gitlab/index.js
with
1 addition
and
1 deletion
lib/platform/gitlab/index.js
+
1
−
1
View file @
f6d8eb7a
...
@@ -770,7 +770,6 @@ async function mergePr(iid) {
...
@@ -770,7 +770,6 @@ async function mergePr(iid) {
});
});
return
true
;
return
true
;
}
catch
(
err
)
/* istanbul ignore next */
{
}
catch
(
err
)
/* istanbul ignore next */
{
logger
.
debug
({
err
},
'
merge PR error
'
);
if
(
err
.
statusCode
===
401
)
{
if
(
err
.
statusCode
===
401
)
{
logger
.
info
(
'
No permissions to merge PR
'
);
logger
.
info
(
'
No permissions to merge PR
'
);
return
false
;
return
false
;
...
@@ -779,6 +778,7 @@ async function mergePr(iid) {
...
@@ -779,6 +778,7 @@ async function mergePr(iid) {
logger
.
info
(
'
PR not acceptable for merging
'
);
logger
.
info
(
'
PR not acceptable for merging
'
);
return
false
;
return
false
;
}
}
logger
.
debug
({
err
},
'
merge PR error
'
);
logger
.
info
(
'
PR merge failed
'
);
logger
.
info
(
'
PR merge failed
'
);
return
false
;
return
false
;
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment