Commit d2d9fb9a authored by Michael Kozono's avatar Michael Kozono

Merge branch 'fix-protected_branches_spec-master' into 'master'

CE Fix protected branch example failing on master

See merge request gitlab-org/gitlab-ce!27332
parents c1ce15d6 cc36212c
- can_admin_project = can?(current_user, :admin_project, @project) - can_admin_project = can?(current_user, :admin_project, @project)
%tr.js-protected-branch-edit-form{ data: { url: namespace_project_protected_branch_path(@project.namespace, @project, protected_branch) } } %tr.qa-protected-branch.js-protected-branch-edit-form{ data: { url: namespace_project_protected_branch_path(@project.namespace, @project, protected_branch) } }
%td %td
%span.ref-name= protected_branch.name %span.ref-name= protected_branch.name
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment