diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2018-01-30 14:50:17 +0000 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2018-01-30 14:50:17 +0000 |
| commit | 07557a946bac1b596a28293d39e7bd2581ff828b (patch) | |
| tree | f725f935880b122862880f9f18d18fb74a7f758b /spec/tasks/gitlab/task_helpers_spec.rb | |
| parent | bf01452cc361842dab7442a9ad868213d53bd212 (diff) | |
| parent | 03f386c2b20f95272e4846f5ecab54fd8b2566e0 (diff) | |
| download | gitlab-ce-07557a946bac1b596a28293d39e7bd2581ff828b.tar.gz | |
Merge branch 'master' into 'qa-define-selectors'qa-define-selectors
# Conflicts:
# qa/qa/page/group/show.rb
Diffstat (limited to 'spec/tasks/gitlab/task_helpers_spec.rb')
| -rw-r--r-- | spec/tasks/gitlab/task_helpers_spec.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/spec/tasks/gitlab/task_helpers_spec.rb b/spec/tasks/gitlab/task_helpers_spec.rb index fae5ec35c47..e9322ec4931 100644 --- a/spec/tasks/gitlab/task_helpers_spec.rb +++ b/spec/tasks/gitlab/task_helpers_spec.rb @@ -1,5 +1,4 @@ require 'spec_helper' -require 'tasks/gitlab/task_helpers' class TestHelpersTest include Gitlab::TaskHelpers |