diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-04-27 12:35:11 +0300 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2018-04-27 12:35:11 +0300 |
| commit | b51f6e2c214df34a94b9097355775f29b269524b (patch) | |
| tree | b9750c770a743618c42d48365a8a9b6a1e12a172 | |
| parent | a8cb4322a07c2e167d866ed6d106f63c80c3343c (diff) | |
| parent | 40366dd10bef5d85786ab7baa9d813b33d52884b (diff) | |
Merge branch 'qa-fix-static-analysis-jobs' into 'master'
Fix rubocop offense and enable jobs for qa
See merge request gitlab-org/gitlab-ce!18613
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | qa/qa/factory/repository/push.rb | 4 | ||||
| -rw-r--r-- | qa/qa/runtime/key/ecdsa.rb | 1 | ||||
| -rw-r--r-- | qa/qa/runtime/key/ed25519.rb | 1 |
4 files changed, 6 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5bc2f1f3a0f..bb55758ba6f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -110,7 +110,7 @@ stages: # Jobs that only need to pull cache .dedicated-no-docs-pull-cache-job: &dedicated-no-docs-pull-cache-job <<: *dedicated-runner - <<: *except-docs-and-qa + <<: *except-docs <<: *pull-cache dependencies: - setup-test-env diff --git a/qa/qa/factory/repository/push.rb b/qa/qa/factory/repository/push.rb index 01a9d0428ea..795f1f9cb1a 100644 --- a/qa/qa/factory/repository/push.rb +++ b/qa/qa/factory/repository/push.rb @@ -3,7 +3,9 @@ module QA module Repository class Push < Factory::Base attr_accessor :file_name, :file_content, :commit_message, - :branch_name, :new_branch, :remote_branch + :branch_name, :new_branch + + attr_writer :remote_branch dependency Factory::Resource::Project, as: :project do |project| project.name = 'project-with-code' diff --git a/qa/qa/runtime/key/ecdsa.rb b/qa/qa/runtime/key/ecdsa.rb index 71238e4352a..20adad45913 100644 --- a/qa/qa/runtime/key/ecdsa.rb +++ b/qa/qa/runtime/key/ecdsa.rb @@ -1,3 +1,4 @@ +# rubocop:disable Naming/FileName module QA module Runtime module Key diff --git a/qa/qa/runtime/key/ed25519.rb b/qa/qa/runtime/key/ed25519.rb index bd2f2522447..63865c1cee5 100644 --- a/qa/qa/runtime/key/ed25519.rb +++ b/qa/qa/runtime/key/ed25519.rb @@ -1,3 +1,4 @@ +# rubocop:disable Naming/FileName module QA module Runtime module Key |