diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-07-16 11:57:23 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-07-16 11:57:23 +0300 |
| commit | 25af7197ba7357c5a3ca5a0052472a74490e6c63 (patch) | |
| tree | 78ede8181ef2fc244d1df49a72df6fac55982b31 /app | |
| parent | 62563a393fb9402b441666b5b047cbd3c80bcc6b (diff) | |
| parent | 829b20010d0ded17a84355c44047114327248818 (diff) | |
Merge branch 'mk/fix-flaky-protected-branch-expectations' into 'master'
QA: Remove flaky and redundant expectations
Closes #49164
See merge request gitlab-org/gitlab-ce!20616
Diffstat (limited to 'app')
| -rw-r--r-- | app/views/projects/protected_branches/_update_protected_branch.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/protected_branches/shared/_protected_branch.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/projects/protected_branches/_update_protected_branch.html.haml b/app/views/projects/protected_branches/_update_protected_branch.html.haml index f242459f69b..74bfaa9ff80 100644 --- a/app/views/projects/protected_branches/_update_protected_branch.html.haml +++ b/app/views/projects/protected_branches/_update_protected_branch.html.haml @@ -6,5 +6,5 @@ %td = hidden_field_tag "allowed_to_push_#{protected_branch.id}", protected_branch.push_access_levels.first.access_level = dropdown_tag( (protected_branch.push_access_levels.first.humanize || 'Select') , - options: { toggle_class: 'js-allowed-to-push qa-allowed-to-push', dropdown_class: 'dropdown-menu-selectable js-allowed-to-push-container capitalize-header', + options: { toggle_class: 'js-allowed-to-push', dropdown_class: 'dropdown-menu-selectable js-allowed-to-push-container capitalize-header', data: { field_name: "allowed_to_push_#{protected_branch.id}", access_level_id: protected_branch.push_access_levels.first.id }}) diff --git a/app/views/projects/protected_branches/shared/_protected_branch.html.haml b/app/views/projects/protected_branches/shared/_protected_branch.html.haml index 82ef08272d3..05cee483c0e 100644 --- a/app/views/projects/protected_branches/shared/_protected_branch.html.haml +++ b/app/views/projects/protected_branches/shared/_protected_branch.html.haml @@ -2,7 +2,7 @@ %tr.js-protected-branch-edit-form{ data: { url: namespace_project_protected_branch_path(@project.namespace, @project, protected_branch) } } %td - %span.ref-name.qa-protected-branch-name= protected_branch.name + %span.ref-name= protected_branch.name - if @project.root_ref?(protected_branch.name) %span.badge.badge-info.prepend-left-5 default |