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
AgeCommit message (Collapse)Author
2019-01-24Enable the Layout/ExtraSpacing copRémy Coutable
Signed-off-by: Rémy Coutable <remy@rymai.me>
2019-01-24Merge branch 'sh-remove-bitbucket-mirror-constant' into 'master'Robert Speicher
Fix import handling errors in Bitbucket Server importer See merge request gitlab-org/gitlab-ce!24499
2019-01-23Merge branch '56417-update-helm-to-2-12-2' into 'master'Kamil Trzciński
Update Helm to 2.12.2 to address Helm client vulnerability Closes #56417 See merge request gitlab-org/gitlab-ce!24418
2019-01-22Merge branch 'an-opentracing-propagation' into 'master'Kamil Trzciński
Adds inter-service OpenTracing propagation See merge request gitlab-org/gitlab-ce!24239
2019-01-22Merge branch 'fixes-populate-cluster-kubernetes-namespace-table-spec' into ↵Kamil Trzciński
'master' Removes factories on Cluster background migration See merge request gitlab-org/gitlab-ce!24536
2019-01-22Adds inter-service OpenTracing propagationAndrew Newdigate
This change allows the GitLab rails and sidekiq components to receive tracing spans from upstream services such as Workhorse and pass these spans on to downstream services including Gitaly and Sidekiq. This change will also emit traces for incoming and outgoing requests using the propagated trace information. This will allow operators and engineers to view traces across the Workhorse, GitLab Rails, Sidekiq and Gitaly components. Additional intra-service instrumentation will be added in future changes.
2019-01-22Merge branch ↵Grzegorz Bizon
'55966-when-ref-is-ambiguous-createpipelineservice-raises-an-error' into 'master' Resolve "When ref is ambiguous, `CreatePipelineService` raises an error" Closes #55966 See merge request gitlab-org/gitlab-ce!24437
2019-01-22Removes factories on Cluster background migrationMayra Cabrera
'Populate cluster kubernetes namespace' was using factories for their specs. According to our documentation (see spec/migrations/readme.md), we should use table helper to create a temproary ActiveRecord::Base derived model for a table.
2019-01-22Limit Sidekiq args logging to 10 KB of JSONSean McGivern
When logging arguments from Sidekiq to JSON, restrict the size of `args` to 10 KB (when converted to JSON). This is to avoid blowing up with excessively large job payloads.
2019-01-21Assign pipeline protected attribute in PopulateMatija Čupić
This removes the Protect pipeline chain step and assigns the protected attribute in the Populate step instead.
2019-01-19Fix import handling errors in Bitbucket Server importerStan Hu
https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/20724 removed `Gitlab::Git::RepositoryMirroring::RemoteError`, but this was still being handled in the Bitbucket Server importer and only encountered if some exception other than `Gitlab::Shell::Error` were thrown.
2019-01-18Move assignment to protected to separate stepMatija Čupić
This moves setting the protected attribute of a pipeline to a separate pipeline chain step in order to perform the assignment after validation.
2019-01-18Avoid overwriting default jaeger values with nilAndrew Newdigate
During the review process for adding opentracing factories, a bug was introduced which caused Jaeger to initialize an invalid tracer. The bug was due to use sending nil through as a kwarg when the Jaeger initializer used a non-nil default value. This is fairly insidious as, the tracer looks like a tracer, but, when methods are invoked, it throws `NoMethodError` errors. To ensure that this issue does not happen in future, the tests have been changed to ensure that the tracer works as expected. This could avoid problems in future when upgrading to newer versions of Jaeger.
2019-01-18Update Helm to 2.12.2 to address Helm client vulnerabilityTakuya Noguchi
Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
2019-01-17Conditionally initialize the global opentracing tracerAndrew Newdigate
This change will instantiate an OpenTracing tracer and configure it as the global tracer when the GITLAB_TRACING environment variable is configured. GITLAB_TRACING takes a "connection string"-like value, encapsulating the driver (eg jaeger, etc) and options for the driver. Since each service, whether it's written in Ruby or Golang, uses the same connection-string, it should be very easy to configure all services in a cluster, or even a single development machine to be setup to use tracing. Note that this change does not include instrumentation or propagation changes as this is a way of breaking a previous larger change into components. The instrumentation and propagation changes will follow in separate changes.
2019-01-16Prevent checking protected_ref? for ambiguous refsMatija Čupić
2019-01-16Merge branch ↵Stan Hu
'56309-read-only-controller-doesn-t-account-for-relative-paths-for-admin-sidekiq-route' into 'master' Allow sidekiq admin requests, regardless of root Closes #56309 See merge request gitlab-org/gitlab-ce!24352
2019-01-16Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqRobert Speicher
2019-01-16Merge branch 'security-2770-verify-bundle-import-files' into 'master'Yorick Peterse
[master] Validate bundle files before unpacking them Closes #2770 See merge request gitlab/gitlabhq!2772
2019-01-16Merge branch 'bvl-dont-use-factories-in-bg-migration-specs-ce' into 'master'Rémy Coutable
Enable FactoriesInMigration cop for background migrations See merge request gitlab-org/gitlab-ce!24425
2019-01-16Merge branch 'refactor-after-create-default-branch' into 'master'Nick Thomas
Refactor Project#after_create_default_branch See merge request gitlab-org/gitlab-ce!24329
2019-01-16Refactor code for protecting default branchesYorick Peterse
This refactors some of the logic used for protecting default branches, in particular Project#after_create_default_branch. The logic for this method is moved into a separate service class. Ideally we'd get rid of Project#after_create_default_branch entirely, but unfortunately Project#after_import depends on it. This means it has to stick around until we also refactor Project#after_import. For branch protection levels we introduce Gitlab::Access::BranchProtection, which provides a small wrapper around Integer based branch protection levels. Using this class removes the need for having to constantly refer to Gitlab::Access::PROTECTION_* constants.
2019-01-16Ignore existing offenses of FactoriesInMigrationBob Van Landuyt
2019-01-16Allow sidekiq admin requests, regardless of rootAsh McKenzie
2019-01-15Merge branch 'sh-fix-backfill-project-repo-migration' into 'master'Douwe Maan
Fix duplicate project disk path in BackfillLegacyProjectRepositories Closes #56061 See merge request gitlab-org/gitlab-ce!24213
2019-01-15Merge branch 'backstage/gb/refactor-only-except-policies-config' into 'master'Kamil Trzciński
Refactor only/except configuration policies See merge request gitlab-org/gitlab-ce!24359
2019-01-15Simplify code related to setting default config valuesGrzegorz Bizon
2019-01-15Make default config entry value configurableGrzegorz Bizon
Introduce `default:` configuration entry setting that makes it possible to configure a default value of an entry, what overrides class-level `def self.default` value.
2019-01-14Merge branch 'sh-fix-gon-helper-avatar' into 'master'Rémy Coutable
Fix no avatar not showing in user selection box Closes #56268 See merge request gitlab-org/gitlab-ce!24346
2019-01-14Resolve "Add "What's new" menu item in top navigation"Brandon Labuschagne
2019-01-14Fix specs related to emtpy `except` policy configGrzegorz Bizon
2019-01-14Add more specs for only/except policy config entryGrzegorz Bizon
2019-01-13Fix no avatar not showing in user selection boxStan Hu
After upgrading to Ruby 2.5.3, we switched `URI.join` in favor of `Gitlab::Utils.append_path`. However, ActionController::Base.helpers.image_path can return a full URL if a CDN host is present. Rails provides a way to generate the full URL using the asset path, but that doesn't appear to work because `request` is nil`. Revert to the previous behavior to handle CDNs and relative URLs. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/56268
2019-01-11Fix failing spec with orphaned namespaceToon Claes
2019-01-11Fix duplicate disk path in Backfill ProjectReposStan Hu
On GitLab.com, we saw numerous duplicate disk entry inserts because the migration was not taking the routes table into account. We now implement this in the migration to be consistent. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/56061
2019-01-11Validate bundle files before unpacking themNick Thomas
2019-01-10Remove backfill migration for legacy projectsToon Claes
We've found some problems with the backgroung migration: BackfillLegacyProjectRepositories See https://gitlab.com/gitlab-org/gitlab-ce/issues/56061 The migration was disabled to run on production: https://gitlab.com/gitlab-com/gl-infra/infrastructure/issues/5906 So to overcome it's not being run anywhere, just remove it. Whenever all problems in BackfillLegacyProjectRepositories are fixed we'll create a new migration (with a different timestamp) to have it run.
2019-01-09Add specs for both parallel and regular job depsMatija Čupić
2019-01-09Merge branch 'sh-switch-rack-request-to-actionpack' into 'master'Robert Speicher
Switch use of Rack::Request to ActionDispatch::Request See merge request gitlab-org/gitlab-ce!24199
2019-01-09Revert "Merge branch '3062-improve-project-cache' into 'master'"Stan Hu
This reverts commit e65e184269bb27661c9a20658933e8482aa90b62, reversing changes made to 646ba2418b630710edeaac94b57d08adf2771257.
2019-01-08Merge branch 'osw-fix-bottom-expansion-diff-comment' into 'master'Douglas Barbosa Alexandre
Adjusts duplicated line when commenting on unfolded diff lines (in the bottom) Closes #56051 See merge request gitlab-org/gitlab-ce!24201
2019-01-08Adjusts duplicated line when commenting on unfolded diff linesOswaldo Ferreira
2019-01-08Check if specific type of background migration are doneMark Chao
Useful for checking progress.
2019-01-08Merge branch '53966-hashed-storage-read-only' into 'master'Douglas Barbosa Alexandre
Hashed Storage: Only set as `read_only` when starting the per-project migration See merge request gitlab-org/gitlab-ce!24128
2019-01-08Only set as `read_only` when starting the per-project migrationGabriel Mazetto
In the previous code, we locked the project during the migration scheduling step, which works fine for small setups, but can be problematic in really big installations. We now moved the logic to inside the worker, so we minimize the time a project will be read-only. We also make sure we only do that if reference counter is `0` (no current operation is in progress).
2019-01-07Add table and model for error tracking settingsReuben Pereira
2019-01-07Merge branch 'include-project' into 'master'Grzegorz Bizon
Allow to include another project files Closes #53903 See merge request gitlab-org/gitlab-ce!24101
2019-01-07Allow to include files from another projectsKamil Trzciński
This adds `project:, file:, ref:` specification support.
2019-01-07Switch use of Rack::Request to ActionDispatch::RequestStan Hu
As mentioned in https://gitlab.com/gitlab-org/gitlab-ee/issues/9035#note_129093444, Rails 5 switched ActionDispatch::Request so that it no longer inherits Rack::Request directly. A middleware that uses Rack::Request to read the environment may see stale request parameters if another middleware modifies the environment via ActionDispatch::Request. To be safe, we should be using ActionDispatch::Request everywhere.
2019-01-06Merge branch 'kamil-refactor-ci-builds-v5' into 'master'Grzegorz Bizon
Use BuildMetadata to store build configuration in JSONB form See merge request gitlab-org/gitlab-ce!21499