Commit Graph

8188 Commits

Author SHA1 Message Date
Dylan Griffith ba7cfdc2d7 Track Kubernetes errors using Sentry 2018-11-14 11:10:36 +00:00
Rémy Coutable dff3ded57f Merge branch 'patch-31' into 'master'
Update comment in Auto-DevOps.gitlab-ci.yml

See merge request gitlab-org/gitlab-ce!23013
2018-11-14 10:22:00 +00:00
Thong Kuah 14b3033a0d Show HTTP response code for Kubernetes errors 2018-11-13 12:46:01 +00:00
Tripple Moon b9ec3c2ffa Update Auto-DevOps.gitlab-ci.yml
Typo in comment INCREMENTAL_ROLLOUT_TYPE => INCREMENTAL_ROLLOUT_MODE
2018-11-13 07:27:22 +00:00
Rémy Coutable ec3712c201 Merge branch 'ce-3777-promote-to-epic' into 'master'
Refactoring Issues::MoveService (port of promote epics)

See merge request gitlab-org/gitlab-ce!22766
2018-11-12 20:22:57 +00:00
Rémy Coutable 33cd8efbd7 Merge branch 'sh-53180-append-path' into 'master'
Make sure there's only one slash as path separator

Closes #53180

See merge request gitlab-org/gitlab-ce!22954
2018-11-12 19:37:36 +00:00
Douwe Maan 56834e6bb2 Merge branch 'osw-comment-on-any-line-on-diffs-w-feature-flag' into 'master'
Comment on any expanded diff line on MRs (with feature-flag)

Closes #13950

See merge request gitlab-org/gitlab-ce!22914
2018-11-12 15:36:48 +00:00
Jarka Košanová 4af1712d01 Extract code from Issues::MoveService
Extract code to make it easier reusable
- introduce AttributesRewriter and ContentRewriter
  - support group entites when rewriting content
