Docs and logs cleanup

custom/conf/app.example.ini

@@ -1063,7 +1063,7 @@ ROUTER = console
 ;; In addition to testing patches using the three-way merge method, re-test conflicting patches with git apply
 ;TEST_CONFLICTING_PATCHES_WITH_GIT_APPLY = false
 ;;
-;; Retarget the child pull request to the parent pull request branch target
+;; Retarget child pull requests to the parent pull request branch target on merge of parent pull request
 ;RETARGET_CHILDREN_ON_MERGE = false
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

docs/content/doc/administration/config-cheat-sheet.en-us.md

@@ -137,7 +137,7 @@ In addition there is _`StaticRootPath`_ which can be set as a built-in at build
 - `POPULATE_SQUASH_COMMENT_WITH_COMMIT_MESSAGES`: **false**: In default squash-merge messages include the commit message of all commits comprising the pull request.
 - `ADD_CO_COMMITTER_TRAILERS`: **true**: Add co-authored-by and co-committed-by trailers to merge commit messages if committer does not match author.
 - `TEST_CONFLICTING_PATCHES_WITH_GIT_APPLY`: **false**: PR patches are tested using a three-way merge method to discover if there are conflicts. If this setting is set to **true**, conflicting patches will be retested using `git apply` - This was the previous behaviour in 1.18 (and earlier) but is somewhat inefficient. Please report if you find that this setting is required.
-- `RETARGET_CHILDREN_ON_MERGE`: **false**: Retarget the child pull request to the parent pull request branch target.
+- `RETARGET_CHILDREN_ON_MERGE`: **false**: Retarget child pull requests to the parent pull request branch target on merge of parent pull request.
 
 ### Repository - Issue (`repository.issue`)
 

routers/api/v1/repo/pull.go

@@ -905,7 +905,6 @@ func MergePullRequest(ctx *context.APIContext) {
 			defer headRepo.Close()
 		}
 		if err := pull_service.RetargetChildrenOnMerge(ctx, ctx.Doer, pr); err != nil {
-			log.Error("RetargetChildrenOnMerge: %v", err)
 			ctx.Error(http.StatusInternalServerError, "RetargetChildrenOnMerge", err)
 			return
 		}

routers/web/repo/pull.go

@@ -1401,7 +1401,6 @@ func deleteBranch(ctx *context.Context, pr *issues_model.PullRequest, gitRepo *g
 	fullBranchName := pr.HeadRepo.FullName() + ":" + pr.HeadBranch
 
 	if err := pull_service.RetargetChildrenOnMerge(ctx, ctx.Doer, pr); err != nil {
-		log.Error("RetargetChildrenOnMerge: %v", err)
 		ctx.Flash.Error(ctx.Tr("repo.branch.deletion_failed", fullBranchName))
 		return
 	}