Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/lib/gitlab
AgeCommit message (Collapse)Author
2018-12-07Merge branch 'store-correlation-logs' into 'master'Stan Hu
Log and pass correlation-id between Unicorn, Sidekiq and Gitaly See merge request gitlab-org/gitlab-ce!22844
2018-12-07Merge branch '48889-populate-merge_commit_sha' into 'master'Douwe Maan
Update merge request's merge_commit after branch update Closes #48889 See merge request gitlab-org/gitlab-ce!22794
2018-12-07Merge branch '7772-add-subscription-table-to-gitlab-com-billing-areas-ce' ↵Douwe Maan
into 'master' Backports some changes from gitlab-ee!7885 See merge request gitlab-org/gitlab-ce!23637
2018-12-07Backports some changes from gitlab-ee!7885Rubén Dávila
2018-12-07Fix commit with two parents is set with wrong direct_ancestorMark Chao
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-07Add `::` to Gitlab::Middleware::CorrelationIdKamil Trzciński
2018-12-07Update merge request's merge_commit for branch updateMark Chao
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-07Encrypt CI/CD builds tokensKamil Trzciński
Brings back 1e8f1de0 reverted in !23644 Closes #52342 See merge request gitlab-org/gitlab-ce!23436
2018-12-07Revert "Merge branch 'fix/gb/encrypt-ci-build-token' into 'master'"Robert Speicher
This reverts commit 1e8f1de034aa9b6a60b640b2b091f60c4d3ba365, reversing changes made to 62d971129da99936a3cdc04f3740d26f16a0c7a6.
2018-12-07Add feature flag for workhorse content type calculationFrancisco Javier López
2018-12-06Revert "Prefer to use correlation-id in logs"Kamil Trzciński
This reverts commit 3560b11922fd180eea5cafd0e763e0e601c5c4ee.
2018-12-06Merge branch '19376-post-bfg-cleanup' into 'master'Douglas Barbosa Alexandre
Allow internal references to be removed Closes #19376 See merge request gitlab-org/gitlab-ce!23189
2018-12-06Prefer to use correlation-id in logsKamil Trzciński
This changes `correlation_id` to be `correlation-id` when passed via jobs
2018-12-06Log and pass correlation-id between Unicorn, Sidekiq and GitalyKamil Trzciński
The Correlation ID is taken or generated from received X-Request-ID. Then it is being passed to all executed services (sidekiq workers or gitaly calls). The Correlation ID is logged in all structured logs as `correlation_id`.
2018-12-06Use BFG object maps to clean projectsNick Thomas
2018-12-06Merge branch '54857-fix-templates-path-traversal' into 'master'Cindy Pallares
[master]: Prevent a path traversal attack on global file templates Closes #2745 See merge request gitlab/gitlabhq!2677
2018-12-06Merge branch 'blob-count2' into 'master'Rémy Coutable
Support unlimited file search in web UI and API See merge request gitlab-org/gitlab-ce!23553
2018-12-06Use approximate counts for big tablesJan Provaznik
2018-12-06Merge branch 'sh-handle-invalid-gpg-sig' into 'master'Nick Thomas
Gracefully handle unknown/invalid GPG keys Closes #54729 See merge request gitlab-org/gitlab-ce!23492
2018-12-06Merge branch 'fix/gb/encrypt-ci-build-token' into 'master'Kamil Trzciński
Encrypt CI/CD builds tokens Closes #52342 See merge request gitlab-org/gitlab-ce!23436
2018-12-06Optimized file search to work without limitsJan Provaznik
* removed 100 limit on file search results because we load all results anyway * expensive processing (parsing match content, utf encoding) is done only for selected page in paginated output
2018-12-05Gracefully handle unknown/invalid GPG keysStan Hu
An unknown public GPG key will result in a GPGME::Error thrown from gpg, which would cause an Error 500 on the signatures endpoint. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/54729
2018-12-05Merge branch '54886-usage-data-group-clusters' into 'master'Kamil Trzciński
Add UsageData for group/project clusters Closes #54886 See merge request gitlab-org/gitlab-ce!23590
2018-12-05Merge branch '34758-deployment-cluster' into 'master'Kamil Trzciński
Use group clusters when deploying (DeploymentPlatform) See merge request gitlab-org/gitlab-ce!22308
2018-12-05Rename project's pipelines relationFrancisco Javier López
2018-12-05Prevent a path traversal attack on global file templatesNick Thomas
The API permits path traversal characters like '../' to be passed down to the template finder. Detect these requests and cause them to fail with a 500 response code.
2018-12-05Add UsageData for group/project clustersDylan Griffith
2018-12-05Merge branch 'osw-fix-grouping-by-file-path' into 'master'Nick Thomas
Avoid 500's when serializing legacy diff notes Closes #54793 See merge request gitlab-org/gitlab-ce!23544
2018-12-05Merge branch 'mr-pipelines-2' into 'master'Kamil Trzciński
Merge request pipelines See merge request gitlab-org/gitlab-ce!23217
2018-12-05Exclude encrypted build token from import/export and retriesGrzegorz Bizon
2018-12-05Merge branch '53659-use-padded-key-for-gcm-ciphers' into 'master'Rémy Coutable
Use a 32-byte version of db_key_base for web hooks Closes #53659 See merge request gitlab-org/gitlab-ce!23573
2018-12-05Merge branch 'retryable_create_or_update_kubernetes_namespace' into 'master'Kamil Trzciński
Update K8s project namespace and ServiceAccount if exist See merge request gitlab-org/gitlab-ce!23525
2018-12-05Merge branch 'set-kubeconfig-nil-when-token-nil' into 'master'Dmitriy Zaporozhets
Make KUBECONFIG nil if KUBE_TOKEN is nil See merge request gitlab-org/gitlab-ce!23414
2018-12-05Revert "LfsToken uses JSONWebToken::HMACToken by default"🤖 GitLab Bot 🤖
This reverts commit 22954f220231281360377922b709efb904559949
2018-12-05Merge request pipelinesShinya Maeda
2018-12-05LfsToken uses JSONWebToken::HMACToken by defaultAsh McKenzie
LfsToken::HMACToken#token_valid?() will be examined and if false, look in redis via LfsToken::LegacyRedisDeviseToken#token_valid?().
2018-12-05Use user? insteadAsh McKenzie
2018-12-05Use a 32-byte version of db_key_base for web hooksNick Thomas
AES-256-GCM cipher mode requires a key that is exactly 32 bytes long. We already handle the case when the key is too long, by truncating, but the key can also be too short in some installations. Switching to a key that is always exactly the right length (by virtue of right-padding ASCII 0 characters) allows encryption to proceed, without breaking backward compatibility. When the key is too short, encryption fails with an `ArgumentError`, causing the web hooks functionality to be unusable. As a result, zero rows can exist with values encrypted with the too-short key. When the key is too long, it is silently truncated. In this case, the key is unchanged, so values encrypted with the new too-long key will still be successfully decrypted.
2018-12-05Various improvements to hierarchy sortingThong Kuah
- Rename ordered_group_clusters_for_project -> ancestor_clusters_for_clusterable - Improve name of order option. It makes much more sense to have `hierarchy_order: :asc` and `hierarchy_order: :desc` - Allow ancestor_clusters_for_clusterable for group - Re-use code already present in Project
2018-12-05Deploy to clusters for a project's groupsThong Kuah
Look for matching clusters starting from the closest ancestor, then go up the ancestor tree. Then use Ruby to get clusters for each group in order. Not that efficient, considering we will doing up to `NUMBER_OF_ANCESTORS_ALLOWED` number of queries, but it's a finite number Explicitly order query by depth This allows us to control ordering explicitly and also to reverse the order which is useful to allow us to be consistent with Clusters::Cluster.on_environment (EE) which does reverse ordering. Puts querying group clusters behind Feature Flag. Just in case we have issues with performance, we can easily disable this
2018-12-05Modify service so that it can be re-runThong Kuah
If the service fails mid-point, then we should be able to re-run this service. So, detect presence of any previously created Kubernetes resource and update or create accordingly. Fix specs accordingly. In the case of finalize_creation_service_spec.rb, I decided to stub out the async worker rather than maintaining individual stubs for various kubeclient calls for that worker.
2018-12-04Merge branch 'define-default-value-for-only-except-keys' into 'master'Kamil Trzciński
Define the default value for only/except policies See merge request gitlab-org/gitlab-ce!23531
2018-12-04Merge branch 'fix/gb/encrypt-runners-tokens' into 'master'Nick Thomas
Encrypt runners tokens Closes #51232 and #52931 See merge request gitlab-org/gitlab-ce!23412
2018-12-04Avoid 500's when serializing legacy diff notesOswaldo Ferreira
2018-12-04Define the default value for only/except policiesShinya Maeda
Currently, if a job does not have only/except policies, the policy is considered as an unspecified state, and therefore the job is executed regardless of how it's executed and which branch/tags are targetted. Ideally, this should be specified as only: ['branches', 'tags'], as it indicates that unspecified policy jobs are meant to run on any git references.
2018-12-04CE port Refactor Gitlab::Checks::ChangeAccess classFrancisco Javier López
2018-12-04Add a line before conditional in encrypt columns classGrzegorz Bizon
2018-12-04Merge commit '83f0798e7dc588f0e4cb6816daadeef7dbfc8b81' into ↵Grzegorz Bizon
fix/gb/encrypt-runners-tokens * commit '83f0798e7dc588f0e4cb6816daadeef7dbfc8b81': (101 commits)
2018-12-04Revert "Merge branch 'auto-devops-support-for-group-security-dashboard' into ↵Fabio Busatto
'master'" This reverts merge request !23165
2018-12-04Modify service so that it can be re-runThong Kuah
If the service fails mid-point, then we should be able to re-run this service. So, detect presence of any previously created Kubernetes resource and update or create accordingly. Fix specs accordingly. In the case of finalize_creation_service_spec.rb, I decided to stub out the async worker rather than maintaining individual stubs for various kubeclient calls for that worker. Also add test cases for group clusters
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-14 09:58:27 +0300