- make Uploader copy_to working for Namespaces
2018-11-12 08:57:25 +01:00
Philippe Lafoucrière a737c4fb5d Set an empty entrypoint for license_management job 2018-11-10 01:18:33 +00:00
Stan Hu 39f252254b Make sure there's only one slash as path separator
In Ruby 2.4, `URI.join("http://test//", "a").to_s` will
remove the double slash, however it's not the case in
Ruby 2.5. Using chomp should work better for the intention,
as we're not trying to allow things like ../ or / paths
resolution.

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/53180
2018-11-09 15:36:45 -08:00
Stan Hu 6a91b28932 Remove circular dependency on Redactable in migration
Gitlab::BackgroundMigration::RedactLinks was prepending
EE::Gitlab::BackgroundMigration::RedactLinks, while
EE::Gitlab::BackgroundMigration::RedactLinks was trying to include
Gitlab::BackgroundMigration::RedactLinks::Redactable. Ruby 2.5.3 failed
with an uninitialized constant
(https://gitlab.com/gitlab-org/gitlab-ee/-/jobs/118388511).
2018-11-09 12:59:39 -08:00
Oswaldo Ferreira f9b4130bb7 Comment on any expanded diff line on MRs 2018-11-09 16:56:48 -02:00
Rémy Coutable 32bf2667d2 Merge branch 'frozen-string-lib-gitlab-more' into 'master'
Enable even more frozen string in lib/gitlab

See merge request gitlab-org/gitlab-ce!22863
2018-11-09 17:26:46 +00:00
Dylan Griffith da7836956e Improve Debugging Capabilities For Helm Application Installs 2018-11-09 15:03:24 +00:00
Kamil Trzciński 036c9c58ba Limit parallel to 100
This prevents some of the abusive behaviors, of someone putting 100000 and creating out of memory condition easily
2018-11-08 11:58:54 +01:00
Oswaldo Ferreira 198402b38b Revert "Merge branch 'osw-comment-on-any-line-on-diffs' into 'master'"
This reverts commit a82a595728, reversing
changes made to e7df959b8f.
2018-11-07 19:57:26 -02:00
Sean McGivern cc9e3d0900 Merge branch 'jira-ping-differentiate-cloud' into 'master'
Usage ping - Differentiate Jira Server and Cloud

Closes #51043

See merge request gitlab-org/gitlab-ce!22791
2018-11-07 20:09:24 +00:00
Mario de la Ossa 013d097e8b
Usage ping - Differentiate Jira Server and Cloud 2018-11-07 11:28:04 -06:00
Bob Van Landuyt c85a19f920 Allow limiting quick actions to execute
Sometimes we don't want to trigger any quick actions that cause side
effects. For example when building a record to validate. This allows
listing the quick actions that need to be performed.
2018-11-07 16:27:55 +01:00
Bob Van Landuyt 6fbdc5ed52 Apply patches when creating MR via email
This allows users to add patches as attachments to merge request
created via email.

When an email to create a merge request is sent, all the attachments
ending in `.patch` will be applied to the branch specified in the
subject of the email. If the branch did not exist, it will be created
from the HEAD of the repository.

When the patches could not be applied, the error message will be
replied to the user.

The patches can have a maximum combined size of 2MB for now.
2018-11-07 16:27:55 +01:00
Sean McGivern 6d8810a64f Merge branch 'fj-41213-api-update-submodule-commit' into 'master'
Add endpoint to update a git submodule reference

Closes #41213

See merge request gitlab-org/gitlab-ce!20949
2018-11-07 15:11:30 +00:00
Grzegorz Bizon f323d6148b Merge branch 'max_retries_when' into 'master'
Allow to configure when to retry builds

Closes gitlab-runner#3515

See merge request gitlab-org/gitlab-ce!21758
2018-11-07 15:02:18 +00:00
Grzegorz Bizon 5dc0577b84 Merge branch 'triggermesh-phase1-knative' into 'master'
Allow to install Knative as cluster application

See merge request gitlab-org/gitlab-ce!22593
2018-11-07 15:00:38 +00:00
Douwe Maan ad7d0cb2f4 Merge branch '43521-keep-personal-emails-private' into 'master'
Adds option to override commit email

Closes #43521

See merge request gitlab-org/gitlab-ce!22560
2018-11-07 13:52:08 +00:00
Grzegorz Bizon e60e591fca Merge branch 'touchup-ci-normalizer' into 'master'
Touchup Normalizer implementation

See merge request gitlab-org/gitlab-ce!22872
2018-11-07 13:48:29 +00:00
Francisco Javier López 28cbb2acfe
Add submodule update API endpoint
This new endpoint allow users to update a submodule's reference.

The MR involves adding a new operation RPC operation in gitaly-proto
(see gitlab-org/gitaly-proto!233) and change Gitaly to use this
new version (see gitlab-org/gitaly!936).

See gitlab-org/gitlab-ce!20949
2018-11-07 14:03:30 +01:00
Tiago Botelho c239452b47
User can keep their commit email private
The private commit email is automatically generated in the format:
id-username@noreply.HOSTNAME

GitLab instance admins are able to change the HOSTNAME portion,
that defaults to Gitlab's hostname, to whatever they prefer.
2018-11-07 12:24:14 +00:00
Matija Čupić d5919aeb1f
Move extracting job names outside the loop 2018-11-07 13:09:23 +01:00
Markus Doits b1c15f2bd4
use Ci::Build instead of CommitStatus as per feedback 2018-11-07 13:05:18 +01:00
Markus Doits 63aa35cb20
small fixes to doc and remove on whitespace noise 2018-11-07 13:05:13 +01:00
Markus Doits 9818bb5618
refactoring after latest feedback 2018-11-07 13:04:43 +01:00
Markus Doits ff3484a0b3
remove now unneeded validation 2018-11-07 13:04:41 +01:00
Markus Doits 7c5c1e9240
fix wrong retry error messages 2018-11-07 13:04:23 +01:00
Markus Doits b7ee04d456
refactor validations to a Entry::Retry class 2018-11-07 13:04:21 +01:00
Markus Doits b734e3a139
one more try to reduce cognitive overhead
before:

- Method `validate_retry_max` has a Cognitive Complexity of 9 (exceeds 5 allowed). Consider refactoring.
- Method `validate_retry_when` has a Cognitive Complexity of 6 (exceeds 5 allowed). Consider refactoring.
2018-11-07 13:02:58 +01:00
Markus Doits fdb5a51352
refactor for hopefully lower cognitive complexity
before:

- Method `validate_retry` has a Cognitive Complexity of 7 (exceeds 5 allowed). Consider refactoring.
- Method `validate_retry_max` has a Cognitive Complexity of 9 (exceeds 5 allowed). Consider refactoring.
- Method `validate_retry_when` has a Cognitive Complexity of 14 (exceeds 5 allowed). Consider refactoring.
2018-11-07 13:02:56 +01:00
Markus Doits ffcc200a68
fix allowed keys validator to use correct attribute as error base? 2018-11-07 13:01:57 +01:00
Markus Doits 0db50a808d
update job config validator to validate new retry syntax 2018-11-07 13:01:53 +01:00
Matija Čupić 126fbe580f
Return untouched hash if no job is parallelized 2018-11-07 13:01:33 +01:00
Douwe Maan a82a595728 Merge branch 'osw-comment-on-any-line-on-diffs' into 'master'
Comment on any expanded diff line on MRs

See merge request gitlab-org/gitlab-ce!22398
2018-11-07 11:56:46 +00:00
Grzegorz Bizon 6f6cd4f43d Merge branch '21480-parallel-job-keyword-mvc' into 'master'
Resolve "`parallel` job keyword MVC"

Closes #21480

See merge request gitlab-org/gitlab-ce!22631
2018-11-07 10:38:05 +00:00
Filipa Lacerda b1fae097bd Merge branch 'winh-delayed-jobs-dynamic-timer' into 'master'
Add dynamic timer to delayed jobs

See merge request gitlab-org/gitlab-ce!22382
2018-11-07 10:27:54 +00:00
Winnie Hellmann 390abbf054 Add placeholder for remaining time in delayed job tooltips 2018-11-07 10:00:25 +01:00
Sean McGivern 1b788c66a1 Merge branch 'sh-fix-issue-52649' into 'master'
Fix statement timeouts in RemoveRestrictedTodos migration

Closes #52649

See merge request gitlab-org/gitlab-ce!22795
2018-11-07 06:51:48 +00:00
gfyoung 7e6f6e1603 Enable even more frozen string in lib/gitlab
Enables frozens string for the following:

* lib/gitlab/conflict/**/*.rb
* lib/gitlab/cross_project_access/**/*.rb
* lib/gitlab/cycle_analytics/**/*.rb
* lib/gitlab/data_builder/**/*.rb
* lib/gitlab/database/**/*.rb
* lib/gitlab/dependency_linker/**/*.rb
* lib/gitlab/diff/**/*.rb
* lib/gitlab/downtime_check/**/*.rb
* lib/gitlab/email/**/*.rb
* lib/gitlab/etag_caching/**/*.rb

Partially addresses gitlab-org/gitlab-ce#47424.
2018-11-06 22:47:32 -08:00
Douglas Barbosa Alexandre 5c519d1194 Add a helper method to append path to a base URL
In Ruby 2.4, `URI.join("http://test//", "a").to_s` will
remove the double slash, however it's not the case in
Ruby 2.5. Using chomp should work better for the intention,
as we're not trying to allow things like ../ or / paths
resolution.

This helper method append path to host, making sure
there's one single slash as path separator.
2018-11-06 21:32:01 -08:00
Chris Baumbauer 26673cc827 Fix double-negation 2018-11-06 12:06:37 -08:00
Chris Baumbauer 008126a878 Refactor preinstall/postinstall methods in the helm installer 2018-11-06 12:00:16 -08:00
Oswaldo Ferreira 1bc0e9e3c5 Apply additional guard-clauses for unfold_required? 2018-11-06 17:59:09 -02:00
Oswaldo Ferreira ec66ef1b74 Comment on any expanded diff line on MRs 2018-11-06 17:39:31 -02:00