Commit 900c67bf authored by Robert Speicher's avatar Robert Speicher

Merge branch 'rubocop/enable-more-cops-for-empty-lines' into 'master'

Enable some Rubocop cops related to new lines

## What does this MR do?

This MR enabled two additional Rubocop cops:

Keeps track of empty lines around block bodies.  
`Style/EmptyLinesAroundBlockBody`

Keeps track of empty lines around method bodies.  
` Style/EmptyLinesAroundMethodBody`

See merge request !5637
parents fa95d9e4 65871dfd
...@@ -149,7 +149,7 @@ Style/EmptyLinesAroundAccessModifier: ...@@ -149,7 +149,7 @@ Style/EmptyLinesAroundAccessModifier:
# Keeps track of empty lines around block bodies. # Keeps track of empty lines around block bodies.
Style/EmptyLinesAroundBlockBody: Style/EmptyLinesAroundBlockBody:
Enabled: false Enabled: true
# Keeps track of empty lines around class bodies. # Keeps track of empty lines around class bodies.
Style/EmptyLinesAroundClassBody: Style/EmptyLinesAroundClassBody:
...@@ -161,7 +161,7 @@ Style/EmptyLinesAroundModuleBody: ...@@ -161,7 +161,7 @@ Style/EmptyLinesAroundModuleBody:
# Keeps track of empty lines around method bodies. # Keeps track of empty lines around method bodies.
Style/EmptyLinesAroundMethodBody: Style/EmptyLinesAroundMethodBody:
Enabled: false Enabled: true
# Avoid the use of END blocks. # Avoid the use of END blocks.
Style/EndBlock: Style/EndBlock:
......
...@@ -45,7 +45,6 @@ feature 'Admin disables Git access protocol', feature: true do ...@@ -45,7 +45,6 @@ feature 'Admin disables Git access protocol', feature: true do
expect(page).to have_content("git clone #{project.ssh_url_to_repo}") expect(page).to have_content("git clone #{project.ssh_url_to_repo}")
expect(page).to have_selector('#clone-dropdown') expect(page).to have_selector('#clone-dropdown')
end end
end end
def visit_project def visit_project
......
...@@ -47,5 +47,4 @@ describe Banzai::Filter::VideoLinkFilter, lib: true do ...@@ -47,5 +47,4 @@ describe Banzai::Filter::VideoLinkFilter, lib: true do
expect(element['src']).to eq '/path/my_image.jpg' expect(element['src']).to eq '/path/my_image.jpg'
end end
end end
end end
...@@ -533,10 +533,6 @@ module Ci ...@@ -533,10 +533,6 @@ module Ci
} }
end end
context 'when also global variables are defined' do
end
context 'when syntax is correct' do context 'when syntax is correct' do
let(:variables) do let(:variables) do
{ VAR1: 'value1', VAR2: 'value2' } { VAR1: 'value1', VAR2: 'value2' }
......
...@@ -25,7 +25,6 @@ describe Gitlab::Git::Hook, lib: true do ...@@ -25,7 +25,6 @@ describe Gitlab::Git::Hook, lib: true do
end end
['pre-receive', 'post-receive', 'update'].each do |hook_name| ['pre-receive', 'post-receive', 'update'].each do |hook_name|
context "when triggering a #{hook_name} hook" do context "when triggering a #{hook_name} hook" do
context "when the hook is successful" do context "when the hook is successful" do
it "returns success with no errors" do it "returns success with no errors" do
......
...@@ -2,7 +2,6 @@ require 'spec_helper' ...@@ -2,7 +2,6 @@ require 'spec_helper'
describe Gitlab::ImportExport::ProjectTreeRestorer, services: true do describe Gitlab::ImportExport::ProjectTreeRestorer, services: true do
describe 'restore project tree' do describe 'restore project tree' do
let(:user) { create(:user) } let(:user) { create(:user) }
let(:namespace) { create(:namespace, owner: user) } let(:namespace) { create(:namespace, owner: user) }
let(:shared) { Gitlab::ImportExport::Shared.new(relative_path: "", project_path: 'path') } let(:shared) { Gitlab::ImportExport::Shared.new(relative_path: "", project_path: 'path') }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment