summaryrefslogtreecommitdiff
path: root/app/views/projects/services
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '43522-technical-debt-service-disabled_title' into 'master'Dmitriy Zaporozhets2018-03-161-5/+0
|\
| * Removed unused `Service#disabled_title` methods43522-technical-debt-service-disabled_titleJames Edwards-Jones2018-03-151-5/+0
* | Merge branch 'ce-jej/github-project-service-for-ci' into 'master'Douwe Maan2018-03-081-0/+3
|\ \
| * | Backport changes from EE's GithubService integrationJames Edwards-Jones2018-03-071-0/+3
* | | backport of custom metrics for the common metrics section of CEjivl-backport-custom-metrics-frontendJose Ivan Vargas2018-03-071-10/+8
|/ /
* | Replace deprecated name_with_namespace with full_name in app/viewsDmitriy Zaporozhets2018-03-052-3/+3
* | Resolve "Error 500 on route "/admin/application_settings/services/1882/edit" ...Mayra Cabrera2018-02-262-26/+28
* | Backport custom metrics ce componentsPaweł Chojnacki2018-02-231-1/+1
|/
* Removed prometheus_metrics webpack bundle tagprometheus-bundle-tag-refactorConstance Okoghenun2018-02-161-3/+0
* Removed integrations webpack bundle tagproject-integrations-form-dispatcher-refactorConstance Okoghenun2018-02-151-3/+0
* Avoid unless/elsePawel Chojnacki2018-02-071-4/+4
* add i8n to the Prometheus integration settings pageMike Greiling2018-02-061-8/+8
* style the prometheus integration service page according to designMike Greiling2018-01-312-10/+22
* hide prometheus manual integration form when auto config is activeMike Greiling2018-01-311-8/+19
* Merge remote-tracking branch 'upstream/master' into pawel/connect_to_promethe...Pawel Chojnacki2018-01-173-4/+6
|\
| * 41054-Disallow creation of new Kubernetes integrationsMayra Cabrera2018-01-043-4/+6
* | Add test checking if prometheus integration is enabled after prometheus is in...Pawel Chojnacki2018-01-041-0/+10
|/
* Resolve "Internationalization support for Prometheus Service Configuration"Jose Ivan Vargas Lopez2017-11-151-15/+12
* Merge branch 'fix-edit-project-service-cancel-button-position' into 'master'Rémy Coutable2017-10-041-1/+1
|\
| * Fix edit project service cancel button positionMatt Coleman2017-09-291-1/+1
* | Remove all old sub nav barsAnnabel Dunstone Gray2017-09-251-1/+0
|/
* Clean up new navigation templatesPhil Hughes2017-09-061-3/+1
* Rename more path_with_namespace -> full_path or disk_pathGabriel Mazetto2017-08-012-2/+2
* Merge branch 'master' into new-nav-fix-contextual-breadcrumbsPhil Hughes2017-07-141-2/+2
|\
| * Mor info about prometheus service configuration, and fixing problems with mis...34598-more-metrics-info-should-go-to-gitlab-docsPawel Chojnacki2017-07-071-2/+2
* | moved `@breadcrumb_title` out of the HAML & into a helper methodPhil Hughes2017-07-121-1/+1
* | rename methodPhil Hughes2017-07-071-1/+1
* | fixed breadcrumb titlesPhil Hughes2017-07-071-0/+5
|/
* Merge branch 'backport_slack_application_changes' into 'master'Sean McGivern2017-07-061-10/+11
|\
| * Backport Service changes from https://gitlab.com/gitlab-org/gitlab-ee/merge_r...backport_slack_application_changesValery Sizov2017-07-051-10/+11
* | Create and use project path helpers that only need a project, no namespaceDouwe Maan2017-07-054-5/+5
|/
* Merge branch 'project-settings-container-width' into 'master'Annabel Dunstone Gray2017-06-231-2/+2
|\
| * Added limited width container to project settingsPhil Hughes2017-06-201-2/+2
* | Fix Additional metrics filteringPawel Chojnacki2017-06-081-1/+0
* | Merge remote-tracking branch 'upstream/master' into 28717-additional-metrics-...Pawel Chojnacki2017-06-071-3/+9
|\ \ | |/
| * Address review comments31511-jira-settingsJarka Kadlecova2017-06-021-2/+2
| * Update as per reviewkushalpandya2017-06-011-1/+1
| * Provide `test-url` via backendkushalpandya2017-06-011-1/+1
| * Fix class name typokushalpandya2017-06-011-1/+1
| * Use `@service.can_test?` to enable test before savekushalpandya2017-06-011-1/+1
| * Remove test settings button, enhance Save changes button, include Integration...kushalpandya2017-06-011-3/+8
* | Use `.text-center` class instead of text-align prop28717-fe-prometheus-additional-metricskushalpandya2017-06-021-2/+2
* | Update as per review feedbackkushalpandya2017-06-011-7/+7
* | Changes based on UX reviewkushalpandya2017-06-011-2/+2
* | Lint: Fix missing new line at EOFkushalpandya2017-05-312-2/+2
* | Populate Missing env var panelkushalpandya2017-05-311-4/+11
* | Add Prometheus Metrics Bundle, panel for Missing environment variableskushalpandya2017-05-311-4/+21
* | Render service extras partial conditionallykushalpandya2017-05-311-0/+4
* | Prometheus Metrics Panel Viewkushalpandya2017-05-311-0/+21
|/
* Add sub-nav for Project Integration Services edit pageKushal Pandya2017-04-251-0/+1