summaryrefslogtreecommitdiff
path: root/app/views
Commit message (Expand)AuthorAgeFilesLines
...
| * | 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
| * | add link to cluster configuration from prometheus "getting started" stateMike Greiling2018-01-311-0/+1
| * | Merge branch 'master' into pawel/connect_to_prometheus_through_proxy-30480Mike Greiling2018-01-314-10/+35
| |\ \
| * | | add button to configure prometheus integration from cluster pageMike Greiling2018-01-301-1/+2
| * | | Merge remote-tracking branch 'upstream/master' into pawel/connect_to_promethe...Pawel Chojnacki2018-01-2968-186/+201
| |\ \ \
| * \ \ \ Merge remote-tracking branch 'upstream/master' into pawel/connect_to_promethe...Pawel Chojnacki2018-01-1770-248/+335
| |\ \ \ \
| * | | | | Add test checking if prometheus integration is enabled after prometheus is in...Pawel Chojnacki2018-01-041-0/+10
* | | | | | Merge branch '3559-ce-port-group-roadmap' into 'master'Filipa Lacerda2018-02-071-1/+1
|\ \ \ \ \ \
| * | | | | | Add support for adding custom class on content wrapper elementKushal Pandya2018-02-071-1/+1
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'zj-refs-hash' into 'master'Sean McGivern2018-02-071-1/+1
|\ \ \ \ \ \
| * | | | | | Don't use rugged in Repository#refs_hashZeger-Jan van de Weg2018-02-071-1/+1
* | | | | | | Merge branch '34416-issue-i18n' into 'master'Sean McGivern2018-02-075-42/+46
|\ \ \ \ \ \ \
| * | | | | | | Translate issuable sidebar34416-issue-i18nJarka Kadlecová2018-02-075-42/+46
* | | | | | | | Merge branch '38175-add-domain-field-to-auto-devops-application-setting' into...Kamil Trzciński2018-02-071-1/+6
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Merge branch 'master' into 38175-add-domain-field-to-auto-devops-application-...Matija Čupić2018-02-033-22/+60
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into 38175-add-domain-field-to-auto-devops-application-...Matija Čupić2018-02-0219-28/+30
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' into 38175-add-domain-field-to-auto-devops-application-...Matija Čupić2018-02-0224-40/+71
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Update auto_devops_domain help block with i18nMatija Čupić2018-01-301-1/+1
| * | | | | | | | | | Merge branch 'master' into 38175-add-domain-field-to-auto-devops-application-...Matija Čupić2018-01-2841-98/+120
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Expose auto_devops_domain in admin settings viewMatija Čupić2018-01-221-1/+6
* | | | | | | | | | | | Merge branch 'ce-39118-dynamic-pipeline-variables-fe' into 'master'Kamil Trzciński2018-02-079-85/+32
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Use dynamic variable list in scheduled pipelines and group/project CI secret ...Eric Eastwood2018-02-059-85/+32
* | | | | | | | | | | | | Merge branch '40755-snippets-author-n+1' into 'master'Yorick Peterse2018-02-071-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Fix N+1 query problem for snippets dashboard.40755-snippets-author-n+1Andreas Brandl2018-02-071-1/+1
* | | | | | | | | | | | | Merge branch 'winh-kubernetes-clusters' into 'master'Phil Hughes2018-02-0620-69/+67
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Replace "cluster" with "Kubernetes cluster"winh-kubernetes-clustersWinnie Hellmann2018-02-0620-69/+67
* | | | | | | | | | | | | Resolve "Add a link to documentation on how to get external ip in the Kuberne...Fabio Busatto2018-02-061-1/+2
| |/ / / / / / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'fix/show-sidebar-sub-level-items-for-billing' into 'master'Sean McGivern2018-02-061-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Override group sidebar linksGeorge Tsiolis2018-02-061-1/+1
* | | | | | | | | | | | | Merge branch '39550-group-labels-redesign' into 'master'Tim Zallmann2018-02-063-24/+51
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Use sprite_icon and variables39550-group-labels-redesignAnnabel Dunstone Gray2018-02-051-1/+1
| * | | | | | | | | | | | Fix labels specsAnnabel Dunstone Gray2018-01-302-3/+3
| * | | | | | | | | | | | Add modal for label deletionAnnabel Dunstone Gray2018-01-292-3/+26
| * | | | | | | | | | | | Change delete notice; update mobile stylesAnnabel Dunstone Gray2018-01-291-11/+11
| * | | | | | | | | | | | Start redesign of group labels pageAnnabel Dunstone Gray2018-01-292-21/+25
| | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | |
* | | | | | | | | | | | 31885 - Ability to transfer a single group to another groupMayra Cabrera2018-02-061-0/+16
* | | | | | | | | | | | Merge branch '41672-emphasize-gke-cluster-to-new-users' into 'master'Clement Ho2018-02-051-0/+24
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Restore feature_highlight code41672-emphasize-gke-cluster-to-new-usersEric Eastwood2018-02-051-0/+24
* | | | | | | | | | | | Merge branch '42584-fix-margins-in-tag-list' into 'master'Filipa Lacerda2018-02-051-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fixes Different margins between buttons in tag listJacopo2018-02-051-1/+1
| | |_|_|_|_|_|_|/ / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Allow moving wiki pages from the UIFrancisco Javier López2018-02-052-5/+8
| |/ / / / / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | Merge branch '42684-set-up-ci-set-up-ci-cd' into 'master'Filipa Lacerda2018-02-051-2/+2
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Change "CI configuration" in "CI/CD configuration"42684-set-up-ci-set-up-ci-cdbikebilly2018-02-021-1/+1
| * | | | | | | | | | Change "Set up CI" to "Set up CI/CD"bikebilly2018-02-011-1/+1
* | | | | | | | | | | Replace $.ajax in admin broadcast messages with axiosClement Ho2018-02-051-1/+0
| |/ / / / / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge branch 'refactor-ci-variable-list-for-future-usage-in-4110' into 'master'Filipa Lacerda2018-02-023-22/+60
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | |
| * | | | | | | | | Refactor CI variable list code for usage with CI/CD settings page secret vari...refactor-ci-variable-list-for-future-usage-in-4110Eric Eastwood2018-01-313-22/+60
* | | | | | | | | | Merge branch 'webpack-auto-config' into 'master'Jacob Schatz2018-02-021-0/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | move auto-generated bundle script tags after manual page-specific webpack bun...Mike Greiling2018-02-011-1/+2