diff options
| author | Adam Hegyi <ahegyi@gitlab.com> | 2019-06-19 13:39:52 +0000 |
|---|---|---|
| committer | Adam Hegyi <ahegyi@gitlab.com> | 2019-06-19 13:39:52 +0000 |
| commit | e76f12f7e70c5a1d8a30720251ef81a3cacf94d0 (patch) | |
| tree | b9fa92446c43784c24cf3293787cfcb38463726b /spec/policies/project_policy_spec.rb | |
| parent | 86c08225eb60a909701f9dfc6f767311cc2516c0 (diff) | |
| parent | 7fa94651f3ac5e9548091eaa59f44c74ebd58473 (diff) | |
| download | gitlab-ce-e76f12f7e70c5a1d8a30720251ef81a3cacf94d0.tar.gz | |
Merge branch 'master' into '63406-selecting-a-line-in-ci-job-trace-using-triple-click-selects-the-previous-line-also'63406-selecting-a-line-in-ci-job-trace-using-triple-click-selects-the-previous-line-also
# Conflicts:
# spec/lib/gitlab/ci/ansi2html_spec.rb
Diffstat (limited to 'spec/policies/project_policy_spec.rb')
| -rw-r--r-- | spec/policies/project_policy_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/policies/project_policy_spec.rb b/spec/policies/project_policy_spec.rb index 4b723a52b51..fd82150c12a 100644 --- a/spec/policies/project_policy_spec.rb +++ b/spec/policies/project_policy_spec.rb @@ -36,7 +36,7 @@ describe ProjectPolicy do let(:developer_permissions) do %i[ - admin_milestone admin_merge_request update_merge_request create_commit_status + admin_tag admin_milestone admin_merge_request update_merge_request create_commit_status update_commit_status create_build update_build create_pipeline update_pipeline create_merge_request_from create_wiki push_code resolve_note create_container_image update_container_image destroy_container_image |