diff --git a/Gemfile b/Gemfile index 1a574ee1d6d..5c231f8178e 100644 --- a/Gemfile +++ b/Gemfile @@ -345,6 +345,7 @@ gem 'warning', '~> 1.2.0' group :development do gem 'lefthook', '~> 0.7.0', require: false + gem 'rubocop' gem 'solargraph', '~> 0.44.3', require: false gem 'letter_opener_web', '~> 2.0.0' diff --git a/Gemfile.lock b/Gemfile.lock index 9be5324ef11..86e9d18b31d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1644,6 +1644,7 @@ DEPENDENCIES rspec-retry (~> 0.6.1) rspec_junit_formatter rspec_profiling (~> 0.0.6) + rubocop ruby-fogbugz (~> 0.2.1) ruby-magic (~> 0.5) ruby-prof (~> 1.3.0) diff --git a/app/assets/javascripts/editor/schema/ci.json b/app/assets/javascripts/editor/schema/ci.json index fe3229ac91b..620edf3adc7 100644 --- a/app/assets/javascripts/editor/schema/ci.json +++ b/app/assets/javascripts/editor/schema/ci.json @@ -1093,8 +1093,8 @@ "description": "The name of a job to execute when the environment is about to be stopped." }, "action": { - "enum": ["start", "prepare", "stop"], - "description": "Specifies what this job will do. 'start' (default) indicates the job will start the deployment. 'prepare' indicates this will not affect the deployment. 'stop' indicates this will stop the deployment.", + "enum": ["start", "prepare", "stop", "verify"], + "description": "Specifies what this job will do. 'start' (default) indicates the job will start the deployment. 'prepare'/'verify' indicates this will not affect the deployment. 'stop' indicates this will stop the deployment.", "default": "start" }, "auto_stop_in": { diff --git a/app/assets/javascripts/import_entities/import_projects/components/import_projects_table.vue b/app/assets/javascripts/import_entities/import_projects/components/import_projects_table.vue index e0703a77424..0307607321e 100644 --- a/app/assets/javascripts/import_entities/import_projects/components/import_projects_table.vue +++ b/app/assets/javascripts/import_entities/import_projects/components/import_projects_table.vue @@ -1,5 +1,11 @@