mr = new stdclass; $lang->mr->common = 'Merge Requests'; $lang->mr->server = "Server"; $lang->mr->hostID = "Server"; $lang->mr->view = "Survey"; $lang->mr->viewAction = "{$lang->mr->common} Details"; $lang->mr->create = "Submit {$lang->mr->common}"; $lang->mr->apiCreate = "Interface: Create"; $lang->mr->browse = "Browse"; $lang->mr->browseAction = "{$lang->mr->common} List"; $lang->mr->list = "List"; $lang->mr->edit = "Edit"; $lang->mr->delete = "Delete"; $lang->mr->accept = "Accept"; $lang->mr->source = 'source'; $lang->mr->target = 'target'; $lang->mr->viewDiff = 'View diff'; $lang->mr->diff = 'View diff'; $lang->mr->viewInGit = 'View in APP'; $lang->mr->link = 'Link of stories,Bugs,tasks'; $lang->mr->createAction = '%s, %s submitted a Merge Request.'; $lang->mr->editAction = '%s, %s edited Merge Request.'; $lang->mr->removeAction = '%s, %s deleted Merge Request.'; $lang->mr->submitType = 'Submit type'; $lang->mr->action = new stdclass(); $lang->mr->action->synced = '$date, $actor synced this Merge Request.'; $lang->mr->action->imported = '$date, $actor imported this Merge Request.'; $lang->mr->linkList = 'Link List of stories,Bugs,tasks'; $lang->mr->linkStory = 'Link Stories'; $lang->mr->linkBug = 'Link Bugs'; $lang->mr->linkTask = 'Link Tasks'; $lang->mr->unlinkTask = 'Remove Tasks'; $lang->mr->unlink = 'UnLink of stories,Bugs,tasks'; $lang->mr->addReview = 'Add Review'; $lang->mr->id = 'ID'; $lang->mr->mriid = "raw MR ID"; $lang->mr->title = 'Name'; $lang->mr->status = 'Status'; $lang->mr->author = 'Author'; $lang->mr->createdDate = 'Created date'; $lang->mr->assignee = 'Assignee'; $lang->mr->reviewer = 'Reviewer'; $lang->mr->mergeStatus = 'Merge status'; $lang->mr->commits = 'commits'; $lang->mr->changes = 'changes'; $lang->mr->gitlabID = 'GitLab'; $lang->mr->repoID = 'Repo'; $lang->mr->jobID = 'Pipeline job'; $lang->mr->commitLogs = 'Commit Logs'; $lang->mr->execJob = 'Execute'; $lang->mr->execJobTip = 'Execute the pipeline job manually'; $lang->mr->canMerge = "Can be merged"; $lang->mr->cantMerge = "Can not be merged"; $lang->mr->approval = 'Approval'; $lang->mr->approve = 'Approve'; $lang->mr->reject = 'Reject'; $lang->mr->close = 'Close'; $lang->mr->reopen = 'Reopen'; $lang->mr->reviewType = 'Review Type'; $lang->mr->reviewTypeList = array(); $lang->mr->reviewTypeList['bug'] = 'Bug'; $lang->mr->reviewTypeList['task'] = 'Task'; $lang->mr->approvalResult = 'Approval result'; $lang->mr->approvalResultList = array(); $lang->mr->approvalResultList['approve'] = 'Approve'; $lang->mr->approvalResultList['reject'] = 'Reject'; $lang->mr->needApproved = 'This MR should be approved before merge'; $lang->mr->needCI = 'Merge only after passing pipeline'; $lang->mr->removeSourceBranch = 'Delete source branch after merge'; $lang->mr->squash = 'Squash commits'; $lang->mr->triggeredCI = 'The pipeline job is triggered due to the target branch or pipeline job changed.'; $lang->mr->acceptTip = 'Please approve this MR before merge'; $lang->mr->conflictsTip = 'This merge request has conflicts, cannot be merged'; $lang->mr->noChangesTip = 'Source branch and target branch have no changes, cannot be merged'; $lang->mr->compileTip = 'This merge request pipeline build is not successful, cannot be merged'; $lang->mr->notifyTip = 'This merge request has conflicts or no changes, cannot be merged'; $lang->mr->branchUpdateTip = 'Branch has been updated, execute pipeline'; $lang->mr->draftTips = 'Merge request is in draft status, cannot be merged.'; $lang->mr->repeatedOperation = 'Do not repeat operations'; $lang->mr->approvalStatus = 'Approve status'; $lang->mr->approvalStatusList = array(); $lang->mr->approvalStatusList['notReviewed'] = 'notReviewed'; $lang->mr->approvalStatusList['approved'] = 'Approved'; $lang->mr->approvalStatusList['rejected'] = 'Rejected'; $lang->mr->notApproved = 'Rejected'; $lang->mr->assignedToMe = 'AssignedToMe'; $lang->mr->createdByMe = 'CreatedByMe'; $lang->mr->statusList = array(); $lang->mr->statusList['all'] = 'all'; $lang->mr->statusList['opened'] = 'opened'; $lang->mr->statusList['merged'] = 'merged'; $lang->mr->statusList['closed'] = 'closed'; $lang->mr->mergeStatusList = array(); $lang->mr->mergeStatusList['unchecked'] = 'unchecked'; $lang->mr->mergeStatusList['checking'] = 'checking'; $lang->mr->mergeStatusList['can_be_merged'] = 'can be merged'; $lang->mr->mergeStatusList['cannot_be_merged'] = 'cannot be merged'; $lang->mr->mergeStatusList['cannot_merge_by_fail'] = 'Cannot be merged, check failed'; $lang->mr->description = 'Description'; $lang->mr->confirmDelete = 'Are you sure to delete this merge request?'; $lang->mr->sourceProject = 'Source repository'; $lang->mr->sourceBranch = 'Source branch'; $lang->mr->targetProject = 'Target repository'; $lang->mr->targetBranch = 'Target branch'; $lang->mr->noCompileJob = 'No Pipeline Job'; $lang->mr->compileUnexecuted = 'Compile Unexecuted'; $lang->mr->compileID = 'Compile ID'; $lang->mr->compileStatus = 'Compile Status'; $lang->mr->notFound = "Merge Request does not exist!"; $lang->mr->toCreatedMessage = "The merge request you submitted: %s, the pipeline task succeeded."; $lang->mr->toReviewerMessage = "You have one merge request %s waiting."; $lang->mr->failMessage = "Your merge request %s failed. Please check its execution result. "; $lang->mr->storySummary = "Total %s {$lang->SRCommon} on this page."; $lang->mr->apiError = new stdclass; $lang->mr->apiError->createMR = "Failed to create a merge request through API. Reason: %s"; $lang->mr->apiError->sudo = "Unable to operate with the GitLab account bound to the current user. Reason: %s"; $lang->mr->apiError->emptyResponse = "The object requested by the API does not exist or failed."; $lang->mr->apiError->notFound = "The object requested by the API does not exist, it may be deleted in API Server."; $lang->mr->createFailedFromAPI = "Failed to create Merge Request."; $lang->mr->hasSameOpenedMR = "There are duplicate and unclosed merge requests: ID%u"; $lang->mr->accessGitlabFailed = "Unable to connect to the GitLab server."; $lang->mr->reopenSuccess = "The merge request was reopened."; $lang->mr->closeSuccess = "Merge request closed."; $lang->mr->unsupportedFeature = "Unsupported feature."; $lang->mr->apiErrorMap[1] = "You can't use same project/branch for source and target"; $lang->mr->apiErrorMap[2] = "/Another open merge request already exists for this source branch: !([0-9]+)/"; $lang->mr->apiErrorMap[3] = "401 Unauthorized"; $lang->mr->apiErrorMap[4] = "403 Forbidden"; $lang->mr->apiErrorMap[5] = "/(pull request already exists for these targets).*/"; $lang->mr->apiErrorMap[6] = "Invalid PullRequest: There are no changes between the head and the base"; $lang->mr->apiErrorMap[7] = "/(user doesn't have access to repo).*/"; $lang->mr->apiErrorMap[8] = "/(git apply).*/"; $lang->mr->errorLang[1] = 'The source project branch cannot be the same as the target project branch'; $lang->mr->errorLang[2] = 'Another open merge request already exists for this source branch: ID%u'; $lang->mr->errorLang[3] = "Unauthorized"; $lang->mr->errorLang[4] = 'Permission denied'; $lang->mr->errorLang[5] = 'Another open merge request already exists for this source branch'; $lang->mr->errorLang[6] = 'The source project branch cannot be the same as the target project branch'; $lang->mr->errorLang[7] = "user doesn't have access to repo"; $lang->mr->errorLang[8] = 'The source branch and target branch cannot be merged'; $lang->mr->from = "from"; $lang->mr->to = "to"; $lang->mr->at = "at"; $lang->mr->pipeline = "Pipeline"; $lang->mr->pipelineSuccess = "Success"; $lang->mr->pipelineFailed = "Failed"; $lang->mr->pipelineCanceled = "Canceled"; $lang->mr->pipelineUnknown = "Unknown"; $lang->mr->pipelineStatus = array(); $lang->mr->pipelineStatus['success'] = "success"; $lang->mr->pipelineStatus['failed'] = "failed"; $lang->mr->pipelineStatus['canceled'] = "canceled"; $lang->mr->MRHasConflicts = "Merge Request has a conflict"; $lang->mr->hasConflicts = "There are merge conflicts"; $lang->mr->hasNoChanges = "Branch have no changes"; $lang->mr->hasNoConflict = "Can merge"; $lang->mr->acceptMR = "Accept Merge request "; $lang->mr->mergeFailed = "Unable to merge request, please check the merge request status"; $lang->mr->mergeSuccess = "Merge Request Successfully"; $lang->mr->refreshSuccess = 'Refresh successfully'; $lang->mr->todomessage = "project was assigned to you"; $lang->mr->squashHelp = 'Corresponding git parameters: --squash'; /** * Merge Command Document. * * %s source_project::http_url_to_repo * %s mr::source_branch * %s source_project::path_with_namespace . '-' . mr::source_branch * %s mr::target_branch * %s source_project::path_with_namespace . '-' . mr::source_branch * %s mr::target_branch */ $lang->mr->commandDocument = <<< EOD
Note: This merge request status will be changed automatically after you merged locally.
step 1. Change directory to target project. Fetch and check out the branch for this merge request
git fetch "%s" %s
git checkout -b "%s" FETCH_HEAD
step 2. Review the changes locally. You can use git log to view the changes
step 3. Merge the branch and fix any conflicts that come up
git fetch origin
git checkout "%s"
git merge --no-ff "%s"
step 4. Push the result of the merge to Git
git push origin "%s"