diff options
| author | Stan Hu <stanhu@gmail.com> | 2019-02-05 14:40:06 -0800 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2019-02-05 14:40:06 -0800 |
| commit | 6b47a29a7e5e7ee219753ad15e1a119b0f44ee44 (patch) | |
| tree | 6f4334006f8b6b58cb2fddc0071b1580292593c6 | |
| parent | 3acc82a8d92d6679f6300105f98b9360fd163934 (diff) | |
| download | gitlab-ce-6b47a29a7e5e7ee219753ad15e1a119b0f44ee44.tar.gz | |
Resolve conflicts in spec/policies/personal_snippet_policy_spec.rb
| -rw-r--r-- | spec/policies/personal_snippet_policy_spec.rb | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/spec/policies/personal_snippet_policy_spec.rb b/spec/policies/personal_snippet_policy_spec.rb index 9496fb4f562..a38e0dbd797 100644 --- a/spec/policies/personal_snippet_policy_spec.rb +++ b/spec/policies/personal_snippet_policy_spec.rb @@ -130,7 +130,6 @@ describe PersonalSnippetPolicy do it do is_expected.to be_disallowed(:read_personal_snippet) is_expected.to be_disallowed(*comment_permissions) -<<<<<<< HEAD is_expected.to be_disallowed(:award_emoji) is_expected.to be_disallowed(*author_permissions) end @@ -142,8 +141,6 @@ describe PersonalSnippetPolicy do it do is_expected.to be_allowed(:read_personal_snippet) is_expected.to be_disallowed(:comment_personal_snippet) -======= ->>>>>>> dev/master is_expected.to be_disallowed(:award_emoji) is_expected.to be_disallowed(*author_permissions) end |