Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilipa Lacerda <filipa@gitlab.com>2018-03-14 22:28:08 +0300
committerJames Lopez <james@jameslopez.es>2018-03-16 12:35:57 +0300
commitcb504c1e8922bfdb1b802ee5edaa1a5e4822f099 (patch)
tree1e8bc16334202a26550ab6483e9a6bf55d7788ed
parentc51304593145485ecebd9158b5a6c3f8e8570514 (diff)
Merge branch 'ci-lint-dispatcher-fix' into 'master'
Change path of CI lints create index.js file Closes #44181 See merge request gitlab-org/gitlab-ce!17751
-rw-r--r--app/assets/javascripts/pages/ci/lints/new/index.js (renamed from app/assets/javascripts/pages/ci/lints/create/index.js)0
-rw-r--r--spec/features/ci_lint_spec.rb1
2 files changed, 1 insertions, 0 deletions
diff --git a/app/assets/javascripts/pages/ci/lints/create/index.js b/app/assets/javascripts/pages/ci/lints/new/index.js
index 8e8a843da0b..8e8a843da0b 100644
--- a/app/assets/javascripts/pages/ci/lints/create/index.js
+++ b/app/assets/javascripts/pages/ci/lints/new/index.js
diff --git a/spec/features/ci_lint_spec.rb b/spec/features/ci_lint_spec.rb
index b1dceec9da8..220b934154e 100644
--- a/spec/features/ci_lint_spec.rb
+++ b/spec/features/ci_lint_spec.rb
@@ -39,6 +39,7 @@ describe 'CI Lint', :js do
it 'displays information about an error' do
expect(page).to have_content('Status: syntax is incorrect')
+ expect(page).to have_selector('.ace_content', text: yaml_content)
end
end