summaryrefslogtreecommitdiff
path: root/app/models/project_services
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master' into 5029-support-cluster-metr...5029-support-cluster-metrics-cePawel Chojnacki2018-03-068-15/+25
|\
| * Merge branch 'issue_31081' into 'master'Douwe Maan2018-03-051-1/+5
| |\
| | * Use host URL to build JIRA remote link iconFelipe Artur2018-03-051-1/+5
| * | Replace deprecated name_with_namespace with full_name in app and specDmitriy Zaporozhets2018-03-056-8/+8
| |/
| * Merge branch '33570-slack-notify-default-branch' into 'master'Sean McGivern2018-03-021-3/+9
| |\
| | * SlackService - respect `notify_only_default_branch` for push eventsMario de la Ossa2018-03-021-3/+9
| * | Merge branch 'slash-commands-changes-for-chatops' into 'master'Kamil Trzciński2018-02-271-3/+3
| |\ \
| | * | Expose ChatName objects to slash commandsslash-commands-changes-for-chatopsYorick Peterse2018-02-231-3/+3
| | |/
* | | drop the ! from synchronize_service_state! + remove unused scopePawel Chojnacki2018-02-241-2/+2
* | | Squashed commit of the following:Pawel Chojnacki2018-02-242-83/+6
|/ /
* | Backport custom metrics ce componentsPaweł Chojnacki2018-02-231-9/+11
|/
* Display a link to external issue tracker when enabledJarka Kadlecová2018-02-141-0/+2
* Fix order of checks in editable? method.Pawel Chojnacki2018-02-071-3/+4
* Make prometheus service querying approach much nicer wrt to arity and default...Pawel Chojnacki2018-02-071-3/+4
* Merge branch 'master' into pawel/connect_to_prometheus_through_proxy-30480Mike Greiling2018-02-064-11/+11
|\
| * Replace "cluster" with "Kubernetes cluster"winh-kubernetes-clustersWinnie Hellmann2018-02-061-5/+6
| * use Gitlab::UserSettings directly as a singleton instead of including/extendi...Mario de la Ossa2018-02-021-2/+1
| * Enable RuboCop Style/RegexpLiteralTakuya Noguchi2018-02-013-4/+4
* | fix rubocop errors and ensure prometheus_installed? doesn't fail in CI tests ...Mike Greiling2018-01-311-1/+2
* | hide prometheus manual integration form when auto config is activeMike Greiling2018-01-311-10/+8
* | change prometheus service description text to match designMike Greiling2018-01-311-1/+1
* | Merge branch 'master' into pawel/connect_to_prometheus_through_proxy-30480Mike Greiling2018-01-311-1/+1
|\ \ | |/
| * Fix JIRA not working when a trailing slash is includedStan Hu2018-01-291-1/+1
* | Fix rubocopPawel Chojnacki2018-01-301-0/+1
* | fix service generic testsPawel Chojnacki2018-01-301-4/+1
* | Merge remote-tracking branch 'upstream/master' into pawel/connect_to_promethe...Pawel Chojnacki2018-01-293-3/+3
|\ \ | |/
| * update code based on feedback42327-import-from-gitlab-com-fails-destination-already-exists-and-is-not-an-empty-directory-errorJames Lopez2018-01-263-3/+3
| * fix validation error on servicesJames Lopez2018-01-263-3/+3
* | check if service is templatePawel Chojnacki2018-01-171-0/+1
* | Merge remote-tracking branch 'upstream/master' into pawel/connect_to_promethe...Pawel Chojnacki2018-01-172-0/+29
|\ \ | |/
| * Adds Rubocop rule for line break around conditionals🙈 jacopo beschi 🙉2018-01-111-0/+1
| * 41054-Disallow creation of new Kubernetes integrationsMayra Cabrera2018-01-041-0/+28
* | Fix rubocop warningsPawel Chojnacki2018-01-041-3/+6
* | Cleanup PrometheusService testsPawel Chojnacki2018-01-041-4/+0
* | Cleanup implementation and add cluster finding testsPawel Chojnacki2018-01-041-6/+16
* | Add test checking if prometheus integration is enabled after prometheus is in...Pawel Chojnacki2018-01-041-7/+13
* | Auto enable prometheus service if Prometheus is InstalledPawel Chojnacki2018-01-021-4/+6
* | Manual Configuration instead of Activation. Prometheus Service just got a bit...Pawel Chojnacki2018-01-021-8/+28
* | Move client creation to Prometheus Application, manufacture proper rest clientPawel Chojnacki2018-01-021-30/+7
* | wipPawel Chojnacki2018-01-021-7/+56
|/
* Fixes 40842 - Adds extra cookies to JIRA service requestsStanislaw Wozniak2017-12-181-0/+2
* Check diff between KubernetesService and Platforms::Kubernetes. Synchronize a...Shinya Maeda2017-11-281-0/+5
* Merge branch '18040-rubocop-line-break-after-guard-clause' into 'master'Rémy Coutable2017-11-203-0/+4
|\
| * Adds Rubocop rule for line break after guard clauseJacopo2017-11-163-0/+4
* | Resolve "Internationalization support for Prometheus Service Configuration"Jose Ivan Vargas Lopez2017-11-151-3/+3
|/
* Merge branch 'master' into 38464-k8s-appsShinya Maeda2017-11-071-1/+1
|\
| * Fix issue reopen Mattermost / Slack message39791-when-reopening-an-issue-the-mattermost-notification-has-no-context-to-the-issueSean McGivern2017-11-061-1/+1
* | Improve backend structure of dataKamil Trzcinski2017-11-021-4/+2
* | Merge branch 'refactor-clusters' into 38464-k8s-appsKamil Trzcinski2017-11-023-1/+71
|\ \ | |/
| * Merge branch 'add-packagist-project-service' into 'master'Kamil Trzciński2017-10-311-0/+65
| |\
View Lorry Controller Status