gitlab-org--gitlab-foss/spec/lib/gitlab
Pawel Chojnacki 57de968a92 Squashed commit of the following:
commit 22e1cb8f4b98f71d21026f69aa3e68d79946d6ae
Merge: 766a42a9639 e966c6aea2
Author: Pawel Chojnacki <pawel@chojnacki.ws>
Date:   Fri Feb 23 21:30:46 2018 +0100

    Merge remote-tracking branch 'upstream/master' into 38783-add-cluster-metrics.yml

    # Conflicts:
    #	app/controllers/projects/prometheus/metrics_controller.rb
    #	app/controllers/projects/prometheus_controller.rb
    #	app/models/project_services/prometheus_service.rb
    #	lib/gitlab/prometheus/queries/query_additional_metrics.rb
    #	spec/controllers/projects/prometheus/metrics_controller_spec.rb
    #	spec/models/project_services/prometheus_service_spec.rb

commit 766a42a96393f502d439c1f0beb0b6cfb2c228d4
Author: Pawel Chojnacki <pawel@chojnacki.ws>
Date:   Fri Feb 23 17:58:45 2018 +0100

    Move prometheus adapter to app/models/concerns

commit ca84eed49811cf3064a2e5ea611af1c947c590d7
Merge: 66702099586 cb504cedc2a
Author: Pawel Chojnacki <pawel@chojnacki.ws>
Date:   Fri Feb 23 15:36:03 2018 +0100

    Merge remote-tracking branch 'upstream/backport_custom_metrics_ce_components' into 38783-add-cluster-metrics.yml

    + fix failing tests

    # Conflicts:
    #	app/controllers/projects/prometheus_controller.rb
    #	app/models/project_services/prometheus_service.rb
    #	lib/gitlab/prometheus/queries/query_additional_metrics.rb
    #	spec/models/project_services/prometheus_service_spec.rb

commit cb504cedc2a6e353ffb56833334681e3da09fc14
Author: Pawel Chojnacki <pawel@chojnacki.ws>
Date:   Fri Feb 23 14:46:15 2018 +0100

    Fix prometheus_service found by find_or_initialize_service

commit 928b84c72c2c4c46e1785b9a943c1822a137de16
Author: Pawel Chojnacki <pawel@chojnacki.ws>
Date:   Thu Feb 22 23:15:11 2018 +0100

    additional metrics and backported tests

commit 41291383b4b6976af94eaf9e1a7b2e2a172310e7
Author: Pawel Chojnacki <pawel@chojnacki.ws>
Date:   Thu Feb 22 21:57:45 2018 +0100

    Introduce Metrics controller and retire prometheus controller

commit 6e7492e4c7ffa9d8621f09198071bc14be875976
Author: Pawel Chojnacki <pawel@chojnacki.ws>
Date:   Thu Feb 22 21:46:37 2018 +0100

    Backport PrometheusClient::Error and all->common_metrics rename

commit 66702099586c864a7f78970a0ee0dd9f3c2beeef
Author: Pawel Chojnacki <pawel@chojnacki.ws>
Date:   Thu Feb 22 20:23:03 2018 +0100

    fix failing tests

commit ce921ea723cde61b2441ba98c9aca97606c719c8
Author: Mike Greiling <mike@pixelcog.com>
Date:   Wed Feb 21 23:47:30 2018 -0600

    add labels to cluster metrics

commit 993830c6892e4fbf53d3f72da00002d642c7e9b2
Author: Pawel Chojnacki <pawel@chojnacki.ws>
Date:   Thu Feb 22 01:20:49 2018 +0100

    Fix formatting probelms and few small tests

commit 66ee65d8e3f747c90d986bc3056178422156bc8e
Author: Pawel Chojnacki <pawel@chojnacki.ws>
Date:   Thu Feb 22 01:08:03 2018 +0100

    stop using in deployment tests environment.id

commit 62c91978d15f0369988521363dae24bd7510d68d
Author: Pawel Chojnacki <pawel@chojnacki.ws>
Date:   Thu Feb 22 01:06:33 2018 +0100

    fix prometheus_controller and adapter tests

commit 977b1d34c1d03c7233582e8328f85caf634895ed
Author: Pawel Chojnacki <pawel@chojnacki.ws>
Date:   Thu Feb 22 00:19:39 2018 +0100

    finish up active? -> can_query? rename

commit e614f7daee58a9758d83ba3efe1649c8b80bc1e2
Author: Pawel Chojnacki <pawel@chojnacki.ws>
Date:   Wed Feb 21 23:51:33 2018 +0100

    deployment prometheus adapter tests fix

commit ebd726c114a6026fef0adf3eba6ee1972530148a
Author: Pawel Chojnacki <pawel@chojnacki.ws>
Date:   Wed Feb 21 21:40:40 2018 +0100

    Move environment dependant tests to environment

commit 6d31311cd3729c29233283dded70e03a4a9a3c97
Author: Pawel Chojnacki <pawel@chojnacki.ws>
Date:   Wed Feb 21 20:40:24 2018 +0100

    update monitoring service and move adding dpeloyment_time to deployment model

commit 60b6bf391ab36846dce122bc6b0c5196a186267c
Author: Pawel Chojnacki <pawel@chojnacki.ws>
Date:   Wed Feb 21 20:15:46 2018 +0100

    adjust deployment spec and prometheus specs

commit 6681662cf1c028aff2ff94aa0501732cb7119ba1
Author: Pawel Chojnacki <pawel@chojnacki.ws>
Date:   Tue Feb 20 22:30:20 2018 +0100

    Revert changes to reactive caching

commit e282f86c45a056889f57d3f7fd23a81c88efff6a
Merge: 5751c73df59 6844a2df87
Author: Pawel Chojnacki <pawel@chojnacki.ws>
Date:   Tue Feb 20 22:08:17 2018 +0100

    Merge remote-tracking branch 'upstream/master' into 38783-add-cluster-metrics.yml

commit 5751c73df59d0a03840a1b4b71b0637670f971a6
Author: Pawel Chojnacki <pawel@chojnacki.ws>
Date:   Tue Feb 20 22:07:43 2018 +0100

    rename active? to can_query? and cleanup environment prometheus router

commit 3f3c6e1d33dcd9315979daf26a95f2aab83a7de9
Author: Pawel Chojnacki <pawel@chojnacki.ws>
Date:   Tue Feb 20 21:51:43 2018 +0100

    Fix tests, and only use prometheus service if its active

commit 6345838bac584c213b665d334252ccab202cb271
Author: Pawel Chojnacki <pawel@chojnacki.ws>
Date:   Tue Feb 20 16:24:27 2018 +0100

    Fix typo

commit 7a585d32afe8da050b5615b1d036a550e06479f5
Author: Pawel Chojnacki <pawel@chojnacki.ws>
Date:   Tue Feb 20 15:29:40 2018 +0100

    Cluster id is not required

commit e6af62afb11fa380f6aff1c31a81bcc9bab3b1eb
Author: Pawel Chojnacki <pawel@chojnacki.ws>
Date:   Tue Feb 20 15:15:46 2018 +0100

    Result transformation support

commit f3b1bd7c67894f44efe33591ddb70093bd620c03
Author: Pawel Chojnacki <pawel@chojnacki.ws>
Date:   Tue Feb 20 15:07:07 2018 +0100

    Fix rubocop warning and exten cluster query timeframe

commit be77947cea64261a4d3dead33c3c57f413a9880c
Author: Pawel Chojnacki <pawel@chojnacki.ws>
Date:   Tue Feb 20 14:42:47 2018 +0100

    Fix additional metrics test

