summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKamil Trzciński <ayufan@ayufan.eu>2015-12-14 12:08:34 +0000
committerKamil Trzciński <ayufan@ayufan.eu>2015-12-14 12:08:34 +0000
commit73ba411af9f4552e72230d2b9852399e66a23260 (patch)
treec48b51cf209edb021134d2b2000c9027c48d624b
parent1859b1061740fb667449c9e8e457d1c3dd1b3344 (diff)
parentc0ff4fdd99d44e154083242e32207f567374c8b1 (diff)
downloadgitlab-ce-73ba411af9f4552e72230d2b9852399e66a23260.tar.gz
Merge branch 'move-ci-specs-to-admin-features' into 'master'
Move CI admin builds and runners specs to correct directory [ci skip] /cc @grzesiek See merge request !2095
-rw-r--r--spec/features/admin/admin_builds_spec.rb (renamed from spec/features/atom/builds_spec.rb)0
-rw-r--r--spec/features/admin/admin_runners_spec.rb (renamed from spec/features/atom/runners_spec.rb)0
2 files changed, 0 insertions, 0 deletions
diff --git a/spec/features/atom/builds_spec.rb b/spec/features/admin/admin_builds_spec.rb
index 72764b1629d..72764b1629d 100644
--- a/spec/features/atom/builds_spec.rb
+++ b/spec/features/admin/admin_builds_spec.rb
diff --git a/spec/features/atom/runners_spec.rb b/spec/features/admin/admin_runners_spec.rb
index b1f2d401042..b1f2d401042 100644
--- a/spec/features/atom/runners_spec.rb
+++ b/spec/features/admin/admin_runners_spec.rb