Enable some Rubocop cops related to new lines

This commit is contained in:
Grzegorz Bizon 2016-08-03 12:01:20 +02:00
parent e63729d9e7
commit c7b31e4029
7 changed files with 2 additions and 8 deletions

View File

@ -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:
# 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:

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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') }

View File

@ -83,6 +83,5 @@ describe Gitlab::UserAccess, lib: true do
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