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:
authorKamil TrzciƄski <ayufan@ayufan.eu>2019-06-18 13:36:07 +0300
committerGrzegorz Bizon <grzegorz@gitlab.com>2019-06-18 13:36:07 +0300
commit505d71ec88e04f649251b3848a094a9e5ab0f8d5 (patch)
tree9e823a5fa17771ec01b3e0cb33b6283d217dd12e /spec/controllers
parentc167cc58d3efe2bf1d8f9ccb1a58d7819fef1901 (diff)
Introduce default: for gitlab-ci.yml
This moves all existing `image/services/before_script/variables` into `default:`. This allows us to easily add a default and top-level entries. `default`: is keep backward compatible: to be considered to be job if `default:script:` is specified. This behavior should be removed. All existing `image/services/before_script/variables` are properly handled in root context.
Diffstat (limited to 'spec/controllers')
-rw-r--r--spec/controllers/projects/ci/lints_controller_spec.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/controllers/projects/ci/lints_controller_spec.rb b/spec/controllers/projects/ci/lints_controller_spec.rb
index cc6ac83ca38..96e82b7086c 100644
--- a/spec/controllers/projects/ci/lints_controller_spec.rb
+++ b/spec/controllers/projects/ci/lints_controller_spec.rb
@@ -107,7 +107,7 @@ describe Projects::Ci::LintsController do
end
it 'assigns errors' do
- expect(assigns[:error]).to eq('jobs:rubocop config contains unknown keys: scriptt')
+ expect(assigns[:error]).to eq('root config contains unknown keys: rubocop')
end
end