Read about our upcoming Code of Conduct on this issue

Commit bf959989 authored by GitLab Bot's avatar GitLab Bot
Browse files

Add latest changes from gitlab-org/gitlab@master

parent e12724933ad7
......@@ -30,7 +30,7 @@
policy: pull
.use-pg9:
image: "registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6.5-golang-1.12-git-2.24-lfs-2.9-chrome-73.0-node-12.x-yarn-1.21-postgresql-9.6-graphicsmagick-1.3.34"
image: "registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6.5-golang-1.14-git-2.24-lfs-2.9-chrome-73.0-node-12.x-yarn-1.21-postgresql-9.6-graphicsmagick-1.3.34"
services:
- name: postgres:9.6.17
command: ["postgres", "-c", "fsync=off", "-c", "synchronous_commit=off", "-c", "full_page_writes=off"]
......@@ -63,7 +63,7 @@
key: "debian-stretch-ruby-2.6.5-pg11-node-12.x"
.use-pg9-ee:
image: "registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6.5-golang-1.12-git-2.24-lfs-2.9-chrome-73.0-node-12.x-yarn-1.21-postgresql-9.6-graphicsmagick-1.3.34"
image: "registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-2.6.5-golang-1.14-git-2.24-lfs-2.9-chrome-73.0-node-12.x-yarn-1.21-postgresql-9.6-graphicsmagick-1.3.34"
services:
- name: postgres:9.6.17
command: ["postgres", "-c", "fsync=off", "-c", "synchronous_commit=off", "-c", "full_page_writes=off"]
......
......@@ -37,15 +37,23 @@ def submittable_as_spam?
end
end
def needs_recaptcha!
self.errors.add(:base, "Your #{spammable_entity_type} has been recognized as spam. "\
"Please, change the content or solve the reCAPTCHA to proceed.")
end
def unrecoverable_spam_error!
self.errors.add(:base, "Your #{spammable_entity_type} has been recognized as spam and has been discarded.")
end
def invalidate_if_spam
error_msg = if Gitlab::Recaptcha.enabled?
"Your #{spammable_entity_type} has been recognized as spam. "\
"Please, change the content or solve the reCAPTCHA to proceed."
else
"Your #{spammable_entity_type} has been recognized as spam and has been discarded."
end
self.errors.add(:base, error_msg) if spam?
return unless spam?
if Gitlab::Recaptcha.enabled?
needs_recaptcha!
else
unrecoverable_spam_error!
end
end
def spammable_entity_type
......
......@@ -12,7 +12,7 @@
= _('From <code>%{source_title}</code> into').html_safe % { source_title: source_title }
- if issuable.new_record?
%code= target_title
%code#js-target-branch-title= target_title
&nbsp;
= link_to _('Change branches'), mr_change_branches_path(issuable)
- elsif issuable.for_fork?
......
---
title: Resolve Snippet update error with version flag disabled
merge_request: 28815
author:
type: fixed
---
title: Use different approval icon if current user approved
merge_request: 28290
author: Steffen Köhler
type: changed
---
title: Stringify Sidekiq job args in exception logs
merge_request: 28996
author:
type: fixed
# Checks for possible spelling mistakes in content, not code. May find false positives
# due to links using angle brackets: <https://example.com>. These can be ignored.
#
# If a word is flagged as a spelling mistake incorrectly, such as a product name,
# you can submit an MR to update `spelling-exceptions.txt` with the missing word.
# Commands, like `git clone` must use backticks, and must not be added to the
# exceptions.
#
# For a list of all options, see https://errata-ai.github.io/vale/styles/
extends: spelling
message: 'Spelling check: "%s"?'
level: warning
ignore:
- gitlab/spelling-exceptions.txt
Akismet
Alertmanager
Algolia
Ansible
API
approvers
Artifactory
Asana
Asciidoctor
Atlassian
Auth0
Authentiq
autocomplete
autocompleted
autocompletes
autocompleting
autogenerated
autoloaded
autoloader
autoloading
autoscale
autoscaled
autoscaler
autoscales
autoscaling
awardable
Azure
backport
backported
backporting
backports
backtrace
backtraced
backtraces
backtracing
Bamboo
Bitbucket
blockquote
blockquoted
blockquotes
blockquoting
boolean
browsable
Bugzilla
Buildkite
buildpack
buildpacks
bundler
bundlers
burndown
cacheable
CAS
CentOS
Chatops
Citrix
Cloudwatch
Cognito
colocated
colocating
compilable
composable
Conda
Consul
cron
crons
crontab
crontabs
crosslinked
crosslinking
crosslinks
Crossplane
CrowdIn
Debian
deduplicate
deduplicated
deduplicates
deduplicating
deduplication
deprovision
deprovisioned
deprovisioning
deprovisions
discoverability
Disqus
Dockerfile
Dockerfiles
downvoted
downvotes
Dpl
Elasticsearch
enablement
enqueued
expirable
Facebook
failover
failovers
failsafe
favicon
firewalled
Flowdock
Fluentd
Forgerock
Gantt
Gemnasium
Git
Gitaly
Gitea
GitHub
GitLab
gitlabsos
Gitter
Gmail
Google
Gradle
Grafana
gravatar
hardcode
hardcoded
hardcodes
Helm
HipChat
hostname
hostnames
hotfix
hotfixed
hotfixes
hotfixing
http
https
Ingress
initializer
initializers
interdependencies
interdependency
Irker
jasmine-jquery
JavaScript
Jaeger
Jenkins
Jira
jQuery
JupyterHub
kanban
kanbans
Karma
Kerberos
Kibana
Knative
Kramdown
Kubernetes
Laravel
LDAP
Libravatar
Lograge
lookahead
lookaheads
lookbehind
lookbehinds
lookups
Lucene
Maildir
Makefile
Makefiles
Markdown
markdownlint
Mattermost
mbox
mergeable
Microsoft
middleware
middlewares
MinIO
mitmproxy
misconfigure
misconfigured
misconfigures
misconfiguration
misconfigurations
misconfiguring
mitigations
mockup
mockups
nameserver
nameservers
namespace
namespaced
namespaces
Nanoc
NGINX
OAuth
Okta
offboarded
offboarding
offboards
OmniAuth
OpenID
OpenShift
Packagist
parallelization
parallelizations
performant
Piwik
PgBouncer
plaintext
PostgreSQL
preconfigure
preconfigured
preconfigures
prefill
prefilled
prefilling
prefills
prepend
prepended
prepends
Pritaly
profiler
Prometheus
proxied
proxies
proxying
Pseudonymized
Pseudonymizer
Puma
Python
Qualys
Rackspace
Raketask
Raketasks
rebase
rebased
rebases
rebasing
Redis
Redmine
reCAPTCHA
referer
referers
reindex
reindexed
reindexes
reindexing
relicensing
Repmgr
Repmgrd
requeue
requeued
requeues
reusability
resynced
resyncing
resyncs
rollout
rollouts
rsync
rsynced
rsyncing
rsyncs
resync
reverified
reverifies
reverify
runbook
runbooks
runit
runtime
runtimes
Salesforce
SAML
Sendmail
Sentry
serverless
Sidekiq
sharding
Shibboleth
sanitization
serializer
serializers
serializing
Slack
Slony
SMTP
Sourcegraph
Splunk
SSH
storable
strace
subfolder
subfolders
sublicense
sublicensed
sublicenses
sublicensing
subnet
subnets
subnetting
subtree
subtrees
subqueried
subqueries
subquery
subquerying
syslog
Tiller
todos
tokenizer
Tokenizers
tokenizing
toolchain
toolchains
tooltip
tooltips
Trello
triaging
TypeScript
Twitter
Ubuntu
unarchive
unarchived
unarchives
Unassign
Unassigns
uncheck
unchecked
unchecking
unchecks
uncomment
uncommented
unencrypted
Unicorn
unindexed
unlink
unlinking
unlinks
unmergeable
unmerged
unmerges
unmerging
unoptimize
unoptimized
unoptimizes
unoptimizing
unprotect
unprotects
unprotected
unpublish
unpublished
unpublishes
unreferenced
unresolve
unresolved
unresolving
unstage
unstaged
unstages
unstaging
untracked
untrusted
unverified
unverifies
unverify
unverifying
uploader
uploaders
upvoted
upvotes
validator
validators
vendored
virtualized
virtualizing
Vue
Vuex
walkthrough
walkthroughs
WebdriverIO
webpack
webserver
whitepaper
whitepapers
Wireshark
Wordpress
Xcode
Xeon
YouTrack
Zeitwerk
Zendesk
......@@ -329,6 +329,30 @@ rspec:
- rspec spec
```
### Caching Go dependencies
Assuming your project is using [Go Modules](https://github.com/golang/go/wiki/Modules) to install
Go dependencies, the following example defines `cache` in a `go-cache` template, that
any job can extend. Go modules are installed in `${GOPATH}/pkg/mod/` and
are cached for all of the `go` projects:
```yaml
.go-cache:
variables:
GOPATH: $CI_PROJECT_DIR/.go
before_script:
- mkdir -p .go
cache:
paths:
- .go/pkg/mod/
test:
image: golang:1.13
extends: .go-cache
script:
- go test ./... -v -short
```
## Availability of the cache
Caching is an optimization, but isn't guaranteed to always work, so you need to
......
......@@ -306,9 +306,12 @@ Sg0KU1hNMGExaE9SVGR2V2pKQlBUMWNiaUo5DQo=',
#### Disable Seat Link
Seat Link is enabled by default. To disable this feature, go to
**{admin}** **Admin Area > Settings > Metrics and profiling** and
clear the Seat Link checkbox.
> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/212375) in [GitLab Starter](https://about.gitlab.com/pricing/) 12.10.
Seat Link is enabled by default.
To disable this feature, go to
**{admin}** **Admin Area > Settings > Metrics and profiling** and clear the **Seat Link** checkbox.
To disable Seat Link in an Omnibus GitLab installation, and prevent it from
being configured in the future through the administration panel, set the following in
......
......@@ -108,7 +108,7 @@ def check_allowed(params)
# check_ip - optional, only in EE version, may limit access to
# group resources based on its IP restrictions
post "/allowed" do
if repo_type.snippet? && Feature.disabled?(:version_snippets, actor.user)
if repo_type.snippet? && params[:protocol] != 'web' && Feature.disabled?(:version_snippets, actor.user)
break response_with_status(code: 401, success: false, message: 'Snippet git access is disabled.')
end
......
apply:
stage: deploy
image: "registry.gitlab.com/gitlab-org/cluster-integration/cluster-applications:v0.12.0"
image: "registry.gitlab.com/gitlab-org/cluster-integration/cluster-applications:v0.13.1"
environment:
name: production
variables:
......
......@@ -19,6 +19,7 @@ def call(severity, timestamp, progname, data)
output[:message] = data
when Hash
convert_to_iso8601!(data)
stringify_args!(data)
output.merge!(data)
end
......@@ -39,6 +40,10 @@ def format_time(timestamp)
Time.at(timestamp).utc.iso8601(3)
end
def stringify_args!(payload)
payload['args'] = Gitlab::Utils::LogLimitedArray.log_limited_array(payload['args'].map(&:to_s)) if payload['args']
end
end
end
end
......@@ -7,6 +7,7 @@ def base_message(payload)
"#{payload['class']} JID-#{payload['jid']}"
end
# NOTE: Arguments are truncated/stringified in sidekiq_logging/json_formatter.rb
def parse_job(job)
# Error information from the previous try is in the payload for
# displaying in the Sidekiq UI, but is very confusing in logs!
......@@ -16,7 +17,6 @@ def parse_job(job)
job['pid'] = ::Process.pid
job.delete('args') unless ENV['SIDEKIQ_LOG_ARGUMENTS']
job['args'] = Gitlab::Utils::LogLimitedArray.log_limited_array(job['args'].map(&:to_s)) if job['args']
job
end
......
......@@ -380,9 +380,6 @@ msgstr ""
msgid "%{name}'s avatar"
msgstr ""
 
msgid "%{numberOfDays} days"
msgstr ""
msgid "%{number_commits_behind} commits behind %{default_branch}, %{number_commits_ahead} commits ahead"
msgstr ""
 
......@@ -2266,6 +2263,9 @@ msgstr ""
msgid "Approvals"
msgstr ""
 
msgid "Approvals (you've approved)"
msgstr ""
msgid "Approve"
msgstr ""
 
......@@ -10082,6 +10082,9 @@ msgstr ""
msgid "Group: %{name}"
msgstr ""
 
msgid "GroupActivityMetrics|New Members created"
msgstr ""
msgid "GroupActivyMetrics|Issues created"
msgstr ""
 
......
......@@ -13,6 +13,10 @@ module CiBadgeLink
timeout ? completed?(timeout: timeout) : completed?
status_badge == status
end
# has_passed? => passed?
# has_failed? => failed?
alias_method :"has_#{status}?", :"#{status}?"
end
# e.g. def pending?; status_badge == 'pending'; end
......
......@@ -32,7 +32,7 @@ module QA
parent_pipeline.click_linked_job(project.name)
expect(parent_pipeline).to have_job("child_job")
expect(parent_pipeline).to be_passed