delta/gitlab/gitlab-ce.git - gitlab.com: gitlab-org/gitlab-ce.git

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'issue_38337' into 'master'	Sean McGivern	2018-03-06	4	-8/+94
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Bring one group board to CE Closes #38337 See merge request gitlab-org/gitlab-ce!17274
\| *	Merge branch 'master' into 'issue_38337'	Felipe Artur	2018-03-06	9	-37/+64
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # app/models/group.rb # db/schema.rb
\| * \|	Address review comments	Felipe Artur	2018-03-05	1	-7/+6
\| \| \|
\| * \|	Bring one group board to CE	Felipe Artur	2018-03-03	4	-9/+96
\| \| \|
* \| \|	Merge remote-tracking branch 'upstream/master' into ↵5029-support-cluster-metrics-ce	Pawel Chojnacki	2018-03-06	30	-196/+272
\|\ \ \ \| \| \|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	5029-support-cluster-metrics-ce # Conflicts: # spec/models/clusters/applications/prometheus_spec.rb
\| * \|	Fix Gitaly n+1 in NetworkController#show	Andrew Newdigate	2018-03-06	1	-14/+11
\| \| \|
\| * \|	Merge branch '40187-project-branch-dashboard-with-active-stale-branches' ↵	Rémy Coutable	2018-03-06	1	-5/+36
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Add overview of branches and filtered views for active/stale branches Closes #40187 et #17293 See merge request gitlab-org/gitlab-ce!15402
\| \| * \|	Add overview of branches and a filter for active/stale branches	Takuya Noguchi	2018-03-06	1	-5/+36
\| \| \| \|
\| * \| \|	Merge branch 'ce-3839-ci-cd-only-projects-fe' into 'master'	Robert Speicher	2018-03-05	1	-3/+11
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Create CI/CD-only projects by URL -- CE backport See merge request gitlab-org/gitlab-ce!17342
\| \| * \| \|	CI/CD-only projects FE	Eric Eastwood	2018-03-05	1	-1/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	See https://gitlab.com/gitlab-org/gitlab-ee/issues/3839 Conflicts: app/assets/javascripts/projects/project_new.js app/views/shared/_import_form.html.haml ee/app/controllers/ee/projects_controller.rb ee/spec/features/projects/new_project_spec.rb locale/gitlab.pot
\| \| * \| \|	Backport BE changes from CI/CD projects ee!4567	Eric Eastwood	2018-03-02	1	-2/+6
\| \| \| \|/ \| \| \|/\| \| \| \| \| \| \| \| \|	See https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/4567
\| * \| \|	Merge branch 'dz-use-less-deprecated-methods' into 'master'	Douwe Maan	2018-03-05	4	-4/+4
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reduce usage of deprecated *_with_namespace methods See merge request gitlab-org/gitlab-ce!17523
\| \| * \| \|	Replace deprecated name_with_namespace with full_name in app and spec	Dmitriy Zaporozhets	2018-03-05	4	-4/+4
\| \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \|	Merge branch 'fix-impersonate-ui' into 'master'	Rémy Coutable	2018-03-05	1	-1/+0
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove impersonate token from flash scope in UI See merge request gitlab-org/gitlab-ce!17480
\| \| * \| \|	Remove impersonate token from flash scope	julien MILLAU	2018-03-02	1	-1/+0
\| \| \| \| \|
\| * \| \| \|	Merge branch ↵	Rémy Coutable	2018-03-05	1	-4/+2
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'37430-projects-comparecontroller-show-is-calling-gitaly-n-1-times-per-request' into 'master' Resolve "Projects::CompareController#show is calling Gitaly n+1 times per request" Closes #37430 See merge request gitlab-org/gitlab-ce!17439
\| \| * \| \| \|	Fix n+1 issue by not reloading fully loaded blobs	Alejandro Rodríguez	2018-03-05	1	-4/+2
\| \| \| \|/ / \| \| \|/\| \|
\| * \| \| \|	Merge branch 'remove-ide' into 'master'	Tim Zallmann	2018-03-05	1	-6/+0
\| \|\ \ \ \ \| \| \|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	Remove IDE from CE See merge request gitlab-org/gitlab-ce!17458
\| \| * \| \|	Remove IDE from CE	Phil Hughes	2018-03-02	1	-6/+0
\| \| \|/ /
\| * \| \|	Merge branch 'feature/fetch-commit-signs-from-gitaly-in-batch' into 'master'	Sean McGivern	2018-03-02	1	-25/+19
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fetch commit signatures from Gitaly in batches Closes gitaly#1046 See merge request gitlab-org/gitlab-ce!17456
\| \| * \| \|	Fetch commit signatures from Gitaly in batchesfeature/fetch-commit-signs-from-gitaly-in-batch	Ahmad Sherif	2018-03-01	1	-25/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes gitaly#1046
\| * \| \| \|	Allow to include also descendant group labels	Jan Provaznik	2018-03-02	1	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Because epic index page includes also epics from subgroups it's necessary to also get descendant group labels for filtering. https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/4773#note_61236542
\| * \| \| \|	Support additional LabelsFinder parameters for group labels	Jan Provaznik	2018-03-02	2	-2/+8
\| \| \|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In some situations (listing labels for epics) we want to list only group ancestor labels, this is already supported in LabelsFinder we just need to enable additional parameters. Also `set_issuables_index` method now loads project labels only if @project is set (which is not used for epic group labels).
\| * \| \|	Merge branch 'feature/move_oauth_modules_to_auth_dir_structure' into 'master'	Douwe Maan	2018-03-01	4	-19/+19
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Moved o_auth/saml/ldap modules under gitlab/auth See merge request gitlab-org/gitlab-ce!17359
\| \| * \| \|	Moved o_auth/saml/ldap modules under gitlab/auth	Horatiu Eugen Vlad	2018-02-28	4	-19/+19
\| \| \| \| \|
\| * \| \| \|	Merge branch '42643-persist-external-ip-of-ingress-controller-gke' into 'master'	Kamil Trzciński	2018-03-01	1	-0/+5
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Display ingress IP address in the Kubernetes page See merge request gitlab-org/gitlab-ce!17052
\| \| * \ \ \	Merge branch 'master' into 42643-persist-external-ip-of-ingress-controller-gke	Dylan Griffith	2018-02-23	8	-14/+32
\| \| \|\ \ \ \
\| \| * \| \| \| \|	Simplify retrying for ClusterWaitForIngressIpAddressWorker and style changes	Dylan Griffith	2018-02-23	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(#42643)
\| \| * \| \| \| \|	Schedule Ingress IP address fetch from K8s after clusters page load (#42643)	Dylan Griffith	2018-02-20	1	-0/+5
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Removing the two factor check when the user sets a new password	Francisco Javier López	2018-03-01	1	-0/+1
\| \| \|_\|_\|/ / \| \|/\| \| \| \|
\| * \| \| \| \|	PagesDomain: Add edit/update functionality	Rob Watson	2018-02-28	1	-8/+21
\| \| \|_\|_\|/ \| \|/\| \| \|
\| * \| \| \|	Render MR Notes with Vue with behind a cookie	Fatih Acet	2018-02-28	5	-29/+81
\| \| \| \| \|
\| * \| \| \|	Improve Member servicesrc/reduce-delta-with-ce-in-controllers-ce	Rémy Coutable	2018-02-27	4	-56/+39
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \|	Move the #update action from Project/Member controllers to the ↵	Rémy Coutable	2018-02-27	3	-16/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	MembershipActions concern Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \|	Remove explicit audit event log in MembershipActions	Rémy Coutable	2018-02-27	3	-14/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move it to Members::ApproveAccessRequestService. Also, note that there was a double audit event log for access request destruction. Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \|	Merge branch '43510-merge-requests-and-issues-don-t-show-for-all-subgroups' ↵	Grzegorz Bizon	2018-02-27	2	-5/+0
\| \|\ \ \ \ \| \| \|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Resolve "Merge requests and issues don't show for all subgroups" Closes #43510 See merge request gitlab-org/gitlab-ce!17312
\| \| * \| \|	Fix subgroup issue and MR pages empty states and counts43510-merge-requests-and-issues-don-t-show-for-all-subgroups	Sean McGivern	2018-02-27	2	-5/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Previously, these wouldn't count issues or MRs in subgroups - meaning that if _this_ group had no issues or MRs, we'd show the empty state, which was wrong.
* \| \| \| \|	one space too far	Pawel Chojnacki	2018-03-05	1	-1/+0
\| \| \| \| \|
* \| \| \| \|	Check if prometheus_adapter is properly called	Pawel Chojnacki	2018-03-05	1	-1/+2
\| \| \| \| \|
* \| \| \| \|	Implemente Prometheus:AdapterService	Pawel Chojnacki	2018-03-05	1	-2/+4
\| \| \| \| \|
* \| \| \| \|	Implement PrometheusDeploymentLocator + fix metrics controller	Pawel Chojnacki	2018-03-01	1	-4/+2
\| \| \| \| \|
* \| \| \| \|	Squashed commit of the following:	Pawel Chojnacki	2018-02-24	2	-4/+9
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	commit 22e1cb8f4b98f71d21026f69aa3e68d79946d6ae Merge: 766a42a9639 e966c6aea25 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 6844a2df873 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
* \| \| \|	Backport custom metrics ce components	Paweł Chojnacki	2018-02-23	2	-24/+27
\| \| \| \|
* \| \| \|	Merge branch 'master' into '29497-pages-custom-domain-dns-verification'	Robert Speicher	2018-02-23	1	-2/+2
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # db/schema.rb
\| * \ \ \	Merge branch ↵bjk/kube_state_metrics	Kamil Trzciński	2018-02-23	1	-2/+2
\| \|\ \ \ \ \| \| \|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'43496-error-message-for-gke-clusters-persists-in-the-next-page' into 'master' Resolve "Error message for GKE clusters persists in the next page" Closes #43496 See merge request gitlab-org/gitlab-ce!17299
\| \| * \| \|	Do not persist Google Project Billing Failure errors after a reload	Matija Čupić	2018-02-22	1	-2/+2
\| \| \| \| \|
* \| \| \| \|	Add DNS verification to Pages custom domains	Nick Thomas	2018-02-23	1	-3/+15
\|/ / / /
* \| \| \|	Merge branch '43261-fix-import-from-url-name-collision-active-tab' into 'master'	Phil Hughes	2018-02-23	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Keep "Import project" tab/form active when validation fails trying to import "Repo by URL" Closes #43261 See merge request gitlab-org/gitlab-ce!17136
\| * \| \| \|	Make import tab/form active when importing project by URL and validation fails43261-fix-import-from-url-name-collision-active-tab	Eric Eastwood	2018-02-20	1	-1/+1
\| \| \|/ / \| \|/\| \| \| \| \| \| \| \| \| \|	See https://gitlab.com/gitlab-org/gitlab-ce/issues/43261
* \| \| \|	Merge branch 'bvl-external-auth-port' into 'master'	Douwe Maan	2018-02-23	21	-24/+92
\|\ \ \ \ \| \|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \|	Port `read_cross_project` ability from EE See merge request gitlab-org/gitlab-ce!17208