diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-03-25 03:07:56 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-03-25 03:07:56 +0300 |
| commit | a87f68964ab411b2055891d5f819b635b6d6d85c (patch) | |
| tree | 83e4855a363af6ee26830f6c267ad0eadb5f5d52 | |
| parent | 09b154dce0ccb441241f7923f4f30330e1611517 (diff) | |
Add latest changes from gitlab-org/gitlab@master
| -rw-r--r-- | .gitpod.yml | 2 | ||||
| -rw-r--r-- | .rubocop_todo.yml | 7 | ||||
| -rw-r--r-- | .rubocop_todo/lint/struct_new_override.yml | 6 |
3 files changed, 8 insertions, 7 deletions
diff --git a/.gitpod.yml b/.gitpod.yml index d1a709c55ea..6ddd090f924 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -103,6 +103,8 @@ ports: onOpen: ignore - port: 9000 # object_store / minio onOpen: ignore + - port: 9122 # gitlab-shell + onOpen: ignore vscode: extensions: diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index c3e4bb0c370..665f29a0883 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -107,13 +107,6 @@ Lint/MixedRegexpCaptureTypes: Lint/RedundantCopDisableDirective: Enabled: false -# Offense count: 3 -Lint/StructNewOverride: - Exclude: - - 'app/presenters/sentry_error_presenter.rb' - - 'app/serializers/environment_serializer.rb' - - 'lib/gitlab/ci/pipeline/duration.rb' - # Offense count: 22 # Cop supports --auto-correct. # Configuration parameters: AllowComments. diff --git a/.rubocop_todo/lint/struct_new_override.yml b/.rubocop_todo/lint/struct_new_override.yml new file mode 100644 index 00000000000..db6fe41903b --- /dev/null +++ b/.rubocop_todo/lint/struct_new_override.yml @@ -0,0 +1,6 @@ +--- +Lint/StructNewOverride: + Exclude: + - 'app/presenters/sentry_error_presenter.rb' + - 'app/serializers/environment_serializer.rb' + - 'lib/gitlab/ci/pipeline/duration.rb' |