summaryrefslogtreecommitdiff
path: root/spec/workers
diff options
context:
space:
mode:
authorRobert Speicher <robert@gitlab.com>2017-05-10 21:43:34 +0000
committerRobert Speicher <robert@gitlab.com>2017-05-10 21:43:34 +0000
commitcb2f739d4844af094f62edb4e4dff1b3413a405b (patch)
treec86ea111756a89d84e0601d554ddc78d3be780d0 /spec/workers
parent000045e6647fd8c2e28b1a6dc12ce59f9bfc054f (diff)
parent3db37e05622aa3daa2be41bb9edc486cd2e54bcd (diff)
downloadgitlab-ce-cb2f739d4844af094f62edb4e4dff1b3413a405b.tar.gz
Merge branch '27144-enforce-rubocop-trailing_commas-no_comma-style' into 'master'
Resolve "Use consistent style for trailing commas" Closes #27144 See merge request !11063
Diffstat (limited to 'spec/workers')
-rw-r--r--spec/workers/git_garbage_collect_worker_spec.rb2
-rw-r--r--spec/workers/repository_check/clear_worker_spec.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/spec/workers/git_garbage_collect_worker_spec.rb b/spec/workers/git_garbage_collect_worker_spec.rb
index 7a590f64e3c..8c5303b61cc 100644
--- a/spec/workers/git_garbage_collect_worker_spec.rb
+++ b/spec/workers/git_garbage_collect_worker_spec.rb
@@ -105,7 +105,7 @@ describe GitGarbageCollectWorker do
author: Gitlab::Git.committer_hash(email: 'foo@bar', name: 'baz'),
committer: Gitlab::Git.committer_hash(email: 'foo@bar', name: 'baz'),
tree: old_commit.tree,
- parents: [old_commit],
+ parents: [old_commit]
)
GitOperationService.new(nil, project.repository).send(
:update_ref,
diff --git a/spec/workers/repository_check/clear_worker_spec.rb b/spec/workers/repository_check/clear_worker_spec.rb
index a3b70c74787..3b1a64c5057 100644
--- a/spec/workers/repository_check/clear_worker_spec.rb
+++ b/spec/workers/repository_check/clear_worker_spec.rb
@@ -5,7 +5,7 @@ describe RepositoryCheck::ClearWorker do
project = create(:empty_project)
project.update_columns(
last_repository_check_failed: true,
- last_repository_check_at: Time.now,
+ last_repository_check_at: Time.now
)
described_class.new.perform