diff options
Diffstat (limited to 'app/views/projects/merge_requests/widget/open/_merge_when_build_succeeds.html.haml')
| -rw-r--r-- | app/views/projects/merge_requests/widget/open/_merge_when_build_succeeds.html.haml | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/app/views/projects/merge_requests/widget/open/_merge_when_build_succeeds.html.haml b/app/views/projects/merge_requests/widget/open/_merge_when_build_succeeds.html.haml index 2168294c683..cd0bae04cd8 100644 --- a/app/views/projects/merge_requests/widget/open/_merge_when_build_succeeds.html.haml +++ b/app/views/projects/merge_requests/widget/open/_merge_when_build_succeeds.html.haml @@ -1,16 +1,16 @@ %h4 - Set by #{link_to_member(@project, @merge_request.merge_user, avatar: true)} - to be merged automatically when the build succeeds. + #{link_to_member(@project, @merge_request.merge_user, avatar: true)} 设置了 + 构建成功时自动合并。 %div - should_remove_source_branch = @merge_request.merge_params["should_remove_source_branch"].present? %p - = succeed '.' do - The changes will be merged into + = succeed '。' do + 变更将被合并到 %span.label-branch= @merge_request.target_branch - if should_remove_source_branch - The source branch will be removed. + 来源分支将被删除。 - else - The source branch will not be removed. + 来源分支将不会删除。 - remove_source_branch_button = @merge_request.can_remove_source_branch?(current_user) && !should_remove_source_branch && @merge_request.merge_user == current_user - user_can_cancel_automatic_merge = @merge_request.can_cancel_merge_when_build_succeeds?(current_user) @@ -19,8 +19,8 @@ - if remove_source_branch_button = link_to merge_namespace_project_merge_request_path(@merge_request.target_project.namespace, @merge_request.target_project, @merge_request, merge_when_build_succeeds: true, should_remove_source_branch: true), remote: true, method: :post, class: "btn btn-grouped btn-primary btn-sm remove_source_branch" do = icon('times') - Remove Source Branch When Merged + 合并时删除来源分支 - if user_can_cancel_automatic_merge = link_to cancel_merge_when_build_succeeds_namespace_project_merge_request_path(@merge_request.target_project.namespace, @merge_request.target_project, @merge_request), remote: true, method: :post, class: "btn btn-grouped btn-warning btn-sm" do - Cancel Automatic Merge + 取消自动合并 |