Commit Graph

8436 Commits

Author SHA1 Message Date
Grzegorz Bizon 73d4b1f625 Merge branch 'revert-1cccfca1' into 'master'
Revert "Merge branch 'auto_devops_kubernetes_active' into 'master'"

See merge request gitlab-org/gitlab-ce!23826
2018-12-17 14:40:29 +00:00
Douwe Maan 0ab50681da Merge branch '55230-remove-project-cleanup-feature-flag' into 'master'
Remove the project_cleanup feature flag

Closes #55230

See merge request gitlab-org/gitlab-ce!23814
2018-12-17 13:25:09 +00:00
Yorick Peterse e8374cb6f4 Merge branch '55433-un-revert-https-gitlab-com-gitlab-org-gitlab-ce-commit-00acef434031b5dc0bf39576a9e83802c7806842-revert' into 'master'
Resolve "Un-revert 00acef4340 revert"

Closes #55433

See merge request gitlab-org/gitlab-ce!23861
2018-12-17 12:29:20 +00:00
Ash McKenzie 8ce86bf9a0
Revert "Revert "LfsToken uses JSONWebToken::HMACToken by default""
This reverts commit 00acef4340.
2018-12-17 17:17:39 +11:00
Thong Kuah c75c38f8ca Revert "Merge branch 'auto_devops_kubernetes_active' into 'master'"
This reverts merge request
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/22929
2018-12-17 14:00:22 +13:00
Jasper Maes 56296f1eda Remove rails4 specific code 2018-12-16 10:48:41 +01:00
Nick Thomas 0b74b86367
Fix repository cleanup with object storage on
When the BFG object map file is in object storage (i.e., uploads in
general are placed into object storage), we get an instance of the
Gitlab::HttpIO class. This doesn't behave as expected when you try to
read past EOF, so we need to explicitly check for this condition to
avoid ending up in a tight loop around io.read
2018-12-15 13:50:59 +00:00
Nick Thomas 8d2e1b724b Merge branch '54786-mr-empty-file-display' into 'master'
Display empty files properly on MR diffs

Closes #54786

See merge request gitlab-org/gitlab-ce!23671
2018-12-15 12:21:54 +00:00
Douwe Maan a0fd68288d Merge branch 'remove-issue-suggestions-flag' into 'master'
Remove issue_suggestions feature flag

Closes #55166

See merge request gitlab-org/gitlab-ce!23723
2018-12-14 15:13:25 +00:00
Kamil Trzciński 213891fa43 Merge branch 'ac-releases-name-sha-author' into 'master'
Add name, author and sha to releases

See merge request gitlab-org/gitlab-ce!23763
2018-12-14 11:53:13 +00:00
Oswaldo Ferreira ed3034bbb7 Allow suggesting single line changes in diffs 2018-12-13 19:17:19 +00:00
Alessio Caiazza b782ba1113
Add name, author and sha to releases
This commit adds a name to each release, defaulting it to tag name,
keeps track of the SHA when a new release is created and tracks the
current user as release author.
2018-12-13 12:15:21 +01:00
Kamil Trzciński 0165cfaa07 Re-define default only except policy 2018-12-13 10:39:55 +00:00
Phil Hughes 744f6ed12b
Enable GraphQL API endpoint 2018-12-13 10:12:13 +00:00
Kamil Trzciński 099777a356 Merge branch 'feature/gb/ci-pipeline-bridge' into 'master'
Add basic implementation of CI/CD bridge job

See merge request gitlab-org/gitlab-ce!23730
2018-12-12 14:22:48 +00:00
Rémy Coutable 7b1ea8cae2 Merge branch 'fix-rubocop-issues' into 'master'
Fix ConstantName rubocop offense

See merge request gitlab-org/gitlab-ce!23677
2018-12-12 10:44:13 +00:00
Grzegorz Bizon 320b6d965e Add basic implementation of CI/CD bridge job 2018-12-12 10:34:17 +01:00
Sean Nichols 05dcb2dd76 Display empty files properly on MR diffs 2018-12-11 23:49:04 -05:00
Stan Hu c8aaf15cec Merge branch 'sh-fix-diff-check-issue-55137-ce' into 'master'
[CE] Fix DiffCheck failing due to invalid string argument

