gitlab-org--gitlab-foss/app/controllers/projects
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
..
clusters Do not persist Google Project Billing Failure errors after a reload 2018-02-22 22:59:04 +01:00
cycle_analytics
merge_requests Port read_cross_project ability from EE 2018-02-22 17:11:36 +01:00
prometheus Squashed commit of the following: 2018-02-24 00:15:12 +01:00
registry Add serializer matchers 2017-10-02 23:17:31 +02:00
settings Add missing empty line in #reset_cache 2018-01-04 22:17:03 +01:00
application_controller.rb disables the shortcut to the issue boards when issues are disabled 2018-01-08 09:06:25 +00:00
artifacts_controller.rb Test against public projects 2017-10-05 12:41:22 +02:00
autocomplete_sources_controller.rb Port read_cross_project ability from EE 2018-02-22 17:11:36 +01:00
avatars_controller.rb
badges_controller.rb
blame_controller.rb
blob_controller.rb Port read_cross_project ability from EE 2018-02-22 17:11:36 +01:00
boards_controller.rb disables the shortcut to the issue boards when issues are disabled 2018-01-08 09:06:25 +00:00
branches_controller.rb Refactor success status in branch controller 2017-12-27 18:58:46 +01:00
build_artifacts_controller.rb
builds_controller.rb
clusters_controller.rb Replace "cluster" with "Kubernetes cluster" 2018-02-06 10:05:02 +01:00
commit_controller.rb Display related merge requests in commit detail page 2018-01-12 20:38:36 +00:00
commits_controller.rb Track and act upon the number of executed queries 2018-02-01 17:00:46 +01:00
compare_controller.rb Detect n+1 issues involving Gitaly 2017-09-19 10:55:37 +00:00
cycle_analytics_controller.rb Track and act upon the number of executed queries 2018-02-01 17:00:46 +01:00
deploy_keys_controller.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
deployments_controller.rb Squashed commit of the following: 2018-02-24 00:15:12 +01:00
discussions_controller.rb
environments_controller.rb Improve environments performance 2017-11-23 12:04:03 +00:00
find_file_controller.rb
forks_controller.rb Track and act upon the number of executed queries 2018-02-01 17:00:46 +01:00
git_http_client_controller.rb Consistently use PersonalAccessToken instead of PersonalToken 2017-11-02 11:39:02 +01:00
git_http_controller.rb Moves project creationg to git access check for git push 2018-02-06 16:52:29 +00:00
graphs_controller.rb
group_links_controller.rb Adds Rubocop rule for line break after guard clause 2017-11-16 17:58:29 +01:00
hook_logs_controller.rb
hooks_controller.rb Merge branch 'feature/merge-request-system-hook' into 'master' 2018-01-18 11:37:16 +00:00
imports_controller.rb
issues_controller.rb Refactor IssuableFinder to extract model-specific logic 2018-02-21 10:31:29 +00:00
jobs_controller.rb Use simple Next/Prev paging for jobs to avoid large count queries on arbitrarily large sets of historical jobs 2018-01-11 17:45:42 +00:00
labels_controller.rb Adds Rubocop rule for line break after guard clause 2017-11-16 17:58:29 +01:00
lfs_api_controller.rb Backport of LFS File Locking API 2018-02-07 09:04:00 -05:00
lfs_locks_api_controller.rb Backport of LFS File Locking API 2018-02-07 09:04:00 -05:00
lfs_storage_controller.rb port of 594e6a0a625^..f74c90f68c6 2018-02-01 12:14:46 -05:00
mattermosts_controller.rb
merge_requests_controller.rb Refactor IssuableFinder to extract model-specific logic 2018-02-21 10:31:29 +00:00
milestones_controller.rb Add modal for deleting a milestone 2018-01-25 11:07:32 +01:00
network_controller.rb Track and act upon the number of executed queries 2018-02-01 17:00:46 +01:00
notes_controller.rb Track and act upon the number of executed queries 2018-02-01 17:00:46 +01:00
pages_controller.rb
pages_domains_controller.rb Add DNS verification to Pages custom domains 2018-02-23 12:22:29 +00:00
pipeline_schedules_controller.rb Address review comments with playing pipeline scheduler 2017-12-12 17:12:45 -08:00
pipelines_controller.rb Track and act upon the number of executed queries 2018-02-01 17:00:46 +01:00
pipelines_settings_controller.rb Remove Auto DevOps checkboxes - backend 2017-12-04 17:47:38 +01:00
project_members_controller.rb Present member collection at the controller level 2017-12-12 18:14:58 +01:00
protected_branches_controller.rb
protected_refs_controller.rb
protected_tags_controller.rb
raw_controller.rb
refs_controller.rb fixed karma test 2017-11-06 10:52:04 +00:00
releases_controller.rb
repositories_controller.rb
runner_projects_controller.rb
runners_controller.rb Add pause/resume button to specific project runners 2017-12-27 09:23:09 -06:00
services_controller.rb
snippets_controller.rb WIP: refactor the first-contributor to Issuable 2017-09-06 09:00:57 -04:00
tags_controller.rb
templates_controller.rb
todos_controller.rb
tree_controller.rb moved lfs_blob_ids method into ExtractsPath module 2017-12-14 11:59:01 +00:00
triggers_controller.rb
uploads_controller.rb port of 594e6a0a625^..f74c90f68c6 2018-02-01 12:14:46 -05:00
variables_controller.rb Fix static_analysis failure 2018-02-06 17:56:54 +01:00
wikis_controller.rb Merge branch 'master' into 'zj-wiki-page-versions' 2018-02-06 16:08:06 +00:00