summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2019-06-06 23:49:44 +0000
committerRobert Speicher <rspeicher@gmail.com>2019-06-06 23:49:44 +0000
commit16c735856da67bd6bc7dc7dabe3559661f7291e6 (patch)
tree7c8ee12fbc382113bd170169389d0bc46cfb2d43
parent327ff31ebb853d50b322af544f85d39a0c7c5dea (diff)
parent59f9c5a380aa679b9dccd093f76d7eb7473f872d (diff)
downloadgitlab-ce-16c735856da67bd6bc7dc7dabe3559661f7291e6.tar.gz
Merge branch 'remove-dup-shared-context-folder' into 'master'
Removes duplicated shared_context folder on spec/support See merge request gitlab-org/gitlab-ce!29305
-rw-r--r--spec/support/shared_contexts/policies/project_policy_shared_context.rb (renamed from spec/support/shared_context/policies/project_policy_shared_context.rb)0
1 files changed, 0 insertions, 0 deletions
diff --git a/spec/support/shared_context/policies/project_policy_shared_context.rb b/spec/support/shared_contexts/policies/project_policy_shared_context.rb
index 54d9f5b15f2..54d9f5b15f2 100644
--- a/spec/support/shared_context/policies/project_policy_shared_context.rb
+++ b/spec/support/shared_contexts/policies/project_policy_shared_context.rb