See merge request gitlab-org/gitlab-ce!23741
2018-12-11 22:05:11 +00:00
Douwe Maan 1e4b6cd8e6
Remove now-unnecessary checks 2018-12-11 17:39:38 +01:00
Stan Hu eb335bbcfe
Fix DiffCheck failing due to invalid string argument
Hot patch for #55137
2018-12-11 17:39:32 +01:00
Nick Thomas 0ce7c29fb7
Update GitLab Workhorse to v8.0.0 2018-12-11 16:23:23 +00:00
Kamil Trzciński 18a48e348b Merge branch '7788_parse_license_management_reports_in_be-ce' into 'master'
Generalise test compare service

See merge request gitlab-org/gitlab-ce!22833
2018-12-11 15:42:59 +00:00
Shinya Maeda eb1956c504 Fix MR pipelines run on only: refex 2018-12-11 12:03:47 +01:00
Gilbert Roulot e6226e8cb3 Generalise test compare service
It adds a base class for CompareTestReportsService
containing common code with CompareLicenseManagementReportsService
which is present in GitLab Enterprise Edition.
2018-12-11 11:39:22 +01:00
Douwe Maan e1064f16a8 Merge branch '55116-runtimeerror-can-t-modify-frozen-string' into 'master'
Fix a frozen string error in lib/gitlab/utils.rb

Closes #55116

See merge request gitlab-org/gitlab-ce!23690
2018-12-10 16:47:15 +00:00
Rémy Coutable eadd53b969 Merge branch 'sh-remove-gitlab-shell-include' into 'master'
Remove unnecessary includes of ShellAdapter

See merge request gitlab-org/gitlab-ce!23607
2018-12-10 16:22:53 +00:00
Rémy Coutable f233c3bce0
Fix a frozen string error in lib/gitlab/utils.rb
Signed-off-by: Rémy Coutable <remy@rymai.me>
2018-12-10 16:08:58 +01:00
Rémy Coutable 5c5a5992c0 Merge branch 'sh-ignore-arrays-url-sanitizer' into 'master'
Only allow strings in URL::Sanitizer.valid?

Closes #55079

See merge request gitlab-org/gitlab-ce!23675
2018-12-10 12:03:01 +00:00
Douwe Maan 5a727a4d36 Merge branch 'osw-update-mr-metrics-with-events-data' into 'master'
Populate MR metrics with events table information (migration)

Closes #41587

See merge request gitlab-org/gitlab-ce!23564
2018-12-10 09:39:07 +00:00
Fabio Busatto 66d868afe9 Use new reports syntax for SAST in Auto DevOps 2018-12-10 09:35:29 +00:00
Semyon Pupkov 7b98257453 Fix ConstantName rubocop offense 2018-12-09 22:45:48 +05:00
Stan Hu 401be1d17f Only allow strings in URL::Sanitizer.valid?
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/55079
2018-12-09 07:59:54 -08:00
Clement Ho a89b526950 Merge branch 'ce-jej/group-saml-sso-button-link-description' into 'master'
[CE] Backport SAML unlink changes: UrlBlocker#ascii_only

See merge request gitlab-org/gitlab-ce!23627
2018-12-08 03:02:18 +00:00
Stan Hu 4fb5e47928 Merge branch '55054-correlation-ids-being-passed-through-grpc-metadata-are-incorrect' into 'master'
Fix for incorrect Correlation-ID key being passed through GRPC metadata

Closes #55054

See merge request gitlab-org/gitlab-ce!23666
2018-12-08 00:27:19 +00:00
Stan Hu 9655a602ac Merge branch 'tc-backfill-hashed-project_repositories' into 'master'
Fill project_repositories for hashed storage projects

Closes #48527

See merge request gitlab-org/gitlab-ce!23482
2018-12-07 23:16:44 +00:00
Andrew Newdigate 6c426c0e39 Rename the correlation field from `correlation_id` to `x-gitlab-correlation-id` 2018-12-07 14:36:33 -08:00
Zeger-Jan van de Weg 896c0bdbfb
Allow public forks to be deduplicated
When a project is forked, the new repository used to be a deep copy of everything
stored on disk by leveraging `git clone`. This works well, and makes isolation
between repository easy. However, the clone is at the start 100% the same as the
origin repository. And in the case of the objects in the object directory, this
is almost always going to be a lot of duplication.