commit eb3922e16221abe16f59fae1c38122f227643343
Author: Pawel Chojnacki <pawel@chojnacki.ws>
Date:   Tue Feb 20 14:34:44 2018 +0100

    rename prometheus adapter methods

commit 045476cd08b21593818b274ae8a44d19b705523f
Author: Pawel Chojnacki <pawel@chojnacki.ws>
Date:   Tue Feb 20 13:19:36 2018 +0100

    Make prometheus adapter a module

commit f2daf050d8c689f72c4c61207930bc53c331f12e
Author: Pawel Chojnacki <pawel@chojnacki.ws>
Date:   Tue Feb 20 12:00:44 2018 +0100

    refactoring wip

commit 52e4ef5587794e811dc10a0f2dca522342a865da
Author: Pawel Chojnacki <pawel@chojnacki.ws>
Date:   Sun Feb 18 20:25:55 2018 +0100

    cleanup prometheus adapter concept

commit 3887365faab9dfcd9c00bcfc501d09ac62431a03
Author: Pawel Chojnacki <pawel@chojnacki.ws>
Date:   Sun Feb 18 19:22:11 2018 +0100

    Refactor out deployment id, Rename PrometheusQuerier to PrometheusAdapter

commit aa2fc2df57bd72c9a5e94f66d1f1e23990be6c3f
Author: Pawel Chojnacki <pawel@chojnacki.ws>
Date:   Fri Feb 16 23:59:54 2018 +0100

    Refactor prometheus client

commit e43c1ca9d9874d6cf1569f40fa1aca158d9d5d91
Author: Pawel Chojnacki <pawel@chojnacki.ws>
Date:   Thu Feb 15 20:24:45 2018 +0100

    Use initial version of cluster_metrics.yml

commit 867821ce0b2609ebf8994220aa8e3a94d66a01e0
Author: Pawel Chojnacki <pawel@chojnacki.ws>
Date:   Thu Feb 15 05:24:14 2018 +0100

    Fix querying cluster metrics

commit 1601e002a064cbb10ffe110a19433c5662858f1d
Author: Pawel Chojnacki <pawel@chojnacki.ws>
Date:   Thu Feb 15 04:49:03 2018 +0100

    Queues for unicersal querier

commit 5db198fdc925c0223be24939b76da1d544dd569c
Author: Pawel Chojnacki <pawel@chojnacki.ws>
Date:   Thu Feb 15 03:35:17 2018 +0100

    refactor reactive caching and prometheus querying

commit b0fc00e8c9d21e961ef44b0129103e2a62928b52
Author: Pawel Chojnacki <pawel@chojnacki.ws>
Date:   Thu Feb 15 00:12:03 2018 +0100

    Add generic query additional metrics

commit ffe76e6a9ba196bccff22c4880e0384959ad5e48
Author: Pawel Chojnacki <pawel@chojnacki.ws>
Date:   Tue Feb 13 15:40:15 2018 +0100

    Cluster Metric yml initial

+ Remove cluster query

+ remove cluster_metrics.yml

