diff options
| author | Ruben Davila <rdavila84@gmail.com> | 2017-06-19 15:26:28 -0500 |
|---|---|---|
| committer | Ruben Davila <rdavila84@gmail.com> | 2017-06-19 15:26:28 -0500 |
| commit | 9a05850d4dfd3f4a5571e516e0da8fa402192df4 (patch) | |
| tree | 465059484db63470af0c018242270e5c288e7286 /app/views/projects/commit | |
| parent | dbfafd442ee863e6614d0f6765285fcd06f3d843 (diff) | |
| download | gitlab-ce-9a05850d4dfd3f4a5571e516e0da8fa402192df4.tar.gz | |
Fix some incorrect usage of translation helpersfix-i18n-helpers
Conflicts:
app/views/projects/pipeline_schedules/_form.html.haml
Diffstat (limited to 'app/views/projects/commit')
| -rw-r--r-- | app/views/projects/commit/_change.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/commit/_change.html.haml b/app/views/projects/commit/_change.html.haml index 208d4908721..2267f123e38 100644 --- a/app/views/projects/commit/_change.html.haml +++ b/app/views/projects/commit/_change.html.haml @@ -22,7 +22,7 @@ = label_tag 'start_branch', branch_label, class: 'control-label' .col-sm-10 = hidden_field_tag :start_branch, @project.default_branch, id: 'start_branch' - = dropdown_tag(@project.default_branch, options: { title: n_("BranchSwitcherTitle|Switch branch"), filter: true, placeholder: n_("BranchSwitcherPlaceholder|Search branches"), toggle_class: 'js-project-refs-dropdown dynamic', dropdown_class: 'dropdown-menu-selectable', data: { field_name: "start_branch", selected: @project.default_branch, start_branch: @project.default_branch, refs_url: namespace_project_branches_path(@project.namespace, @project), submit_form_on_click: false } }) + = dropdown_tag(@project.default_branch, options: { title: s_("BranchSwitcherTitle|Switch branch"), filter: true, placeholder: s_("BranchSwitcherPlaceholder|Search branches"), toggle_class: 'js-project-refs-dropdown dynamic', dropdown_class: 'dropdown-menu-selectable', data: { field_name: "start_branch", selected: @project.default_branch, start_branch: @project.default_branch, refs_url: namespace_project_branches_path(@project.namespace, @project), submit_form_on_click: false } }) - if can?(current_user, :push_code, @project) = render 'shared/new_merge_request_checkbox' |