root
/
gitlab-ce
mirror of https://gitlab.com/free-releases/gitlab-ce.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity
84,175 Commits 9,131 Branches 1,640 Tags 2 GiB
Commit Graph

6076 Commits

Author SHA1 Message Date
Dylan Griffith ba7cfdc2d7 Track Kubernetes errors using Sentry 2018-11-14 11:10:36 +00:00
Thong Kuah 14b3033a0d Show HTTP response code for Kubernetes errors 2018-11-13 12:46:01 +00:00
Stan Hu 1239701822 Merge branch 'ashmckenzie/hmac-token-decode-and-tests' into 'master' 
Relocate JSONWebToken::HMACToken from EE

See merge request gitlab-org/gitlab-ce!22906
 2018-11-13 06:12:41 +00:00
Ash McKenzie a3c80014f5
Relocate JSONWebToken::HMACToken from EE 2018-11-13 08:36:57 +11: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
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
Sean McGivern ca3e9b9759 Merge branch 'blackst0ne-add-discord-service' into 'master' 
Add Discord integration

Closes #21635

See merge request gitlab-org/gitlab-ce!22684
 2018-11-12 10:12: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
Oswaldo Ferreira f9b4130bb7 Comment on any expanded diff line on MRs 2018-11-09 16:56:48 -02: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
Sean McGivern b3b9817e51 Merge branch 'osw-revert-comment-in-any-diff-line' into 'master' 
Revert "Merge branch 'osw-comment-on-any-line-on-diffs' into 'master'"

See merge request gitlab-org/gitlab-ce!22891
 2018-11-08 08:51:30 +00:00
Simon Knox 11a606fe27 backport changes from gitlab-ee!7903 2018-11-08 07:02:44 +00: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
Douglas Barbosa Alexandre 5fcd7a87ab Merge branch 'sh-paginate-bitbucket-server-imports' into 'master' 
Paginate Bitbucket Server importer projects

See merge request gitlab-org/gitlab-ce!22825
 2018-11-07 20:48:40 +00: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
Stan Hu 5b6d5301d9 Paginate Bitbucket Server importer projects 
To prevent delays in loading the page and reduce memory usage, limit the
number of projects shown at 25 per page.

Part of https://gitlab.com/gitlab-org/gitlab-ce/issues/50021
 2018-11-07 11:37:46 -08: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
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
Markus Doits 0c59fdaab6
fix merge conflict 2018-11-07 14:21:44 +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
Markus Doits 3aa85715dd
change forgotten constant in spec to match code 2018-11-07 13:05:24 +01:00
Markus Doits c68f527035
fix failing specs due to latest changes 2018-11-07 13:05:15 +01:00
Markus Doits 9818bb5618
refactoring after latest feedback 2018-11-07 13:04:43 +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 48f37a92be
add a test that checks that retry when values in documentation are valid 2018-11-07 13:04:03 +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
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
Oswaldo Ferreira ec66ef1b74 Comment on any expanded diff line on MRs 2018-11-06 17:39:31 -02:00
Matija Čupić 7366c319df
Add additional specs for Normalizer 2018-11-06 18:56:06 +01:00
Matija Čupić 4ba960c17d
Use instance based approach for Normalizer 2018-11-06 18:35:44 +01:00
Matija Čupić f48261a409
Refactor Normalizer specs 2018-11-06 18:23:45 +01:00
Douglas Barbosa Alexandre 3301876bcc Merge branch 'allow_single_letter_external_issue_ids' into 'master' 
Allow single letter external issue IDs

Closes #52803

See merge request gitlab-org/gitlab-ce!22717
 2018-11-06 17:12:20 +00:00
Rémy Coutable ea3b8864e8 Merge branch 'unindirect-fetch-remote' into 'master' 
Stop Repository#fetch_remote from using Gitlab::Shell

See merge request gitlab-org/gitlab-ce!22635
 2018-11-06 16:42:17 +00:00
Sean McGivern 9de175bfff Add specs for single-letter external tracker refs 2018-11-06 15:02:09 +00:00
Nick Thomas 668e5d63fa
Stop Repository#fetch_remote from using Gitlab::Shell 
This indirection doesn't provide any value, so remove it
 2018-11-06 12:42:00 +00:00
Kamil Trzciński 1cf4aa0239 Merge branch 'stateful_deployments' into 'master' 
Change life cycle of `deployments` records in order to make it a stateful object

See merge request gitlab-org/gitlab-ce!22380
 2018-11-06 12:36:13 +00:00