Enable Style/SpaceAfterColon Rubocop cops
This commit is contained in:
parent
9e8fdead17
commit
9798ac77ed
|
@ -532,7 +532,7 @@ Style/SingleLineMethods:
|
||||||
|
|
||||||
# Use spaces after colons.
|
# Use spaces after colons.
|
||||||
Style/SpaceAfterColon:
|
Style/SpaceAfterColon:
|
||||||
Enabled: false
|
Enabled: true
|
||||||
|
|
||||||
# Use spaces after commas.
|
# Use spaces after commas.
|
||||||
Style/SpaceAfterComma:
|
Style/SpaceAfterComma:
|
||||||
|
|
|
@ -25,7 +25,7 @@ module Ci
|
||||||
return render_404 unless @project
|
return render_404 unless @project
|
||||||
|
|
||||||
image = Ci::ImageForBuildService.new.execute(@project, params)
|
image = Ci::ImageForBuildService.new.execute(@project, params)
|
||||||
send_file image.path, filename: image.name, disposition: 'inline', type:"image/svg+xml"
|
send_file image.path, filename: image.name, disposition: 'inline', type: "image/svg+xml"
|
||||||
end
|
end
|
||||||
|
|
||||||
protected
|
protected
|
||||||
|
|
|
@ -15,7 +15,7 @@ module ProjectsHelper
|
||||||
def link_to_member_avatar(author, opts = {})
|
def link_to_member_avatar(author, opts = {})
|
||||||
default_opts = { avatar: true, name: true, size: 16, author_class: 'author', title: ":name" }
|
default_opts = { avatar: true, name: true, size: 16, author_class: 'author', title: ":name" }
|
||||||
opts = default_opts.merge(opts)
|
opts = default_opts.merge(opts)
|
||||||
image_tag(avatar_icon(author, opts[:size]), width: opts[:size], class: "avatar avatar-inline #{"s#{opts[:size]}" if opts[:size]}", alt:'') if opts[:avatar]
|
image_tag(avatar_icon(author, opts[:size]), width: opts[:size], class: "avatar avatar-inline #{"s#{opts[:size]}" if opts[:size]}", alt: '') if opts[:avatar]
|
||||||
end
|
end
|
||||||
|
|
||||||
def link_to_member(project, author, opts = {}, &block)
|
def link_to_member(project, author, opts = {}, &block)
|
||||||
|
@ -27,7 +27,7 @@ module ProjectsHelper
|
||||||
author_html = ""
|
author_html = ""
|
||||||
|
|
||||||
# Build avatar image tag
|
# Build avatar image tag
|
||||||
author_html << image_tag(avatar_icon(author, opts[:size]), width: opts[:size], class: "avatar avatar-inline #{"s#{opts[:size]}" if opts[:size]}", alt:'') if opts[:avatar]
|
author_html << image_tag(avatar_icon(author, opts[:size]), width: opts[:size], class: "avatar avatar-inline #{"s#{opts[:size]}" if opts[:size]}", alt: '') if opts[:avatar]
|
||||||
|
|
||||||
# Build name span tag
|
# Build name span tag
|
||||||
if opts[:by_username]
|
if opts[:by_username]
|
||||||
|
|
|
@ -653,7 +653,7 @@ Rails.application.routes.draw do
|
||||||
get '/wikis/*id', to: 'wikis#show', as: 'wiki', constraints: WIKI_SLUG_ID
|
get '/wikis/*id', to: 'wikis#show', as: 'wiki', constraints: WIKI_SLUG_ID
|
||||||
delete '/wikis/*id', to: 'wikis#destroy', constraints: WIKI_SLUG_ID
|
delete '/wikis/*id', to: 'wikis#destroy', constraints: WIKI_SLUG_ID
|
||||||
put '/wikis/*id', to: 'wikis#update', constraints: WIKI_SLUG_ID
|
put '/wikis/*id', to: 'wikis#update', constraints: WIKI_SLUG_ID
|
||||||
post '/wikis/*id/markdown_preview', to:'wikis#markdown_preview', constraints: WIKI_SLUG_ID, as: 'wiki_markdown_preview'
|
post '/wikis/*id/markdown_preview', to: 'wikis#markdown_preview', constraints: WIKI_SLUG_ID, as: 'wiki_markdown_preview'
|
||||||
end
|
end
|
||||||
|
|
||||||
resource :repository, only: [:show, :create] do
|
resource :repository, only: [:show, :create] do
|
||||||
|
|
|
@ -93,7 +93,7 @@ class Spinach::Features::Groups < Spinach::FeatureSteps
|
||||||
|
|
||||||
step 'I should see new group "Owned" avatar' do
|
step 'I should see new group "Owned" avatar' do
|
||||||
expect(owned_group.avatar).to be_instance_of AvatarUploader
|
expect(owned_group.avatar).to be_instance_of AvatarUploader
|
||||||
expect(owned_group.avatar.url).to eq "/uploads/group/avatar/#{Group.find_by(name:"Owned").id}/banana_sample.gif"
|
expect(owned_group.avatar.url).to eq "/uploads/group/avatar/#{Group.find_by(name: "Owned").id}/banana_sample.gif"
|
||||||
end
|
end
|
||||||
|
|
||||||
step 'I should see the "Remove avatar" button' do
|
step 'I should see the "Remove avatar" button' do
|
||||||
|
|
|
@ -24,7 +24,7 @@ feature 'project import', feature: true, js: true do
|
||||||
visit new_project_path
|
visit new_project_path
|
||||||
|
|
||||||
select2('2', from: '#project_namespace_id')
|
select2('2', from: '#project_namespace_id')
|
||||||
fill_in :project_path, with:'test-project-path', visible: true
|
fill_in :project_path, with: 'test-project-path', visible: true
|
||||||
click_link 'GitLab export'
|
click_link 'GitLab export'
|
||||||
|
|
||||||
expect(page).to have_content('GitLab project export')
|
expect(page).to have_content('GitLab project export')
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
require 'spec_helper'
|
require 'spec_helper'
|
||||||
|
|
||||||
describe Gitlab::ImportExport::Reader, lib: true do
|
describe Gitlab::ImportExport::Reader, lib: true do
|
||||||
let(:shared) { Gitlab::ImportExport::Shared.new(relative_path:'') }
|
let(:shared) { Gitlab::ImportExport::Shared.new(relative_path: '') }
|
||||||
let(:test_config) { 'spec/support/import_export/import_export.yml' }
|
let(:test_config) { 'spec/support/import_export/import_export.yml' }
|
||||||
let(:project_tree_hash) do
|
let(:project_tree_hash) do
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue