Enable the Style/TrailingCommaInLiteral cop
Use the EnforcedStyleForMultiline: no_comma option. Signed-off-by: Rémy Coutable <remy@rymai.me>
This commit is contained in:
parent
566ee14516
commit
d40e1f547e
|
@ -494,7 +494,8 @@ Style/TrailingBlankLines:
|
|||
|
||||
# This cop checks for trailing comma in array and hash literals.
|
||||
Style/TrailingCommaInLiteral:
|
||||
Enabled: false
|
||||
Enabled: true
|
||||
EnforcedStyleForMultiline: no_comma
|
||||
|
||||
# Checks for %W when interpolation is not needed.
|
||||
Style/UnneededCapitalW:
|
||||
|
|
|
@ -41,7 +41,7 @@ class AutocompleteController < ApplicationController
|
|||
|
||||
no_project = {
|
||||
id: 0,
|
||||
name_with_namespace: 'No project',
|
||||
name_with_namespace: 'No project'
|
||||
}
|
||||
projects.unshift(no_project) unless params[:offset_id].present?
|
||||
|
||||
|
|
|
@ -23,7 +23,7 @@ module LfsRequest
|
|||
render(
|
||||
json: {
|
||||
message: 'Git LFS is not enabled on this GitLab server, contact your admin.',
|
||||
documentation_url: help_url,
|
||||
documentation_url: help_url
|
||||
},
|
||||
status: 501
|
||||
)
|
||||
|
@ -48,7 +48,7 @@ module LfsRequest
|
|||
render(
|
||||
json: {
|
||||
message: 'Access forbidden. Check your access level.',
|
||||
documentation_url: help_url,
|
||||
documentation_url: help_url
|
||||
},
|
||||
content_type: "application/vnd.git-lfs+json",
|
||||
status: 403
|
||||
|
@ -59,7 +59,7 @@ module LfsRequest
|
|||
render(
|
||||
json: {
|
||||
message: 'Not found.',
|
||||
documentation_url: help_url,
|
||||
documentation_url: help_url
|
||||
},
|
||||
content_type: "application/vnd.git-lfs+json",
|
||||
status: 404
|
||||
|
|
|
@ -5,7 +5,7 @@ class HealthController < ActionController::Base
|
|||
CHECKS = [
|
||||
Gitlab::HealthChecks::DbCheck,
|
||||
Gitlab::HealthChecks::RedisCheck,
|
||||
Gitlab::HealthChecks::FsShardsCheck,
|
||||
Gitlab::HealthChecks::FsShardsCheck
|
||||
].freeze
|
||||
|
||||
def readiness
|
||||
|
|
|
@ -4,7 +4,7 @@ class JwtController < ApplicationController
|
|||
before_action :authenticate_project_or_user
|
||||
|
||||
SERVICES = {
|
||||
Auth::ContainerRegistryAuthenticationService::AUDIENCE => Auth::ContainerRegistryAuthenticationService,
|
||||
Auth::ContainerRegistryAuthenticationService::AUDIENCE => Auth::ContainerRegistryAuthenticationService
|
||||
}.freeze
|
||||
|
||||
def auth
|
||||
|
|
|
@ -209,7 +209,7 @@ class Projects::IssuesController < Projects::ApplicationController
|
|||
description_text: @issue.description,
|
||||
task_status: @issue.task_status,
|
||||
issue_number: @issue.iid,
|
||||
updated_at: @issue.updated_at,
|
||||
updated_at: @issue.updated_at
|
||||
}
|
||||
end
|
||||
|
||||
|
|
|
@ -22,7 +22,7 @@ class Projects::LfsApiController < Projects::GitHttpClientController
|
|||
render(
|
||||
json: {
|
||||
message: 'Server supports batch API only, please update your Git LFS client to version 1.0.1 and up.',
|
||||
documentation_url: "#{Gitlab.config.gitlab.url}/help",
|
||||
documentation_url: "#{Gitlab.config.gitlab.url}/help"
|
||||
},
|
||||
status: 501
|
||||
)
|
||||
|
@ -55,7 +55,7 @@ class Projects::LfsApiController < Projects::GitHttpClientController
|
|||
else
|
||||
object[:error] = {
|
||||
code: 404,
|
||||
message: "Object does not exist on the server or you don't have permissions to access it",
|
||||
message: "Object does not exist on the server or you don't have permissions to access it"
|
||||
}
|
||||
end
|
||||
end
|
||||
|
|
|
@ -44,7 +44,7 @@ class Projects::PipelinesController < Projects::ApplicationController
|
|||
all: @pipelines_count,
|
||||
running: @running_count,
|
||||
pending: @pending_count,
|
||||
finished: @finished_count,
|
||||
finished: @finished_count
|
||||
}
|
||||
}
|
||||
end
|
||||
|
|
|
@ -48,7 +48,7 @@ class Projects::TreeController < Projects::ApplicationController
|
|||
@dir_name = File.join(@path, params[:dir_name])
|
||||
@commit_params = {
|
||||
file_path: @dir_name,
|
||||
commit_message: params[:commit_message],
|
||||
commit_message: params[:commit_message]
|
||||
}
|
||||
end
|
||||
end
|
||||
|
|
|
@ -220,7 +220,7 @@ class ProjectsController < Projects::ApplicationController
|
|||
branches = BranchesFinder.new(@repository, params).execute.map(&:name)
|
||||
|
||||
options = {
|
||||
'Branches' => branches.take(100),
|
||||
'Branches' => branches.take(100)
|
||||
}
|
||||
|
||||
unless @repository.tag_count.zero?
|
||||
|
|
|
@ -98,7 +98,7 @@ module DiffHelper
|
|||
[
|
||||
content_tag(:span, link_to(truncate(blob.name, length: 40), tree)),
|
||||
'@',
|
||||
content_tag(:span, commit_id, class: 'monospace'),
|
||||
content_tag(:span, commit_id, class: 'monospace')
|
||||
].join(' ').html_safe
|
||||
end
|
||||
|
||||
|
|
|
@ -12,7 +12,7 @@ module EmailsHelper
|
|||
"action" => {
|
||||
"@type" => "ViewAction",
|
||||
"name" => name,
|
||||
"url" => url,
|
||||
"url" => url
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -41,7 +41,7 @@ module EventsHelper
|
|||
link_opts = {
|
||||
class: "event-filter-link",
|
||||
id: "#{key}_event_filter",
|
||||
title: "Filter by #{tooltip.downcase}",
|
||||
title: "Filter by #{tooltip.downcase}"
|
||||
}
|
||||
|
||||
content_tag :li, class: active do
|
||||
|
|
|
@ -10,7 +10,7 @@ module ExploreHelper
|
|||
personal: params[:personal],
|
||||
archived: params[:archived],
|
||||
shared: params[:shared],
|
||||
namespace_id: params[:namespace_id],
|
||||
namespace_id: params[:namespace_id]
|
||||
}
|
||||
|
||||
options = exist_opts.merge(options).delete_if { |key, value| value.blank? }
|
||||
|
|
|
@ -32,7 +32,7 @@ module MarkupHelper
|
|||
context = {
|
||||
project: @project,
|
||||
current_user: (current_user if defined?(current_user)),
|
||||
pipeline: :single_line,
|
||||
pipeline: :single_line
|
||||
}
|
||||
gfm_body = Banzai.render(body, context)
|
||||
|
||||
|
|
|
@ -54,7 +54,7 @@ module MergeRequestsHelper
|
|||
source_project_id: merge_request.source_project_id,
|
||||
target_project_id: merge_request.target_project_id,
|
||||
source_branch: merge_request.source_branch,
|
||||
target_branch: merge_request.target_branch,
|
||||
target_branch: merge_request.target_branch
|
||||
},
|
||||
change_branches: true
|
||||
)
|
||||
|
|
|
@ -19,7 +19,7 @@ module NotesHelper
|
|||
id: noteable.id,
|
||||
class: noteable.class.name,
|
||||
resources: noteable.class.table_name,
|
||||
project_id: noteable.project.id,
|
||||
project_id: noteable.project.id
|
||||
}.to_json
|
||||
end
|
||||
|
||||
|
@ -34,7 +34,7 @@ module NotesHelper
|
|||
|
||||
data = {
|
||||
line_code: line_code,
|
||||
line_type: line_type,
|
||||
line_type: line_type
|
||||
}
|
||||
|
||||
if @use_legacy_diff_notes
|
||||
|
|
|
@ -42,7 +42,7 @@ module SearchHelper
|
|||
{ category: "Settings", label: "User settings", url: profile_path },
|
||||
{ category: "Settings", label: "SSH Keys", url: profile_keys_path },
|
||||
{ category: "Settings", label: "Dashboard", url: root_path },
|
||||
{ category: "Settings", label: "Admin Section", url: admin_root_path },
|
||||
{ category: "Settings", label: "Admin Section", url: admin_root_path }
|
||||
]
|
||||
end
|
||||
|
||||
|
@ -57,7 +57,7 @@ module SearchHelper
|
|||
{ category: "Help", label: "SSH Keys Help", url: help_page_path("ssh/README") },
|
||||
{ category: "Help", label: "System Hooks Help", url: help_page_path("system_hooks/system_hooks") },
|
||||
{ category: "Help", label: "Webhooks Help", url: help_page_path("user/project/integrations/webhooks") },
|
||||
{ category: "Help", label: "Workflow Help", url: help_page_path("workflow/README") },
|
||||
{ category: "Help", label: "Workflow Help", url: help_page_path("workflow/README") }
|
||||
]
|
||||
end
|
||||
|
||||
|
@ -76,7 +76,7 @@ module SearchHelper
|
|||
{ category: "Current Project", label: "Milestones", url: namespace_project_milestones_path(@project.namespace, @project) },
|
||||
{ category: "Current Project", label: "Snippets", url: namespace_project_snippets_path(@project.namespace, @project) },
|
||||
{ category: "Current Project", label: "Members", url: namespace_project_settings_members_path(@project.namespace, @project) },
|
||||
{ category: "Current Project", label: "Wiki", url: namespace_project_wikis_path(@project.namespace, @project) },
|
||||
{ category: "Current Project", label: "Wiki", url: namespace_project_wikis_path(@project.namespace, @project) }
|
||||
]
|
||||
else
|
||||
[]
|
||||
|
|
|
@ -67,7 +67,7 @@ module SelectsHelper
|
|||
current_user: opts[:current_user] || false,
|
||||
"push-code-to-protected-branches" => opts[:push_code_to_protected_branches],
|
||||
author_id: opts[:author_id] || '',
|
||||
skip_users: opts[:skip_users] ? opts[:skip_users].map(&:id) : nil,
|
||||
skip_users: opts[:skip_users] ? opts[:skip_users].map(&:id) : nil
|
||||
}
|
||||
end
|
||||
end
|
||||
|
|
|
@ -58,7 +58,7 @@ module SortingHelper
|
|||
sort_value_due_date_soon => sort_title_due_date_soon,
|
||||
sort_value_due_date_later => sort_title_due_date_later,
|
||||
sort_value_start_date_soon => sort_title_start_date_soon,
|
||||
sort_value_start_date_later => sort_title_start_date_later,
|
||||
sort_value_start_date_later => sort_title_start_date_later
|
||||
}
|
||||
end
|
||||
|
||||
|
|
|
@ -63,7 +63,7 @@ module TodosHelper
|
|||
project_id: params[:project_id],
|
||||
author_id: params[:author_id],
|
||||
type: params[:type],
|
||||
action_id: params[:action_id],
|
||||
action_id: params[:action_id]
|
||||
}
|
||||
end
|
||||
|
||||
|
|
|
@ -33,7 +33,7 @@ class Blob < SimpleDelegator
|
|||
BlobViewer::PDF,
|
||||
|
||||
BlobViewer::BinarySTL,
|
||||
BlobViewer::TextSTL,
|
||||
BlobViewer::TextSTL
|
||||
].freeze
|
||||
|
||||
BINARY_VIEWERS = RICH_VIEWERS.select(&:binary?).freeze
|
||||
|
|
|
@ -49,7 +49,7 @@ class Commit
|
|||
def max_diff_options
|
||||
{
|
||||
max_files: DIFF_HARD_LIMIT_FILES,
|
||||
max_lines: DIFF_HARD_LIMIT_LINES,
|
||||
max_lines: DIFF_HARD_LIMIT_LINES
|
||||
}
|
||||
end
|
||||
|
||||
|
|
|
@ -62,7 +62,7 @@ class Environment < ActiveRecord::Base
|
|||
def predefined_variables
|
||||
[
|
||||
{ key: 'CI_ENVIRONMENT_NAME', value: name, public: true },
|
||||
{ key: 'CI_ENVIRONMENT_SLUG', value: slug, public: true },
|
||||
{ key: 'CI_ENVIRONMENT_SLUG', value: slug, public: true }
|
||||
]
|
||||
end
|
||||
|
||||
|
|
|
@ -31,7 +31,7 @@ class WebHook < ActiveRecord::Base
|
|||
post_url = url.gsub("#{parsed_url.userinfo}@", '')
|
||||
auth = {
|
||||
username: CGI.unescape(parsed_url.user),
|
||||
password: CGI.unescape(parsed_url.password),
|
||||
password: CGI.unescape(parsed_url.password)
|
||||
}
|
||||
response = WebHook.post(post_url,
|
||||
body: data.to_json,
|
||||
|
|
|
@ -967,7 +967,7 @@ class Project < ActiveRecord::Base
|
|||
namespace: namespace.name,
|
||||
visibility_level: visibility_level,
|
||||
path_with_namespace: path_with_namespace,
|
||||
default_branch: default_branch,
|
||||
default_branch: default_branch
|
||||
}
|
||||
|
||||
# Backward compatibility
|
||||
|
|
|
@ -52,7 +52,7 @@ class BambooService < CiService
|
|||
placeholder: 'Bamboo build plan key like KEY' },
|
||||
{ type: 'text', name: 'username',
|
||||
placeholder: 'A user with API access, if applicable' },
|
||||
{ type: 'password', name: 'password' },
|
||||
{ type: 'password', name: 'password' }
|
||||
]
|
||||
end
|
||||
|
||||
|
|
|
@ -39,7 +39,7 @@ class ChatNotificationService < Service
|
|||
{ type: 'text', name: 'webhook', placeholder: "e.g. #{webhook_placeholder}" },
|
||||
{ type: 'text', name: 'username', placeholder: 'e.g. GitLab' },
|
||||
{ type: 'checkbox', name: 'notify_only_broken_pipelines' },
|
||||
{ type: 'checkbox', name: 'notify_only_default_branch' },
|
||||
{ type: 'checkbox', name: 'notify_only_default_branch' }
|
||||
]
|
||||
end
|
||||
|
||||
|
|
|
@ -47,7 +47,7 @@ class EmailsOnPushService < Service
|
|||
help: "Send notifications from the committer's email address if the domain is part of the domain GitLab is running on (e.g. #{domains})." },
|
||||
{ type: 'checkbox', name: 'disable_diffs', title: "Disable code diffs",
|
||||
help: "Don't include possibly sensitive code diffs in notification body." },
|
||||
{ type: 'textarea', name: 'recipients', placeholder: 'Emails separated by whitespace' },
|
||||
{ type: 'textarea', name: 'recipients', placeholder: 'Emails separated by whitespace' }
|
||||
]
|
||||
end
|
||||
end
|
||||
|
|
|
@ -19,7 +19,7 @@ class ExternalWikiService < Service
|
|||
|
||||
def fields
|
||||
[
|
||||
{ type: 'text', name: 'external_wiki_url', placeholder: 'The URL of the external Wiki' },
|
||||
{ type: 'text', name: 'external_wiki_url', placeholder: 'The URL of the external Wiki' }
|
||||
]
|
||||
end
|
||||
|
||||
|
|
|
@ -41,7 +41,7 @@ class HipchatService < Service
|
|||
placeholder: 'Leave blank for default (v2)' },
|
||||
{ type: 'text', name: 'server',
|
||||
placeholder: 'Leave blank for default. https://hipchat.example.com' },
|
||||
{ type: 'checkbox', name: 'notify_only_broken_pipelines' },
|
||||
{ type: 'checkbox', name: 'notify_only_broken_pipelines' }
|
||||
]
|
||||
end
|
||||
|
||||
|
|
|
@ -58,7 +58,7 @@ class IrkerService < Service
|
|||
' want to use a password, you have to omit the "#" on the channel). If you ' \
|
||||
' specify a default IRC URI to prepend before each recipient, you can just ' \
|
||||
' give a channel name.' },
|
||||
{ type: 'checkbox', name: 'colorize_messages' },
|
||||
{ type: 'checkbox', name: 'colorize_messages' }
|
||||
]
|
||||
end
|
||||
|
||||
|
|
|
@ -149,7 +149,7 @@ class JiraService < IssueTrackerService
|
|||
data = {
|
||||
user: {
|
||||
name: author.name,
|
||||
url: resource_url(user_path(author)),
|
||||
url: resource_url(user_path(author))
|
||||
},
|
||||
project: {
|
||||
name: self.project.path_with_namespace,
|
||||
|
|
|
@ -73,7 +73,7 @@ class KubernetesService < DeploymentService
|
|||
{ type: 'textarea',
|
||||
name: 'ca_pem',
|
||||
title: 'Custom CA bundle',
|
||||
placeholder: 'Certificate Authority bundle (PEM format)' },
|
||||
placeholder: 'Certificate Authority bundle (PEM format)' }
|
||||
]
|
||||
end
|
||||
|
||||
|
|
|
@ -35,7 +35,7 @@ class MicrosoftTeamsService < ChatNotificationService
|
|||
[
|
||||
{ type: 'text', name: 'webhook', placeholder: "e.g. #{webhook_placeholder}" },
|
||||
{ type: 'checkbox', name: 'notify_only_broken_pipelines' },
|
||||
{ type: 'checkbox', name: 'notify_only_default_branch' },
|
||||
{ type: 'checkbox', name: 'notify_only_default_branch' }
|
||||
]
|
||||
end
|
||||
|
||||
|
|
|
@ -21,7 +21,7 @@ class MockCiService < CiService
|
|||
[
|
||||
{ type: 'text',
|
||||
name: 'mock_service_url',
|
||||
placeholder: 'http://localhost:4004' },
|
||||
placeholder: 'http://localhost:4004' }
|
||||
]
|
||||
end
|
||||
|
||||
|
|
|
@ -55,7 +55,7 @@ class PipelinesEmailService < Service
|
|||
name: 'recipients',
|
||||
placeholder: 'Emails separated by comma' },
|
||||
{ type: 'checkbox',
|
||||
name: 'notify_only_broken_pipelines' },
|
||||
name: 'notify_only_broken_pipelines' }
|
||||
]
|
||||
end
|
||||
|
||||
|
|
|
@ -55,7 +55,7 @@ class PushoverService < Service
|
|||
['Pushover Echo (long)', 'echo'],
|
||||
['Up Down (long)', 'updown'],
|
||||
['None (silent)', 'none']
|
||||
] },
|
||||
] }
|
||||
]
|
||||
end
|
||||
|
||||
|
|
|
@ -55,7 +55,7 @@ class TeamcityService < CiService
|
|||
placeholder: 'Build configuration ID' },
|
||||
{ type: 'text', name: 'username',
|
||||
placeholder: 'A user with permissions to trigger a manual build' },
|
||||
{ type: 'password', name: 'password' },
|
||||
{ type: 'password', name: 'password' }
|
||||
]
|
||||
end
|
||||
|
||||
|
@ -78,7 +78,7 @@ class TeamcityService < CiService
|
|||
|
||||
auth = {
|
||||
username: username,
|
||||
password: password,
|
||||
password: password
|
||||
}
|
||||
|
||||
branch = Gitlab::Git.ref_name(data[:ref])
|
||||
|
|
|
@ -16,7 +16,7 @@ class AkismetService
|
|||
created_at: DateTime.now,
|
||||
author: owner.name,
|
||||
author_email: owner.email,
|
||||
referrer: options[:referrer],
|
||||
referrer: options[:referrer]
|
||||
}
|
||||
|
||||
begin
|
||||
|
|
|
@ -8,7 +8,7 @@ class AuditEventService
|
|||
with: @details[:with],
|
||||
target_id: @author.id,
|
||||
target_type: 'User',
|
||||
target_details: @author.name,
|
||||
target_details: @author.name
|
||||
}
|
||||
|
||||
self
|
||||
|
|
|
@ -27,7 +27,7 @@ module Projects
|
|||
{
|
||||
domain: domain.domain,
|
||||
certificate: domain.certificate,
|
||||
key: domain.key,
|
||||
key: domain.key
|
||||
}
|
||||
end
|
||||
end
|
||||
|
|
|
@ -113,7 +113,7 @@ class SystemHooksService
|
|||
user_name: model.user.name,
|
||||
user_email: model.user.email,
|
||||
user_id: model.user.id,
|
||||
group_access: model.human_access,
|
||||
group_access: model.human_access
|
||||
}
|
||||
end
|
||||
end
|
||||
|
|
|
@ -23,7 +23,7 @@ if app.config.serve_static_files
|
|||
host: dev_server.host,
|
||||
port: dev_server.port,
|
||||
manifest_host: dev_server.host,
|
||||
manifest_port: dev_server.port,
|
||||
manifest_port: dev_server.port
|
||||
}
|
||||
|
||||
if Rails.env.development?
|
||||
|
|
|
@ -69,7 +69,7 @@ class RemoveRedundantIndexes < ActiveRecord::Migration
|
|||
[:namespaces, 'index_namespaces_on_created_at_and_id'],
|
||||
[:notes, 'index_notes_on_created_at_and_id'],
|
||||
[:projects, 'index_projects_on_created_at_and_id'],
|
||||
[:users, 'index_users_on_created_at_and_id'],
|
||||
[:users, 'index_users_on_created_at_and_id']
|
||||
]
|
||||
|
||||
transaction do
|
||||
|
|
|
@ -25,7 +25,7 @@ class AddMarkdownCacheColumns < ActiveRecord::Migration
|
|||
notes: [:note],
|
||||
projects: [:description],
|
||||
releases: [:description],
|
||||
snippets: [:title, :content],
|
||||
snippets: [:title, :content]
|
||||
}.freeze
|
||||
|
||||
def change
|
||||
|
|
|
@ -90,7 +90,7 @@ module API
|
|||
{
|
||||
api_version: API.version,
|
||||
gitlab_version: Gitlab::VERSION,
|
||||
gitlab_rev: Gitlab::REVISION,
|
||||
gitlab_rev: Gitlab::REVISION
|
||||
}
|
||||
end
|
||||
|
||||
|
|
|
@ -226,7 +226,7 @@ module API
|
|||
:shared_runners_enabled,
|
||||
:snippets_enabled,
|
||||
:visibility,
|
||||
:wiki_enabled,
|
||||
:wiki_enabled
|
||||
]
|
||||
optional :name, type: String, desc: 'The name of the project'
|
||||
optional :default_branch, type: String, desc: 'The default branch of the project'
|
||||
|
|
|
@ -356,7 +356,7 @@ module API
|
|||
name: :ca_pem,
|
||||
type: String,
|
||||
desc: 'A custom certificate authority bundle to verify the Kubernetes cluster with (PEM format)'
|
||||
},
|
||||
}
|
||||
],
|
||||
'mattermost-slash-commands' => [
|
||||
{
|
||||
|
@ -559,7 +559,7 @@ module API
|
|||
SlackService,
|
||||
MattermostService,
|
||||
MicrosoftTeamsService,
|
||||
TeamcityService,
|
||||
TeamcityService
|
||||
]
|
||||
|
||||
if Rails.env.development?
|
||||
|
@ -577,7 +577,7 @@ module API
|
|||
service_classes += [
|
||||
MockCiService,
|
||||
MockDeploymentService,
|
||||
MockMonitoringService,
|
||||
MockMonitoringService
|
||||
]
|
||||
end
|
||||
|
||||
|
|
|
@ -5,7 +5,7 @@ module API
|
|||
subscribable_types = {
|
||||
'merge_requests' => proc { |id| find_merge_request_with_access(id, :update_merge_request) },
|
||||
'issues' => proc { |id| find_project_issue(id) },
|
||||
'labels' => proc { |id| find_project_label(id) },
|
||||
'labels' => proc { |id| find_project_label(id) }
|
||||
}
|
||||
|
||||
params do
|
||||
|
|
|
@ -377,7 +377,7 @@ module API
|
|||
name: :ca_pem,
|
||||
type: String,
|
||||
desc: 'A custom certificate authority bundle to verify the Kubernetes cluster with (PEM format)'
|
||||
},
|
||||
}
|
||||
],
|
||||
'mattermost-slash-commands' => [
|
||||
{
|
||||
|
|
|
@ -7,7 +7,7 @@ module API
|
|||
'merge_request' => proc { |id| find_merge_request_with_access(id, :update_merge_request) },
|
||||
'merge_requests' => proc { |id| find_merge_request_with_access(id, :update_merge_request) },
|
||||
'issues' => proc { |id| find_project_issue(id) },
|
||||
'labels' => proc { |id| find_project_label(id) },
|
||||
'labels' => proc { |id| find_project_label(id) }
|
||||
}
|
||||
|
||||
params do
|
||||
|
|
|
@ -20,7 +20,7 @@ module Ci
|
|||
italic: 0x02,
|
||||
underline: 0x04,
|
||||
conceal: 0x08,
|
||||
cross: 0x10,
|
||||
cross: 0x10
|
||||
}.freeze
|
||||
|
||||
def self.convert(ansi, state = nil)
|
||||
|
|
|
@ -70,7 +70,7 @@ module Ci
|
|||
cache: job[:cache],
|
||||
dependencies: job[:dependencies],
|
||||
after_script: job[:after_script],
|
||||
environment: job[:environment],
|
||||
environment: job[:environment]
|
||||
}.compact
|
||||
}
|
||||
end
|
||||
|
|
|
@ -32,7 +32,7 @@ module Gitlab
|
|||
"Guest" => GUEST,
|
||||
"Reporter" => REPORTER,
|
||||
"Developer" => DEVELOPER,
|
||||
"Master" => MASTER,
|
||||
"Master" => MASTER
|
||||
}
|
||||
end
|
||||
|
||||
|
@ -47,7 +47,7 @@ module Gitlab
|
|||
guest: GUEST,
|
||||
reporter: REPORTER,
|
||||
developer: DEVELOPER,
|
||||
master: MASTER,
|
||||
master: MASTER
|
||||
}
|
||||
end
|
||||
|
||||
|
@ -60,7 +60,7 @@ module Gitlab
|
|||
"Not protected: Both developers and masters can push new commits, force push, or delete the branch." => PROTECTION_NONE,
|
||||
"Protected against pushes: Developers cannot push new commits, but are allowed to accept merge requests to the branch." => PROTECTION_DEV_CAN_MERGE,
|
||||
"Partially protected: Developers can push new commits, but cannot force push or delete the branch. Masters can do all of those." => PROTECTION_DEV_CAN_PUSH,
|
||||
"Fully protected: Developers cannot push new commits, force push, or delete the branch. Only masters can do any of those." => PROTECTION_FULL,
|
||||
"Fully protected: Developers cannot push new commits, force push, or delete the branch. Only masters can do any of those." => PROTECTION_FULL
|
||||
}
|
||||
end
|
||||
|
||||
|
|
|
@ -5,7 +5,7 @@ module Gitlab
|
|||
Gitlab::ChatCommands::IssueShow,
|
||||
Gitlab::ChatCommands::IssueNew,
|
||||
Gitlab::ChatCommands::IssueSearch,
|
||||
Gitlab::ChatCommands::Deploy,
|
||||
Gitlab::ChatCommands::Deploy
|
||||
].freeze
|
||||
|
||||
def execute
|
||||
|
|
|
@ -7,7 +7,7 @@ module Gitlab
|
|||
test: :read_build,
|
||||
review: :read_merge_request,
|
||||
staging: :read_build,
|
||||
production: :read_issue,
|
||||
production: :read_issue
|
||||
}.freeze
|
||||
|
||||
def self.get(*args)
|
||||
|
|
|
@ -36,7 +36,7 @@ module Gitlab
|
|||
user: {
|
||||
id: user.try(:id),
|
||||
name: user.try(:name),
|
||||
email: user.try(:email),
|
||||
email: user.try(:email)
|
||||
},
|
||||
|
||||
commit: {
|
||||
|
@ -49,7 +49,7 @@ module Gitlab
|
|||
status: commit.status,
|
||||
duration: commit.duration,
|
||||
started_at: commit.started_at,
|
||||
finished_at: commit.finished_at,
|
||||
finished_at: commit.finished_at
|
||||
},
|
||||
|
||||
repository: {
|
||||
|
@ -60,7 +60,7 @@ module Gitlab
|
|||
git_http_url: project.http_url_to_repo,
|
||||
git_ssh_url: project.ssh_url_to_repo,
|
||||
visibility_level: project.visibility_level
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
data
|
||||
|
|
|
@ -40,7 +40,7 @@ module Gitlab
|
|||
Gitlab::EtagCaching::Router::Route.new(
|
||||
%r(^(?!.*(#{RESERVED_WORDS})).*/pipelines/\d+\.json\z),
|
||||
'project_pipeline'
|
||||
),
|
||||
)
|
||||
].freeze
|
||||
|
||||
def self.match(env)
|
||||
|
|
|
@ -258,7 +258,7 @@ module Gitlab
|
|||
'RepoPath' => path,
|
||||
'ArchivePrefix' => prefix,
|
||||
'ArchivePath' => archive_file_path(prefix, storage_path, format),
|
||||
'CommitId' => commit.id,
|
||||
'CommitId' => commit.id
|
||||
}
|
||||
end
|
||||
|
||||
|
|
|
@ -38,7 +38,7 @@ module Gitlab
|
|||
url: container_exec_url(api_url, namespace, pod_name, container["name"]),
|
||||
subprotocols: ['channel.k8s.io'],
|
||||
headers: Hash.new { |h, k| h[k] = [] },
|
||||
created_at: created_at,
|
||||
created_at: created_at
|
||||
}
|
||||
end
|
||||
end
|
||||
|
@ -64,7 +64,7 @@ module Gitlab
|
|||
tty: true,
|
||||
stdin: true,
|
||||
stdout: true,
|
||||
stderr: true,
|
||||
stderr: true
|
||||
}.to_query + '&' + EXEC_COMMAND
|
||||
|
||||
case url.scheme
|
||||
|
|
|
@ -22,7 +22,7 @@ module Gitlab
|
|||
params = {
|
||||
GL_ID: Gitlab::GlId.gl_id(user),
|
||||
GL_REPOSITORY: Gitlab::GlRepository.gl_repository(project, is_wiki),
|
||||
RepoPath: repo_path,
|
||||
RepoPath: repo_path
|
||||
}
|
||||
|
||||
if Gitlab.config.gitaly.enabled
|
||||
|
@ -51,7 +51,7 @@ module Gitlab
|
|||
{
|
||||
StoreLFSPath: "#{Gitlab.config.lfs.storage_path}/tmp/upload",
|
||||
LfsOid: oid,
|
||||
LfsSize: size,
|
||||
LfsSize: size
|
||||
}
|
||||
end
|
||||
|
||||
|
@ -62,7 +62,7 @@ module Gitlab
|
|||
def send_git_blob(repository, blob)
|
||||
params = {
|
||||
'RepoPath' => repository.path_to_repo,
|
||||
'BlobId' => blob.id,
|
||||
'BlobId' => blob.id
|
||||
}
|
||||
|
||||
[
|
||||
|
@ -127,7 +127,7 @@ module Gitlab
|
|||
'Subprotocols' => terminal[:subprotocols],
|
||||
'Url' => terminal[:url],
|
||||
'Header' => terminal[:headers],
|
||||
'MaxSessionTime' => terminal[:max_session_time],
|
||||
'MaxSessionTime' => terminal[:max_session_time]
|
||||
}
|
||||
}
|
||||
details['Terminal']['CAPem'] = terminal[:ca_pem] if terminal.has_key?(:ca_pem)
|
||||
|
|
|
@ -21,7 +21,7 @@ namespace :gemojione do
|
|||
moji: emoji_hash['moji'],
|
||||
description: emoji_hash['description'],
|
||||
unicodeVersion: Gitlab::Emoji.emoji_unicode_version(name),
|
||||
digest: hash_digest,
|
||||
digest: hash_digest
|
||||
}
|
||||
|
||||
resultant_emoji_map[name] = entry
|
||||
|
|
|
@ -49,7 +49,7 @@ namespace :gitlab do
|
|||
Template.new(
|
||||
"https://gitlab.com/gitlab-org/Dockerfile.git",
|
||||
/(\.{1,2}|LICENSE|CONTRIBUTING.md|\.Dockerfile)\z/
|
||||
),
|
||||
)
|
||||
].freeze
|
||||
|
||||
def vendor_directory
|
||||
|
|
|
@ -60,7 +60,7 @@ desc "GitLab | Run specs"
|
|||
task :spec do
|
||||
cmds = [
|
||||
%w(rake gitlab:setup),
|
||||
%w(rspec spec),
|
||||
%w(rspec spec)
|
||||
]
|
||||
run_commands(cmds)
|
||||
end
|
||||
|
|
|
@ -8,7 +8,7 @@ params = {
|
|||
"ref" => ENV["OMNIBUS_BRANCH"] || "master",
|
||||
"token" => ENV["BUILD_TRIGGER_TOKEN"],
|
||||
"variables[GITLAB_VERSION]" => ENV["CI_COMMIT_SHA"],
|
||||
"variables[ALTERNATIVE_SOURCES]" => true,
|
||||
"variables[ALTERNATIVE_SOURCES]" => true
|
||||
}
|
||||
|
||||
Dir.glob("*_VERSION").each do |version_file|
|
||||
|
|
|
@ -22,7 +22,7 @@ FactoryGirl.define do
|
|||
properties({
|
||||
namespace: 'somepath',
|
||||
api_url: 'https://kubernetes.example.com',
|
||||
token: 'a' * 40,
|
||||
token: 'a' * 40
|
||||
})
|
||||
end
|
||||
|
||||
|
|
|
@ -10,7 +10,7 @@ describe 'Auto deploy' do
|
|||
properties: {
|
||||
namespace: project.path,
|
||||
api_url: 'https://kubernetes.example.com',
|
||||
token: 'a' * 40,
|
||||
token: 'a' * 40
|
||||
}
|
||||
)
|
||||
project.team << [user, :master]
|
||||
|
|
|
@ -151,7 +151,7 @@ feature 'Merge request conflict resolution', js: true, feature: true do
|
|||
'conflict-too-large' => 'when the conflicts contain a large file',
|
||||
'conflict-binary-file' => 'when the conflicts contain a binary file',
|
||||
'conflict-missing-side' => 'when the conflicts contain a file edited in one branch and deleted in another',
|
||||
'conflict-non-utf8' => 'when the conflicts contain a non-UTF-8 file',
|
||||
'conflict-non-utf8' => 'when the conflicts contain a non-UTF-8 file'
|
||||
}.freeze
|
||||
|
||||
UNRESOLVABLE_CONFLICTS.each do |source_branch, description|
|
||||
|
|
|
@ -74,7 +74,7 @@ describe 'Edit Project Settings', feature: true do
|
|||
issues: namespace_project_issues_path(project.namespace, project),
|
||||
wiki: namespace_project_wiki_path(project.namespace, project, :home),
|
||||
snippets: namespace_project_snippets_path(project.namespace, project),
|
||||
merge_requests: namespace_project_merge_requests_path(project.namespace, project),
|
||||
merge_requests: namespace_project_merge_requests_path(project.namespace, project)
|
||||
}
|
||||
end
|
||||
|
||||
|
|
|
@ -225,7 +225,7 @@ module Ci
|
|||
before_script: ["pwd"],
|
||||
rspec: { script: "rspec", type: "test", only: %w(master deploy) },
|
||||
staging: { script: "deploy", type: "deploy", only: %w(master deploy) },
|
||||
production: { script: "deploy", type: "deploy", only: ["master@path", "deploy"] },
|
||||
production: { script: "deploy", type: "deploy", only: ["master@path", "deploy"] }
|
||||
})
|
||||
|
||||
config_processor = GitlabCiYamlProcessor.new(config, 'fork')
|
||||
|
@ -381,7 +381,7 @@ module Ci
|
|||
before_script: ["pwd"],
|
||||
rspec: { script: "rspec", type: "test", except: ["master", "deploy", "test@fork"] },
|
||||
staging: { script: "deploy", type: "deploy", except: ["master"] },
|
||||
production: { script: "deploy", type: "deploy", except: ["master@fork"] },
|
||||
production: { script: "deploy", type: "deploy", except: ["master@fork"] }
|
||||
})
|
||||
|
||||
config_processor = GitlabCiYamlProcessor.new(config, 'fork')
|
||||
|
@ -743,7 +743,7 @@ module Ci
|
|||
cache: { paths: ["logs/", "binaries/"], untracked: true, key: 'global' },
|
||||
rspec: {
|
||||
script: "rspec",
|
||||
cache: { paths: ["test/"], untracked: false, key: 'local' },
|
||||
cache: { paths: ["test/"], untracked: false, key: 'local' }
|
||||
}
|
||||
})
|
||||
|
||||
|
|
|
@ -25,7 +25,7 @@ describe ExpandVariables do
|
|||
result: 'keyvalueresult',
|
||||
variables: [
|
||||
{ key: 'variable', value: 'value' },
|
||||
{ key: 'variable2', value: 'result' },
|
||||
{ key: 'variable2', value: 'result' }
|
||||
] },
|
||||
{ value: 'key${variable}${variable2}',
|
||||
result: 'keyvalueresult',
|
||||
|
@ -37,7 +37,7 @@ describe ExpandVariables do
|
|||
result: 'keyresultvalue',
|
||||
variables: [
|
||||
{ key: 'variable', value: 'value' },
|
||||
{ key: 'variable2', value: 'result' },
|
||||
{ key: 'variable2', value: 'result' }
|
||||
] },
|
||||
{ value: 'key${variable2}${variable}',
|
||||
result: 'keyresultvalue',
|
||||
|
@ -49,7 +49,7 @@ describe ExpandVariables do
|
|||
result: 'review/feature/add-review-apps',
|
||||
variables: [
|
||||
{ key: 'CI_COMMIT_REF_NAME', value: 'feature/add-review-apps' }
|
||||
] },
|
||||
] }
|
||||
]
|
||||
|
||||
tests.each do |test|
|
||||
|
|
|
@ -151,7 +151,7 @@ describe Backup::Manager, lib: true do
|
|||
allow(Dir).to receive(:glob).and_return(
|
||||
[
|
||||
'1451606400_2016_01_01_gitlab_backup.tar',
|
||||
'1451520000_2015_12_31_gitlab_backup.tar',
|
||||
'1451520000_2015_12_31_gitlab_backup.tar'
|
||||
]
|
||||
)
|
||||
end
|
||||
|
|
|
@ -1372,7 +1372,7 @@ describe Gitlab::Diff::PositionTracer, lib: true do
|
|||
nil,
|
||||
{ old_path: file_name, new_path: file_name, old_line: 5, new_line: 5 },
|
||||
{ old_path: file_name, old_line: 6 },
|
||||
{ new_path: file_name, new_line: 7 },
|
||||
{ new_path: file_name, new_line: 7 }
|
||||
]
|
||||
|
||||
expect_positions(old_position_attrs, new_position_attrs)
|
||||
|
@ -1444,7 +1444,7 @@ describe Gitlab::Diff::PositionTracer, lib: true do
|
|||
nil,
|
||||
{ old_path: file_name, new_path: file_name, old_line: 5, new_line: 5 },
|
||||
{ old_path: file_name, old_line: 6 },
|
||||
{ new_path: file_name, new_line: 7 },
|
||||
{ new_path: file_name, new_line: 7 }
|
||||
]
|
||||
|
||||
expect_positions(old_position_attrs, new_position_attrs)
|
||||
|
@ -1498,7 +1498,7 @@ describe Gitlab::Diff::PositionTracer, lib: true do
|
|||
{ old_path: file_name, new_path: file_name, old_line: 5, new_line: 4 },
|
||||
{ old_path: file_name, new_path: file_name, old_line: 6, new_line: 5 },
|
||||
nil,
|
||||
{ new_path: file_name, new_line: 6 },
|
||||
{ new_path: file_name, new_line: 6 }
|
||||
]
|
||||
|
||||
expect_positions(old_position_attrs, new_position_attrs)
|
||||
|
@ -1746,7 +1746,7 @@ describe Gitlab::Diff::PositionTracer, lib: true do
|
|||
{ old_path: file_name, new_path: file_name, old_line: 4, new_line: 5 },
|
||||
{ old_path: file_name, old_line: 5 },
|
||||
{ new_path: file_name, new_line: 6 },
|
||||
{ new_path: file_name, new_line: 7 },
|
||||
{ new_path: file_name, new_line: 7 }
|
||||
]
|
||||
|
||||
expect_positions(old_position_attrs, new_position_attrs)
|
||||
|
|
|
@ -19,8 +19,8 @@ describe Gitlab::Git::EncodingHelper do
|
|||
[
|
||||
'removes invalid bytes from ASCII-8bit encoded multibyte string. This can occur when a git diff match line truncates in the middle of a multibyte character. This occurs after the second word in this example. The test string is as short as we can get while still triggering the error condition when not looking at `detect[:confidence]`.',
|
||||
"mu ns\xC3\n Lorem ipsum dolor sit amet, consectetur adipisicing ut\xC3\xA0y\xC3\xB9abcd\xC3\xB9efg kia elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non p\n {: .normal_pn}\n \n-Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in\n# *Lorem ipsum\xC3\xB9l\xC3\xB9l\xC3\xA0 dolor\xC3\xB9k\xC3\xB9 sit\xC3\xA8b\xC3\xA8 N\xC3\xA8 amet b\xC3\xA0d\xC3\xAC*\n+# *consectetur\xC3\xB9l\xC3\xB9l\xC3\xA0 adipisicing\xC3\xB9k\xC3\xB9 elit\xC3\xA8b\xC3\xA8 N\xC3\xA8 sed do\xC3\xA0d\xC3\xAC*{: .italic .smcaps}\n \n \xEF\x9B\xA1 eiusmod tempor incididunt, ut\xC3\xAAn\xC3\xB9 labore et dolore. Tw\xC4\x83nj\xC3\xAC magna aliqua. Ut enim ad minim veniam\n {: .normal}\n@@ -9,5 +9,5 @@ quis nostrud\xC3\xAAt\xC3\xB9 exercitiation ullamco laboris m\xC3\xB9s\xC3\xB9k\xC3\xB9abc\xC3\xB9 nisi ".force_encoding('ASCII-8BIT'),
|
||||
"mu ns\n Lorem ipsum dolor sit amet, consectetur adipisicing ut\xC3\xA0y\xC3\xB9abcd\xC3\xB9efg kia elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non p\n {: .normal_pn}\n \n-Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in\n# *Lorem ipsum\xC3\xB9l\xC3\xB9l\xC3\xA0 dolor\xC3\xB9k\xC3\xB9 sit\xC3\xA8b\xC3\xA8 N\xC3\xA8 amet b\xC3\xA0d\xC3\xAC*\n+# *consectetur\xC3\xB9l\xC3\xB9l\xC3\xA0 adipisicing\xC3\xB9k\xC3\xB9 elit\xC3\xA8b\xC3\xA8 N\xC3\xA8 sed do\xC3\xA0d\xC3\xAC*{: .italic .smcaps}\n \n \xEF\x9B\xA1 eiusmod tempor incididunt, ut\xC3\xAAn\xC3\xB9 labore et dolore. Tw\xC4\x83nj\xC3\xAC magna aliqua. Ut enim ad minim veniam\n {: .normal}\n@@ -9,5 +9,5 @@ quis nostrud\xC3\xAAt\xC3\xB9 exercitiation ullamco laboris m\xC3\xB9s\xC3\xB9k\xC3\xB9abc\xC3\xB9 nisi ",
|
||||
],
|
||||
"mu ns\n Lorem ipsum dolor sit amet, consectetur adipisicing ut\xC3\xA0y\xC3\xB9abcd\xC3\xB9efg kia elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non p\n {: .normal_pn}\n \n-Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in\n# *Lorem ipsum\xC3\xB9l\xC3\xB9l\xC3\xA0 dolor\xC3\xB9k\xC3\xB9 sit\xC3\xA8b\xC3\xA8 N\xC3\xA8 amet b\xC3\xA0d\xC3\xAC*\n+# *consectetur\xC3\xB9l\xC3\xB9l\xC3\xA0 adipisicing\xC3\xB9k\xC3\xB9 elit\xC3\xA8b\xC3\xA8 N\xC3\xA8 sed do\xC3\xA0d\xC3\xAC*{: .italic .smcaps}\n \n \xEF\x9B\xA1 eiusmod tempor incididunt, ut\xC3\xAAn\xC3\xB9 labore et dolore. Tw\xC4\x83nj\xC3\xAC magna aliqua. Ut enim ad minim veniam\n {: .normal}\n@@ -9,5 +9,5 @@ quis nostrud\xC3\xAAt\xC3\xB9 exercitiation ullamco laboris m\xC3\xB9s\xC3\xB9k\xC3\xB9abc\xC3\xB9 nisi "
|
||||
]
|
||||
].each do |description, test_string, xpect|
|
||||
it description do
|
||||
expect(ext_class.encode!(test_string)).to eq(xpect)
|
||||
|
@ -37,18 +37,18 @@ describe Gitlab::Git::EncodingHelper do
|
|||
[
|
||||
"encodes valid utf8 encoded string to utf8",
|
||||
"λ, λ, λ".encode("UTF-8"),
|
||||
"λ, λ, λ".encode("UTF-8"),
|
||||
"λ, λ, λ".encode("UTF-8")
|
||||
],
|
||||
[
|
||||
"encodes valid ASCII-8BIT encoded string to utf8",
|
||||
"ascii only".encode("ASCII-8BIT"),
|
||||
"ascii only".encode("UTF-8"),
|
||||
"ascii only".encode("UTF-8")
|
||||
],
|
||||
[
|
||||
"encodes valid ISO-8859-1 encoded string to utf8",
|
||||
"Rüby ist eine Programmiersprache. Wir verlängern den text damit ICU die Sprache erkennen kann.".encode("ISO-8859-1", "UTF-8"),
|
||||
"Rüby ist eine Programmiersprache. Wir verlängern den text damit ICU die Sprache erkennen kann.".encode("UTF-8"),
|
||||
],
|
||||
"Rüby ist eine Programmiersprache. Wir verlängern den text damit ICU die Sprache erkennen kann.".encode("UTF-8")
|
||||
]
|
||||
].each do |description, test_string, xpect|
|
||||
it description do
|
||||
r = ext_class.encode_utf8(test_string.force_encoding('UTF-8'))
|
||||
|
@ -77,8 +77,8 @@ describe Gitlab::Git::EncodingHelper do
|
|||
[
|
||||
'removes invalid bytes from ASCII-8bit encoded multibyte string.',
|
||||
"Lorem ipsum\xC3\n dolor sit amet, xy\xC3\xA0y\xC3\xB9abcd\xC3\xB9efg".force_encoding('ASCII-8BIT'),
|
||||
"Lorem ipsum\n dolor sit amet, xyàyùabcdùefg",
|
||||
],
|
||||
"Lorem ipsum\n dolor sit amet, xyàyùabcdùefg"
|
||||
]
|
||||
].each do |description, test_string, xpect|
|
||||
it description do
|
||||
expect(ext_class.encode!(test_string)).to eq(xpect)
|
||||
|
|
|
@ -6,7 +6,7 @@ describe Gitlab::Git::Util do
|
|||
["", 0],
|
||||
["foo", 1],
|
||||
["foo\n", 1],
|
||||
["foo\n\n", 2],
|
||||
["foo\n\n", 2]
|
||||
].each do |string, line_count|
|
||||
it "counts #{line_count} lines in #{string.inspect}" do
|
||||
expect(described_class.count_lines(string)).to eq(line_count)
|
||||
|
|
|
@ -95,7 +95,7 @@ describe Gitlab::ImportExport::RelationFactory, lib: true do
|
|||
'random_id' => 99,
|
||||
'milestone_id' => 99,
|
||||
'project_id' => 99,
|
||||
'user_id' => 99,
|
||||
'user_id' => 99
|
||||
}
|
||||
end
|
||||
|
||||
|
|
|
@ -29,7 +29,7 @@ describe ::Gitlab::RepoPath do
|
|||
before do
|
||||
allow(Gitlab.config.repositories).to receive(:storages).and_return({
|
||||
'storage1' => { 'path' => '/foo' },
|
||||
'storage2' => { 'path' => '/bar' },
|
||||
'storage2' => { 'path' => '/bar' }
|
||||
})
|
||||
end
|
||||
|
||||
|
|
|
@ -202,7 +202,7 @@ describe Gitlab::Workhorse, lib: true do
|
|||
context 'when Gitaly is enabled' do
|
||||
let(:gitaly_params) do
|
||||
{
|
||||
GitalyAddress: Gitlab::GitalyClient.get_address('default'),
|
||||
GitalyAddress: Gitlab::GitalyClient.get_address('default')
|
||||
}
|
||||
end
|
||||
|
||||
|
@ -214,7 +214,7 @@ describe Gitlab::Workhorse, lib: true do
|
|||
repo_param = { Repository: {
|
||||
path: repo_path,
|
||||
storage_name: 'default',
|
||||
relative_path: project.full_path + '.git',
|
||||
relative_path: project.full_path + '.git'
|
||||
} }
|
||||
|
||||
expect(subject).to include(repo_param)
|
||||
|
|
|
@ -89,7 +89,7 @@ describe ApplicationSetting, models: true do
|
|||
storages = {
|
||||
'custom1' => 'tmp/tests/custom_repositories_1',
|
||||
'custom2' => 'tmp/tests/custom_repositories_2',
|
||||
'custom3' => 'tmp/tests/custom_repositories_3',
|
||||
'custom3' => 'tmp/tests/custom_repositories_3'
|
||||
|
||||
}
|
||||
allow(Gitlab.config.repositories).to receive(:storages).and_return(storages)
|
||||
|
|
|
@ -972,7 +972,7 @@ describe Ci::Build, :models do
|
|||
'fix-1-foo' => 'fix-1-foo',
|
||||
'a' * 63 => 'a' * 63,
|
||||
'a' * 64 => 'a' * 63,
|
||||
'FOO' => 'foo',
|
||||
'FOO' => 'foo'
|
||||
}.each do |ref, slug|
|
||||
it "transforms #{ref} to #{slug}" do
|
||||
build.ref = ref
|
||||
|
@ -1144,7 +1144,7 @@ describe Ci::Build, :models do
|
|||
{ key: 'CI_PIPELINE_ID', value: pipeline.id.to_s, public: true },
|
||||
{ key: 'CI_REGISTRY_USER', value: 'gitlab-ci-token', public: true },
|
||||
{ key: 'CI_REGISTRY_PASSWORD', value: build.token, public: false },
|
||||
{ key: 'CI_REPOSITORY_URL', value: build.repo_url, public: false },
|
||||
{ key: 'CI_REPOSITORY_URL', value: build.repo_url, public: false }
|
||||
]
|
||||
end
|
||||
|
||||
|
|
|
@ -438,7 +438,7 @@ describe Environment, models: true do
|
|||
"foo**bar" => "foo-bar" + SUFFIX,
|
||||
"*-foo" => "env-foo" + SUFFIX,
|
||||
"staging-12345678-" => "staging-12345678" + SUFFIX,
|
||||
"staging-12345678-01234567" => "staging-12345678" + SUFFIX,
|
||||
"staging-12345678-01234567" => "staging-12345678" + SUFFIX
|
||||
}.each do |name, matcher|
|
||||
it "returns a slug matching #{matcher}, given #{name}" do
|
||||
slug = described_class.new(name: name).generate_slug
|
||||
|
|
|
@ -137,7 +137,7 @@ describe GlobalMilestone, models: true do
|
|||
[
|
||||
milestone1_project1,
|
||||
milestone1_project2,
|
||||
milestone1_project3,
|
||||
milestone1_project3
|
||||
]
|
||||
milestones_relation = Milestone.where(id: milestones.map(&:id))
|
||||
|
||||
|
|
|
@ -16,7 +16,7 @@ describe ProjectAuthorization do
|
|||
it 'inserts rows in batches' do
|
||||
described_class.insert_authorizations([
|
||||
[user.id, project1.id, Gitlab::Access::MASTER],
|
||||
[user.id, project2.id, Gitlab::Access::MASTER],
|
||||
[user.id, project2.id, Gitlab::Access::MASTER]
|
||||
], 1)
|
||||
|
||||
expect(user.project_authorizations.count).to eq(2)
|
||||
|
|
|
@ -28,7 +28,7 @@ describe AsanaService, models: true do
|
|||
commits: messages.map do |m|
|
||||
{
|
||||
message: m,
|
||||
url: 'https://gitlab.com/',
|
||||
url: 'https://gitlab.com/'
|
||||
}
|
||||
end
|
||||
}
|
||||
|
|
|
@ -48,7 +48,7 @@ describe ChatMessage::IssueMessage, models: true do
|
|||
title: "#100 Issue title",
|
||||
title_link: "http://url.com",
|
||||
text: "issue description",
|
||||
color: color,
|
||||
color: color
|
||||
}
|
||||
])
|
||||
end
|
||||
|
|
|
@ -22,7 +22,7 @@ describe ChatMessage::MergeMessage, models: true do
|
|||
state: 'opened',
|
||||
description: 'merge request description',
|
||||
source_branch: 'source_branch',
|
||||
target_branch: 'target_branch',
|
||||
target_branch: 'target_branch'
|
||||
}
|
||||
}
|
||||
end
|
||||
|
|
|
@ -15,7 +15,7 @@ describe ChatMessage::NoteMessage, models: true do
|
|||
project_url: 'http://somewhere.com',
|
||||
repository: {
|
||||
name: 'project_name',
|
||||
url: 'http://somewhere.com',
|
||||
url: 'http://somewhere.com'
|
||||
},
|
||||
object_attributes: {
|
||||
id: 10,
|
||||
|
|
|
@ -21,7 +21,7 @@ describe ChatMessage::PushMessage, models: true do
|
|||
before do
|
||||
args[:commits] = [
|
||||
{ message: 'message1', url: 'http://url1.com', id: 'abcdefghijkl', author: { name: 'author1' } },
|
||||
{ message: 'message2', url: 'http://url2.com', id: '123456789012', author: { name: 'author2' } },
|
||||
{ message: 'message2', url: 'http://url2.com', id: '123456789012', author: { name: 'author2' } }
|
||||
]
|
||||
end
|
||||
|
||||
|
@ -33,7 +33,7 @@ describe ChatMessage::PushMessage, models: true do
|
|||
expect(subject.attachments).to eq([{
|
||||
text: "<http://url1.com|abcdefgh>: message1 - author1\n\n"\
|
||||
"<http://url2.com|12345678>: message2 - author2",
|
||||
color: color,
|
||||
color: color
|
||||
}])
|
||||
end
|
||||
end
|
||||
|
|
|
@ -53,7 +53,7 @@ describe ChatMessage::WikiPageMessage, models: true do
|
|||
expect(subject.attachments).to eq([
|
||||
{
|
||||
text: "Wiki page description",
|
||||
color: color,
|
||||
color: color
|
||||
}
|
||||
])
|
||||
end
|
||||
|
@ -66,7 +66,7 @@ describe ChatMessage::WikiPageMessage, models: true do
|
|||
expect(subject.attachments).to eq([
|
||||
{
|
||||
text: "Wiki page description",
|
||||
color: color,
|
||||
color: color
|
||||
}
|
||||
])
|
||||
end
|
||||
|
|
|
@ -54,7 +54,7 @@ describe KubernetesService, models: true, caching: true do
|
|||
'a' * 63 => true,
|
||||
'a' * 64 => false,
|
||||
'a.b' => false,
|
||||
'a*b' => false,
|
||||
'a*b' => false
|
||||
}.each do |namespace, validity|
|
||||
it "validates #{namespace} as #{validity ? 'valid' : 'invalid'}" do
|
||||
subject.namespace = namespace
|
||||
|
|
|
@ -40,7 +40,7 @@ describe PivotaltrackerService, models: true do
|
|||
name: 'Some User'
|
||||
},
|
||||
url: 'https://example.com/commit',
|
||||
message: 'commit message',
|
||||
message: 'commit message'
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
|
@ -973,7 +973,7 @@ describe Project, models: true do
|
|||
before do
|
||||
storages = {
|
||||
'default' => { 'path' => 'tmp/tests/repositories' },
|
||||
'picked' => { 'path' => 'tmp/tests/repositories' },
|
||||
'picked' => { 'path' => 'tmp/tests/repositories' }
|
||||
}
|
||||
allow(Gitlab.config.repositories).to receive(:storages).and_return(storages)
|
||||
end
|
||||
|
|
|
@ -676,7 +676,7 @@ describe User, models: true do
|
|||
protocol_and_expectation = {
|
||||
'http' => false,
|
||||
'ssh' => true,
|
||||
'' => true,
|
||||
'' => true
|
||||
}
|
||||
|
||||
protocol_and_expectation.each do |protocol, expected|
|
||||
|
|
|
@ -329,7 +329,7 @@ describe API::Files do
|
|||
end
|
||||
let(:get_params) do
|
||||
{
|
||||
ref: 'master',
|
||||
ref: 'master'
|
||||
}
|
||||
end
|
||||
|
||||
|
|
|
@ -73,7 +73,7 @@ describe API::Groups do
|
|||
storage_size: 702,
|
||||
repository_size: 123,
|
||||
lfs_objects_size: 234,
|
||||
build_artifacts_size: 345,
|
||||
build_artifacts_size: 345
|
||||
}.stringify_keys
|
||||
exposed_attributes = attributes.dup
|
||||
exposed_attributes['job_artifacts_size'] = exposed_attributes.delete('build_artifacts_size')
|
||||
|
|
|
@ -661,7 +661,7 @@ describe API::Projects do
|
|||
'name' => user.namespace.name,
|
||||
'path' => user.namespace.path,
|
||||
'kind' => user.namespace.kind,
|
||||
'full_path' => user.namespace.full_path,
|
||||
'full_path' => user.namespace.full_path
|
||||
})
|
||||
end
|
||||
|
||||
|
|
|
@ -53,7 +53,7 @@ describe API::V3::Files do
|
|||
let(:params) do
|
||||
{
|
||||
file_path: 'app/models/application.rb',
|
||||
ref: 'master',
|
||||
ref: 'master'
|
||||
}
|
||||
end
|
||||
|
||||
|
@ -263,7 +263,7 @@ describe API::V3::Files do
|
|||
let(:get_params) do
|
||||
{
|
||||
file_path: file_path,
|
||||
ref: 'master',
|
||||
ref: 'master'
|
||||
}
|
||||
end
|
||||
|
||||
|
|
|
@ -69,7 +69,7 @@ describe API::V3::Groups do
|
|||
storage_size: 702,
|
||||
repository_size: 123,
|
||||
lfs_objects_size: 234,
|
||||
build_artifacts_size: 345,
|
||||
build_artifacts_size: 345
|
||||
}.stringify_keys
|
||||
|
||||
project1.statistics.update!(attributes)
|
||||
|
|
|
@ -227,7 +227,7 @@ describe API::V3::Projects do
|
|||
storage_size: 702,
|
||||
repository_size: 123,
|
||||
lfs_objects_size: 234,
|
||||
build_artifacts_size: 345,
|
||||
build_artifacts_size: 345
|
||||
}
|
||||
|
||||
project4.statistics.update!(attributes)
|
||||
|
@ -706,7 +706,7 @@ describe API::V3::Projects do
|
|||
'name' => user.namespace.name,
|
||||
'path' => user.namespace.path,
|
||||
'kind' => user.namespace.kind,
|
||||
'full_path' => user.namespace.full_path,
|
||||
'full_path' => user.namespace.full_path
|
||||
})
|
||||
end
|
||||
|
||||
|
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue