summaryrefslogtreecommitdiff
path: root/lib/gitlab
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '56417-update-helm-to-2-12-2' into 'master'Kamil Trzciński2019-01-232-2/+2
|\ | | | | | | | | | | | | Update Helm to 2.12.2 to address Helm client vulnerability Closes #56417 See merge request gitlab-org/gitlab-ce!24418
| * Update Helm to 2.12.2 to address Helm client vulnerability56417-update-helm-to-2-12-2-ado-testTakuya Noguchi2019-01-182-2/+2
| | | | | | | | Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
* | Merge branch 'an-opentracing-propagation' into 'master'Kamil Trzciński2019-01-227-1/+241
|\ \ | | | | | | | | | | | | Adds inter-service OpenTracing propagation See merge request gitlab-org/gitlab-ce!24239
| * | Adds inter-service OpenTracing propagationAndrew Newdigate2019-01-227-1/+241
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | Merge branch ↵Grzegorz Bizon2019-01-222-1/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '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
| * | | Assign pipeline protected attribute in PopulateMatija Čupić2019-01-212-19/+4
| | | | | | | | | | | | | | | | | | | | This removes the Protect pipeline chain step and assigns the protected attribute in the Populate step instead.
| * | | Move assignment to protected to separate stepMatija Čupić2019-01-183-3/+19
| | | | | | | | | | | | | | | | | | | | This moves setting the protected attribute of a pipeline to a separate pipeline chain step in order to perform the assignment after validation.
| * | | Prevent checking protected_ref? for ambiguous refsMatija Čupić2019-01-161-0/+2
| | | |
* | | | Merge branch '56547-limit-sidekiq-logging-based-on-argument-size' into 'master'Stan Hu2019-01-221-0/+17
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Limit sidekiq logging based on argument size" Closes #56547 See merge request gitlab-org/gitlab-ce!24493
| * | | | Limit Sidekiq args logging to 10 KB of JSONSean McGivern2019-01-221-0/+17
| | |/ / | |/| | | | | | | | | | | | | | | | | | 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.
* | | | Merge branch 'force-redeploy-on-updated-secrets' into 'master'Kamil Trzciński2019-01-221-10/+12
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Force Auto DevOps redeployment when application secrets are updated Closes #55540 See merge request gitlab-org/gitlab-ce!24498
| * | | Changed AutoDevops function k8s_prefixed_variables to temp filewalkafwalka2019-01-191-16/+10
| | | |
| * | | Force Auto DevOps redeployment when application secrets are updatedwalkafwalka2019-01-181-0/+8
| | |/ | |/|
* | | Avoid overwriting default jaeger values with nilAndrew Newdigate2019-01-181-1/+1
|/ / | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | Conditionally initialize the global opentracing tracerAndrew Newdigate2019-01-173-0/+175
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | Added support for custom hosts/domainsAaron Walker2019-01-171-0/+10
| |
* | Merge branch ↵Stan Hu2019-01-161-5/+13
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | '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
| * | Bang up predicate methods and use #internal_route?Ash McKenzie2019-01-161-3/+7
| | | | | | | | | | | | | | | Extract internal route logic check out into #internal_route? Add ? to #grack_route and #lfs_route predicate methods
| * | Allow sidekiq admin requests, regardless of rootAsh McKenzie2019-01-161-3/+7
| | |
* | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqRobert Speicher2019-01-162-0/+35
|\ \ \ | |_|/ |/| |
| * | Merge branch 'security-2770-verify-bundle-import-files' into 'master'Yorick Peterse2019-01-162-0/+35
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | [master] Validate bundle files before unpacking them Closes #2770 See merge request gitlab/gitlabhq!2772
| | * | Validate bundle files before unpacking themNick Thomas2019-01-102-0/+35
| | | |
* | | | Merge branch 'refactor-after-create-default-branch' into 'master'Nick Thomas2019-01-161-0/+42
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Refactor Project#after_create_default_branch See merge request gitlab-org/gitlab-ce!24329
| * | | | Refactor code for protecting default branchesYorick Peterse2019-01-161-0/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | Extract process_name from GitLab::SentryAndrew Newdigate2019-01-161-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GitLab::Sentry has a program_context method to determine whether a Sentry exception occurred in Sidekiq or rails. Since we will need similar functionality for distributed tracing, this change extracts the program_context method into GitLab.process_name for more general consumption.
* | | | | Merge branch 'fix-trivial-accessors' into 'master'Rémy Coutable2019-01-161-3/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | chore(rubocop): fix Style/TrivialAccessors issues See merge request gitlab-org/gitlab-ce!24416
| * | | | | chore(rubocop): fix Style/TrivialAccessors issuesSemyon Pupkov2019-01-161-3/+1
| | |_|_|/ | |/| | |
* | | | | Adopt Fugit to replace Rufus::SchedulerLin Jen-Shin2019-01-151-5/+2
|/ / / /
* | | | Merge branch 'sh-fix-backfill-project-repo-migration' into 'master'Douwe Maan2019-01-151-2/+12
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix duplicate project disk path in BackfillLegacyProjectRepositories Closes #56061 See merge request gitlab-org/gitlab-ce!24213
| * | | | Cleanup dead code and commentsToon Claes2019-01-111-20/+0
| | | | |
| * | | | Fix failing spec with orphaned namespaceToon Claes2019-01-111-1/+1
| | | | |
| * | | | Load all projects, namespaces, routes in 1 queryToon Claes2019-01-111-9/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid doing sequential database queries to load the namespaces and the routes of projects and namespaces. This results in the following query: ```sql SELECT "projects"."id" AS t0_r0, "projects"."name" AS t0_r1, "projects"."path" AS t0_r2, "projects"."description" AS t0_r3, "projects"."created_at" AS t0_r4, "projects"."updated_at" AS t0_r5, "projects"."creator_id" AS t0_r6, "projects"."namespace_id" AS t0_r7, "projects"."last_activity_at" AS t0_r8, "projects"."import_url" AS t0_r9, "projects"."visibility_level" AS t0_r10, "projects"."archived" AS t0_r11, "projects"."avatar" AS t0_r12, "projects"."import_status" AS t0_r13, "projects"."star_count" AS t0_r14, "projects"."import_type" AS t0_r15, "projects"."import_source" AS t0_r16, "projects"."import_error" AS t0_r17, "projects"."ci_id" AS t0_r18, "projects"."shared_runners_enabled" AS t0_r19, "projects"."runners_token" AS t0_r20, "projects"."build_coverage_regex" AS t0_r21, "projects"."build_allow_git_fetch" AS t0_r22, "projects"."build_timeout" AS t0_r23, "projects"."pending_delete" AS t0_r24, "projects"."public_builds" AS t0_r25, "projects"."last_repository_check_failed" AS t0_r26, "projects"."last_repository_check_at" AS t0_r27, "projects"."container_registry_enabled" AS t0_r28, "projects"."only_allow_merge_if_pipeline_succeeds" AS t0_r29, "projects"."has_external_issue_tracker" AS t0_r30, "projects"."repository_storage" AS t0_r31, "projects"."request_access_enabled" AS t0_r32, "projects"."has_external_wiki" AS t0_r33, "projects"."ci_config_path" AS t0_r34, "projects"."lfs_enabled" AS t0_r35, "projects"."description_html" AS t0_r36, "projects"."only_allow_merge_if_all_discussions_are_resolved" AS t0_r37, "projects"."printing_merge_request_link_enabled" AS t0_r38, "projects"."auto_cancel_pending_pipelines" AS t0_r39, "projects"."import_jid" AS t0_r40, "projects"."cached_markdown_version" AS t0_r41, "projects"."delete_error" AS t0_r42, "projects"."last_repository_updated_at" AS t0_r43, "projects"."storage_version" AS t0_r44, "projects"."resolve_outdated_diff_discussions" AS t0_r45, "projects"."repository_read_only" AS t0_r46, "projects"."merge_requests_ff_only_enabled" AS t0_r47, "projects"."merge_requests_rebase_enabled" AS t0_r48, "projects"."jobs_cache_index" AS t0_r49, "projects"."pages_https_only" AS t0_r50, "projects"."remote_mirror_available_overridden" AS t0_r51, "projects"."pool_repository_id" AS t0_r52, "projects"."runners_token_encrypted" AS t0_r53, "projects"."bfg_object_map" AS t0_r54, "namespaces"."id" AS t1_r0, "namespaces"."name" AS t1_r1, "namespaces"."path" AS t1_r2, "namespaces"."owner_id" AS t1_r3, "namespaces"."created_at" AS t1_r4, "namespaces"."updated_at" AS t1_r5, "namespaces"."type" AS t1_r6, "namespaces"."description" AS t1_r7, "namespaces"."avatar" AS t1_r8, "namespaces"."share_with_group_lock" AS t1_r9, "namespaces"."visibility_level" AS t1_r10, "namespaces"."request_access_enabled" AS t1_r11, "namespaces"."description_html" AS t1_r12, "namespaces"."lfs_enabled" AS t1_r13, "namespaces"."parent_id" AS t1_r14, "namespaces"."require_two_factor_authentication" AS t1_r15, "namespaces"."two_factor_grace_period" AS t1_r16, "namespaces"."cached_markdown_version" AS t1_r17, "namespaces"."runners_token" AS t1_r18, "namespaces"."runners_token_encrypted" AS t1_r19, "routes"."id" AS t2_r0, "routes"."source_id" AS t2_r1, "routes"."source_type" AS t2_r2, "routes"."path" AS t2_r3, "routes"."created_at" AS t2_r4, "routes"."updated_at" AS t2_r5, "routes"."name" AS t2_r6, "routes_projects"."id" AS t3_r0, "routes_projects"."source_id" AS t3_r1, "routes_projects"."source_type" AS t3_r2, "routes_projects"."path" AS t3_r3, "routes_projects"."created_at" AS t3_r4, "routes_projects"."updated_at" AS t3_r5, "routes_projects"."name" AS t3_r6 FROM "projects" LEFT OUTER JOIN "namespaces" ON "namespaces"."id" = "projects"."namespace_id" LEFT OUTER JOIN "routes" ON "routes"."source_id" = "namespaces"."id" AND "routes"."source_type" = $1 LEFT OUTER JOIN "routes" "routes_projects" ON "routes_projects"."source_id" = "projects"."id" AND "routes_projects"."source_type" = $2 LEFT OUTER JOIN "project_repositories" ON "projects"."id" = "project_repositories"."project_id" WHERE ("projects"."storage_version" IS NULL OR "projects"."storage_version" = 0) AND "project_repositories"."project_id" IS NULL AND ("projects"."id" BETWEEN $3 AND $4); -- [["source_type", "Namespace"], -- ["source_type", "Project"], -- ["id", 1], -- ["id", 4]] ```
| * | | | Fix duplicate disk path in Backfill ProjectReposStan Hu2019-01-111-1/+12
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Merge branch 'backstage/gb/refactor-only-except-policies-config' into 'master'Kamil Trzciński2019-01-158-26/+25
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Refactor only/except configuration policies See merge request gitlab-org/gitlab-ce!24359
| * | | | Simplify code related to setting default config valuesGrzegorz Bizon2019-01-152-1/+3
| | | | |
| * | | | Make default config entry value configurableGrzegorz Bizon2019-01-159-25/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | Add more specs for only/except policy config entryGrzegorz Bizon2019-01-141-1/+1
| | | | |
| * | | | Make fabrication of default config entry more readableGrzegorz Bizon2019-01-142-5/+7
| | | | |
| * | | | Refactor only/except configuration policiesGrzegorz Bizon2019-01-1410-21/+21
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | This commit refactors only/except policies so that these policies could be self-contained. This also adds some changes to YAML configuration library to provide more context to default entry value fabrication process.
* | | | Merge branch 'sh-fix-gon-helper-avatar' into 'master'Rémy Coutable2019-01-141-4/+11
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix no avatar not showing in user selection box Closes #56268 See merge request gitlab-org/gitlab-ce!24346
| * | | | Fix no avatar not showing in user selection boxStan Hu2019-01-131-4/+11
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Resolve "Add "What's new" menu item in top navigation"Brandon Labuschagne2019-01-142-0/+48
| |/ / |/| |
* | | Merge branch 'auto-devops-kubectl-1-11-6' into 'master'Dmitriy Zaporozhets2019-01-141-1/+1
|\ \ \ | |/ / |/| | | | | | | | Bump kubectl in Auto DevOps to 1.11.6 See merge request gitlab-org/gitlab-ce!24176
| * | Bump kubectl in Auto DevOps to latest 1.11.6Thong Kuah2019-01-101-1/+1
| |/ | | | | | | | | Use the latest major version that will support the current clusters on GKE which is v1.10
* | Merge branch ↵Grzegorz Bizon2019-01-101-1/+2
|\ \ | |/ |/| | | | | | | | | | | | | '55628-artifacts-from-a-job-defined-after-a-parallel-job-are-not-downloaded' into 'master' Resolve "Artifacts from a job defined after a `parallel` job are NOT downloaded" Closes #55628 See merge request gitlab-org/gitlab-ce!24273
| * Handler regular deps next to parallelized job depsMatija Čupić2019-01-091-1/+2
| |
* | Service for calling Sentry issues apiReuben Pereira2019-01-091-0/+14
|/
* Merge branch 'sh-switch-rack-request-to-actionpack' into 'master'Robert Speicher2019-01-094-4/+4
|\ | | | | | | | | Switch use of Rack::Request to ActionDispatch::Request See merge request gitlab-org/gitlab-ce!24199
| * Switch use of Rack::Request to ActionDispatch::RequestStan Hu2019-01-074-4/+4
| | | | | | | | | | | | | | | | | | | | 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.
* | Merge branch 'elastic-test-repos-ce' into 'master'Nick Thomas2019-01-091-0/+13
|\ \ | | | | | | | | | | | | Backport of elastic-test-repos from EE See merge request gitlab-org/gitlab-ce!24200