Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
214d1ea9
Commit
214d1ea9
authored
Apr 11, 2021
by
Abdul Wadood
Committed by
Luke Duncalfe
Apr 11, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix RSpec/EmptyLineAfterFinalLetItBe for ee/spec/services/auto_merge
parent
143bbd46
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
2 deletions
+7
-2
.rubocop_manual_todo.yml
.rubocop_manual_todo.yml
+0
-2
ee/changelogs/unreleased/rspec-empty-lines-after-letitbe-ee-spec-auto-merge.yml
...ed/rspec-empty-lines-after-letitbe-ee-spec-auto-merge.yml
+5
-0
ee/spec/services/auto_merge/add_to_merge_train_when_pipeline_succeeds_service_spec.rb
...add_to_merge_train_when_pipeline_succeeds_service_spec.rb
+1
-0
ee/spec/services/auto_merge/merge_train_service_spec.rb
ee/spec/services/auto_merge/merge_train_service_spec.rb
+1
-0
No files found.
.rubocop_manual_todo.yml
View file @
214d1ea9
...
...
@@ -728,8 +728,6 @@ RSpec/EmptyLineAfterFinalLetItBe:
-
ee/spec/services/analytics/devops_adoption/segments/find_or_create_service_spec.rb
-
ee/spec/services/approval_rules/create_service_spec.rb
-
ee/spec/services/audit_event_service_spec.rb
-
ee/spec/services/auto_merge/add_to_merge_train_when_pipeline_succeeds_service_spec.rb
-
ee/spec/services/auto_merge/merge_train_service_spec.rb
-
ee/spec/services/award_emojis/add_service_spec.rb
-
ee/spec/services/award_emojis/destroy_service_spec.rb
-
ee/spec/services/billable_members/destroy_service_spec.rb
...
...
ee/changelogs/unreleased/rspec-empty-lines-after-letitbe-ee-spec-auto-merge.yml
0 → 100644
View file @
214d1ea9
---
title
:
Fix RSpec/EmptyLineAfterFinalLetItBe rubocop offenses in ee/spec/services/auto_merge
merge_request
:
58358
author
:
Abdul Wadood @abdulwd
type
:
fixed
ee/spec/services/auto_merge/add_to_merge_train_when_pipeline_succeeds_service_spec.rb
View file @
214d1ea9
...
...
@@ -5,6 +5,7 @@ require 'spec_helper'
RSpec
.
describe
AutoMerge
::
AddToMergeTrainWhenPipelineSucceedsService
do
let_it_be
(
:project
,
reload:
true
)
{
create
(
:project
,
:repository
)
}
let_it_be
(
:user
)
{
create
(
:user
)
}
let
(
:service
)
{
described_class
.
new
(
project
,
user
)
}
let
(
:merge_request
)
do
...
...
ee/spec/services/auto_merge/merge_train_service_spec.rb
View file @
214d1ea9
...
...
@@ -7,6 +7,7 @@ RSpec.describe AutoMerge::MergeTrainService do
let_it_be
(
:project
)
{
create
(
:project
,
:repository
,
merge_pipelines_enabled:
true
,
merge_trains_enabled:
true
)
}
let_it_be
(
:user
)
{
create
(
:user
)
}
let
(
:service
)
{
described_class
.
new
(
project
,
user
,
params
)
}
let
(
:params
)
{
{}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment