Commit c7b31e40 authored by Grzegorz Bizon's avatar Grzegorz Bizon
Browse files

Enable some Rubocop cops related to new lines

parent 86a9d26cb196
...@@ -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 @@ ...@@ -45,7 +45,6 @@
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 @@ def link_to_image(path) ...@@ -47,5 +47,4 @@ def link_to_image(path)
expect(element['src']).to eq '/path/my_image.jpg' expect(element['src']).to eq '/path/my_image.jpg'
end end
end end
end end
...@@ -534,7 +534,6 @@ module Ci ...@@ -534,7 +534,6 @@ module Ci
end end
context 'when also global variables are defined' do context 'when also global variables are defined' do
end end
context 'when syntax is correct' do context 'when syntax is correct' do
......
...@@ -25,7 +25,6 @@ def create_failing_hook(name) ...@@ -25,7 +25,6 @@ def create_failing_hook(name)
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 @@ ...@@ -2,7 +2,6 @@
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') }
......
...@@ -83,6 +83,5 @@ ...@@ -83,6 +83,5 @@
expect(access.can_merge_to_branch?(@branch.name)).to be_falsey expect(access.can_merge_to_branch?(@branch.name)).to be_falsey
end end
end end
end end
end end
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