summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2016-04-22 15:33:23 +0000
committerRobert Speicher <robert@gitlab.com>2016-04-22 15:33:23 +0000
commit10aaea1c91bbdd65b6afef0ae5981e9aa154ca5c (patch)
tree12cf6303ef4b6efe2d060895b540a4c01c78e030
parentc75b350cefc3491cb59fef05c407a4368c52ccc4 (diff)
parentb711fc0abdd90fec4ff13cd169e9ad9e0aedb525 (diff)
downloadgitlab-ce-10aaea1c91bbdd65b6afef0ae5981e9aa154ca5c.tar.gz
Merge branch 'fix/cherry-pick-specs-location' into 'master'
Move cherry-pick feature specs to proper directory Cherry pick feature specs were located in `spec/feature/project` directory while we have `spec/feature/projects`. Later location is consistent with our namespaces (we have `Projects::` namespace, not `Project::`). See merge request !3875
-rw-r--r--spec/features/projects/commits/cherry_pick_spec.rb (renamed from spec/features/project/commits/cherry_pick_spec.rb)0
1 files changed, 0 insertions, 0 deletions
diff --git a/spec/features/project/commits/cherry_pick_spec.rb b/spec/features/projects/commits/cherry_pick_spec.rb
index 0559b02f321..0559b02f321 100644
--- a/spec/features/project/commits/cherry_pick_spec.rb
+++ b/spec/features/projects/commits/cherry_pick_spec.rb