Object Pools are a way to create a third repository that essentially only exists
for its 'objects' subdirectory. This third repository's object directory will be
set as alternate location for objects. This means that in the case an object is
missing in the local repository, git will look in another location. This other
location is the object pool repository.

When Git performs garbage collection, it's smart enough to check the
alternate location. When objects are duplicated, it will allow git to
throw one copy away. This copy is on the local repository, where to pool
remains as is.

These pools have an origin location, which for now will always be a
repository that itself is not a fork. When the root of a fork network is
forked by a user, the fork still clones the full repository. Async, the
pool repository will be created.

Either one of these processes can be done earlier than the other. To
handle this race condition, the Join ObjectPool operation is
idempotent. Given its idempotent, we can schedule it twice, with the
same effect.

To accommodate the holding of state two migrations have been added.
1. Added a state column to the pool_repositories column. This column is
managed by the state machine, allowing for hooks on transitions.
2. pool_repositories now has a source_project_id. This column in
convenient to have for multiple reasons: it has a unique index allowing
the database to handle race conditions when creating a new record. Also,
it's nice to know who the host is. As that's a short link to the fork
networks root.

Object pools are only available for public project, which use hashed
storage and when forking from the root of the fork network. (That is,
the project being forked from itself isn't a fork)

In this commit message I use both ObjectPool and Pool repositories,
which are alike, but different from each other. ObjectPool refers to
whatever is on the disk stored and managed by Gitaly. PoolRepository is
the record in the database.
2018-12-07 19:18:37 +01:00
Stan Hu e17ccef5ca Merge branch 'store-correlation-logs' into 'master'
Log and pass correlation-id between Unicorn, Sidekiq and Gitaly

See merge request gitlab-org/gitlab-ce!22844
2018-12-07 15:29:00 +00:00
Douwe Maan cda291f0c3 Merge branch '48889-populate-merge_commit_sha' into 'master'
Update merge request's merge_commit after branch update

Closes #48889

See merge request gitlab-org/gitlab-ce!22794
2018-12-07 15:27:17 +00:00
Douwe Maan b081614bef Merge branch '7772-add-subscription-table-to-gitlab-com-billing-areas-ce' into 'master'
Backports some changes from gitlab-ee!7885

See merge request gitlab-org/gitlab-ce!23637
2018-12-07 14:59:08 +00:00
Rubén Dávila b2cf4b9525 Backports some changes from gitlab-ee!7885 2018-12-07 08:29:53 -05:00
Mark Chao c6c53d1c74 Fix commit with two parents is set with wrong direct_ancestor
If a commit has two parents, one is direct ancestor, and one is not,
and the order of `commits` is in such fashion that the non-ancestor
side is visited first, the commit would be determined as non-ancestor,
when in fact it can be.

Therefore we should first determine all direct ancestors
prior to analyzing.
2018-12-07 21:00:47 +08:00
Kamil Trzciński eb33ca49b8 Add `::` to Gitlab::Middleware::CorrelationId 2018-12-07 12:18:03 +00:00
Mark Chao 1f7647f446 Update merge request's merge_commit for branch update
Analyze new commits graph to determine each commit's merge commit.

Fix "merged with [commit]" info for merge requests being merged
automatically by other actions.

Allow analyzing upto the relevant commit
2018-12-07 19:24:34 +08:00
Kamil Trzciński a910c09bbc Encrypt CI/CD builds tokens
Brings back 1e8f1de0 reverted in !23644

Closes #52342

See merge request gitlab-org/gitlab-ce!23436
2018-12-07 10:42:47 +01:00
Douglas Barbosa Alexandre 8c9e692095
Fill project_repositories for hashed storage 2018-12-06 22:57:56 -02:00
Robert Speicher 950b9130ad
Revert "Merge branch 'fix/gb/encrypt-ci-build-token' into 'master'"
This reverts commit 1e8f1de034, reversing
changes made to 62d971129d.
2018-12-06 18:53:24 -06:00
Oswaldo Ferreira 4f6999fa26 Populate MR metrics with events table information (migration) 2018-12-06 22:08:38 -02:00
Toon Claes 5237a55d62
Fill project_repositories for hashed storage
This adds a background migration that will ensure all projects that
are on hashed storage have a row in `project_repositories`.

Related issue: https://gitlab.com/gitlab-org/gitlab-ce/issues/48527
2018-12-06 21:04:41 -02:00