+ Prometheus adapter tests
2018-02-24 00:15:12 +01:00
..
auth Fixing request json mime type 2018-01-15 09:09:21 +00:00
background_migration Prefer table helper in migration specs 2018-02-20 12:09:50 -08:00
badge Change coverage badge rounding for other CI system consistency 2018-02-01 17:40:26 -06:00
bare_repository_import Use hashed storage in the specs 2018-02-07 13:40:46 +00:00
bitbucket_import Fix bitbucket wiki import with hashed storage enabled 2017-11-20 16:14:41 +00:00
cache
checks Avoid slow File Lock checks when not used 2018-02-19 10:01:25 +00:00
ci Merge branch '41209-ci-linter-fails-on-gitlab-ci-blob-viewer' into 'master' 2018-02-07 13:09:56 +00:00
conflict Fix conflict highlighting 2017-11-17 17:57:48 +00:00
cross_project_access Port read_cross_project ability from EE 2018-02-22 17:11:36 +01:00
cycle_analytics Merge branch 'master' into 22643-manual-job-page 2018-01-04 22:39:01 +00:00
data_builder Resolve "Error 500 in non-UTF8 branch names" 2017-09-12 14:07:31 +00:00
database Use hashed storage in the specs 2018-02-07 13:40:46 +00:00
dependency_linker
diff Fix 500 error when diff context line has broken encoding 2018-02-22 12:26:23 +00:00
downtime_check
email Use hashed storage in the specs 2018-02-07 13:40:46 +00:00
etag_caching
fogbugz_import
gfm Use hashed storage in the specs 2018-02-07 13:40:46 +00:00
git Merge branch 'fix-squash-with-renamed-files' into 'master' 2018-02-22 11:35:34 +00:00
gitaly_client Incorporate Gitaly's RepositoryService.IsSquashInProgress RPC 2018-02-21 17:35:31 -03:00
github_import [GH Import] Create an empty wiki if wiki import failed 2018-02-19 17:56:33 +00:00
gitlab_import
google_code_import Replace '.team << [user, role]' with 'add_role(user)' in specs 2017-12-22 19:18:28 +11:00
gpg Fix Error 500 when viewing a commit with a GPG signature in Geo 2018-02-19 00:22:13 -08:00
graphs
health_checks Add a gRPC health check to ensure Gitaly is up 2018-01-24 15:47:27 -08:00
hook_data Remove soft removals related code 2018-01-08 17:04:45 +01:00
i18n Only require simple_po_parser in rake task that needs it 2017-09-04 08:30:10 +02:00
import_export Create an empty wiki when there is no wiki in the gitlab export bundle 2018-02-12 15:38:10 +00:00
kubernetes Enable Prometheus metrics for deployed Ingresses 2018-02-05 12:46:31 +00:00
ldap Fixed user synced attributes metadata after removing current provider 2018-02-15 09:27:38 +00:00
legacy_github_import Rewrite the GitHub importer from scratch 2017-11-07 23:24:59 +01:00
metrics Rename Concern -> Methods 2018-01-29 15:13:05 +01:00
middleware Allow token authentication on go-get request 2018-02-23 10:33:46 +00:00
o_auth Fixed user synced attributes metadata after removing current provider 2018-02-15 09:27:38 +00:00
popen Use Process::Status rather than an integer 2018-01-26 19:42:48 +08:00
prometheus Squashed commit of the following: 2018-02-24 00:15:12 +01:00
query_limiting Do not count rails sql cache as queries in query limiting 2018-02-21 16:27:05 +11:00
quick_actions Resolve "Milestone Quick Action not displayed with no project milestones but with group milestones" 2018-02-23 14:23:09 +00:00
redis
saml Normalize LDAP DN when looking up identity 2017-10-31 17:13:50 +01:00
sanitizers
serializer
sherlock
sidekiq_middleware Send SIGSTP before SIGTERM to actually give Sidekiq jobs 30s to finish when the memory killer kicks in 2017-11-02 15:33:19 +01:00
sidekiq_status
sidekiq_versioning Use a dedicated queue for each worker 2017-12-12 17:36:20 +01:00
slash_commands Make user/author use project.creator in most factories 2018-01-31 18:31:21 +01:00
sql Optimise searching for users using short queries 2018-02-22 18:55:36 +01:00
storage_check Move the circuitbreaker check out in a separate process 2017-12-08 09:11:39 +01:00
template
utils Use Gitlab::Utils::Override over defined?(super) 2017-12-26 17:18:10 +08:00
view/presenter Present member collection at the controller level 2017-12-12 18:14:58 +01:00
action_rate_limiter_spec.rb Address review comments with playing pipeline scheduler 2017-12-12 17:12:45 -08:00
allowable_spec.rb
app_logger_spec.rb Memoize GitLab logger to reduce open file descriptors 2017-10-24 14:06:23 +03:00
asciidoc_spec.rb Set Asciidoctor outfilesuffix to default .adoc 2018-02-14 20:40:47 +00:00
auth_spec.rb Merge branch 'sh-migrate-can-push-to-deploy-keys-projects-10-3' into 'security-10-3' 2018-01-16 17:04:51 -08:00
background_migration_spec.rb
blame_spec.rb
changes_list_spec.rb
chat_name_token_spec.rb
ci_access_spec.rb
closing_issue_extractor_spec.rb Allow oxford commas and spaces before commas in MR issue closing pattern. 2018-02-17 22:46:07 +05:30
color_schemes_spec.rb
contributions_calendar_spec.rb Port read_cross_project ability from EE 2018-02-22 17:11:36 +01:00
cross_project_access_spec.rb Port read_cross_project ability from EE 2018-02-22 17:11:36 +01:00
current_settings_spec.rb use Gitlab::UserSettings directly as a singleton instead of including/extending it 2018-02-02 18:39:55 +00:00
daemon_spec.rb
database_spec.rb Merge branch 'mk-add-old-attachments-to-uploads-table' into 'master' 2017-12-07 02:34:58 +00:00
dependency_linker_spec.rb
downtime_check_spec.rb
encoding_helper_spec.rb Return a warning string if we try to encode to unsupported encoding 2018-02-09 22:19:43 +01:00
exclusive_lease_spec.rb Run background migrations with a minimum interval 2018-01-05 16:23:25 +01:00
fake_application_settings_spec.rb Allow password authentication to be disabled entirely 2017-11-23 13:16:14 +00:00
file_detector_spec.rb Cache issuable template names 2017-10-12 13:26:03 +01:00
file_finder_spec.rb
git_access_spec.rb Only check LFS integrity for first branch in push 2018-02-15 01:57:55 +00:00
git_access_wiki_spec.rb Fix repo existence check in GitAccessWiki 2018-02-22 00:20:30 +00:00
git_ref_validator_spec.rb Prevent branches or tags from starting with invalid characters (e.g. -, .) 2017-10-05 14:56:36 -07:00
git_spec.rb add support for the commit reference filter 2017-12-07 09:01:37 -05:00
gitaly_client_spec.rb Add a gRPC health check to ensure Gitaly is up 2018-01-24 15:47:27 -08:00
github_import_spec.rb Rewrite the GitHub importer from scratch 2017-11-07 23:24:59 +01:00
gl_repository_spec.rb
gpg_spec.rb Add more specs. 2017-10-05 22:43:44 -05:00
group_hierarchy_spec.rb Make it possible to limit ancestors in a GroupHierarchy 2017-10-04 22:49:42 +02:00
highlight_spec.rb
i18n_spec.rb
identifier_spec.rb Allow git pull/push on project redirects 2017-12-08 17:42:43 +00:00
import_sources_spec.rb Replace old GH importer with the parallel importer 2017-11-07 23:25:03 +01:00
incoming_email_spec.rb
insecure_key_fingerprint_spec.rb Backport authorized_keys branch 'find-key-by-fingerprint' 2018-01-08 20:34:16 +00:00
issuable_metadata_spec.rb Fail when issuable_meta_data is called on an unlimited collection 2017-11-07 16:26:55 +00:00
issuable_sorter_spec.rb
issuables_count_for_state_spec.rb Re-use issue/MR counts for the pagination system 2017-09-05 11:53:45 +02:00
job_waiter_spec.rb
kubernetes_spec.rb
lazy_spec.rb
lfs_token_spec.rb
markup_helper_spec.rb
metrics_spec.rb use Gitlab::UserSettings directly as a singleton instead of including/extending it 2018-02-02 18:39:55 +00:00
multi_collection_paginator_spec.rb Always use the same order specs for MultiCollectionPaginator 2017-10-11 11:27:59 +02:00
optimistic_locking_spec.rb
other_markup_spec.rb
otp_key_rotator_spec.rb
path_regex_spec.rb Validate User username only on Namespace, and bubble up appropriately 2018-02-06 12:09:03 -06:00
performance_bar_spec.rb
polling_interval_spec.rb
popen_spec.rb Use Process::Status rather than an integer 2018-01-26 19:42:48 +08:00
profiler_spec.rb Improve error handling for Gitlab::Profiler and improve doc about providing a user 2018-02-16 19:47:44 +11:00
project_authorizations_spec.rb Replace '.team << [user, role]' with 'add_role(user)' in specs 2017-12-22 19:18:28 +11:00
project_search_results_spec.rb Fix project search results for digits surrounded by colons 2018-01-16 11:56:07 +00:00
project_template_spec.rb Simplify project page 2017-10-11 09:07:19 +00:00
project_transfer_spec.rb
prometheus_client_spec.rb Backport custom metrics ce components 2018-02-23 17:58:40 +00:00
query_limiting_spec.rb Disable query limiting warnings for now on GitLab.com 2018-02-12 11:41:03 -08:00
reference_counter_spec.rb
reference_extractor_spec.rb Replace '.team << [user, role]' with 'add_role(user)' in specs 2017-12-22 19:18:28 +11:00
regex_spec.rb Ensure users can't create environments with leading or trailing slashes (Fixes #39885) 2018-02-13 11:07:12 +11:00
repo_path_spec.rb Use hashed storage in the specs 2018-02-07 13:40:46 +00:00
request_context_spec.rb
request_forgery_protection_spec.rb
request_profiler_spec.rb
route_map_spec.rb
routing_spec.rb
search_results_spec.rb Support search in API 2018-02-06 16:02:02 +01:00
sentry_spec.rb
shell_spec.rb Use hashed storage in the specs 2018-02-07 13:40:46 +00:00
sidekiq_config_spec.rb Use a dedicated queue for each worker 2017-12-12 17:36:20 +01:00
sidekiq_status_spec.rb Simplify check for running job on Redis 2017-10-13 10:17:41 +02:00
sidekiq_throttler_spec.rb
sidekiq_versioning_spec.rb Use a dedicated queue for each worker 2017-12-12 17:36:20 +01:00
snippet_search_results_spec.rb
ssh_public_key_spec.rb Validate SSH keys through the sshkey gem 2018-02-16 11:32:08 -05:00
string_range_marker_spec.rb
string_regex_marker_spec.rb
tcp_checker_spec.rb Add a gitlab:tcp_check rake task 2017-12-13 15:53:32 +00:00
themes_spec.rb Revert "Merge branch 'revert-f2421b2b' into 'master'" 2017-09-11 15:44:42 +00:00
untrusted_regexp_spec.rb
upgrader_spec.rb
uploads_transfer_spec.rb
url_blocker_spec.rb Merge branch 'ssrf-protections-round-2' into 'security-10-1' 2017-11-08 20:11:08 -08:00
url_builder_spec.rb
url_sanitizer_spec.rb Remove those tests as they're not needed anymore 2017-10-03 23:06:55 +08:00
usage_data_spec.rb use Gitlab::UserSettings directly as a singleton instead of including/extending it 2018-02-02 18:39:55 +00:00
user_access_spec.rb Replace '.team << [user, role]' with 'add_role(user)' in specs 2017-12-22 19:18:28 +11:00
user_activities_spec.rb
utils_spec.rb Merge branch '41293-fix-command-injection-vulnerability-on-system_hook_push-queue-through-web-hook' into 'security-10-3' 2018-01-16 17:04:51 -08:00
version_info_spec.rb
visibility_level_spec.rb Avoid error when no restricted levels are defined 2018-02-02 13:17:32 +01:00
workhorse_spec.rb Use hashed storage in the specs 2018-02-07 13:40:46 +00:00