summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master' into 38783-add-cluster-metrics...38783-add-cluster-metrics.ymlPawel Chojnacki2018-02-2380-203/+1607
|\
| * Merge branch 'backport_custom_metrics_ce_components' into 'master'Robert Speicher2018-02-2316-92/+111
| |\
| | * Backport custom metrics ce componentsPaweł Chojnacki2018-02-2316-92/+111
| |/
| * Merge branch '29497-pages-custom-domain-dns-verification' into 'master'Robert Speicher2018-02-2352-22/+1358
| |\
| | * Merge branch 'master' into '29497-pages-custom-domain-dns-verification'Robert Speicher2018-02-2325-119/+225
| | |\
| | * | Log pages domain verification changes to application.logNick Thomas2018-02-231-0/+1
| | * | Add DNS verification to Pages custom domainsNick Thomas2018-02-2352-22/+1357
| * | | Merge branch '42044-osw-add-button-to-deploy-runner-to-kubernetes' into 'master'Filipa Lacerda2018-02-2310-25/+71
| |\ \ \
| | * | | Add a button to deploy a runner to a Kubernetes cluster in the settings page42044-osw-add-button-to-deploy-runner-to-kubernetesOswaldo Ferreira2018-02-2310-25/+71
| * | | | Merge branch 'docs-fix-empty-line' into 'master'Jacob Schatz2018-02-231-3/+3
| |\ \ \ \
| | * | | | Add missing empty line at the end of filedocs-fix-empty-lineClement Ho2018-02-221-3/+3
| * | | | | Merge branch 'dispatcher-if' into 'master'Mike Greiling2018-02-231-24/+27
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | Convert switch into if statementdispatcher-ifClement Ho2018-02-221-24/+27
| * | | | | Merge branch 'dm-stuck-import-jobs-verify' into 'master'Sean McGivern2018-02-233-38/+65
| |\ \ \ \ \
| | * | | | | Remove changelog item that already went into EEDouwe Maan2018-02-231-5/+0
| | * | | | | Verify project import status again before marking as failedDouwe Maan2018-02-233-31/+48
| | * | | | | Adds scheduled import jobs to the stuck import jobs detection worker.Tiago Botelho2018-02-233-11/+26
| | | |_|_|/ | | |/| | |
| * | | | | Merge branch '43496-error-message-for-gke-clusters-persists-in-the-next-page'...bjk/kube_state_metricsKamil Trzciński2018-02-233-3/+8
| |\ \ \ \ \
| | * | | | | Add CHANGELOG entry43496-error-message-for-gke-clusters-persists-in-the-next-pageMatija Čupić2018-02-221-0/+5
| | * | | | | Do not persist Google Project Billing Failure errors after a reloadMatija Čupić2018-02-222-3/+3
| | | |_|/ / | | |/| | |
| * | | | | Merge branch '42545-milestion-quick-actions-for-groups' into 'master'Douwe Maan2018-02-239-60/+75
| |\ \ \ \ \
| | * | | | | Resolve "Milestone Quick Action not displayed with no project milestones but ...🙈 jacopo beschi 🙉2018-02-239-60/+75
| |/ / / / /
* | | | | | Move prometheus adapter to app/models/concernsPawel Chojnacki2018-02-231-4/+0
* | | | | | Merge remote-tracking branch 'upstream/backport_custom_metrics_ce_components'...Pawel Chojnacki2018-02-23691-5404/+10129
|\ \ \ \ \ \
| * | | | | | Fix prometheus_service found by find_or_initialize_servicebackport_custom_metrics_ce_componentsPawel Chojnacki2018-02-231-1/+1
| * | | | | | additional metrics and backported testsPawel Chojnacki2018-02-236-18/+22
| * | | | | | Introduce Metrics controller and retire prometheus controllerPawel Chojnacki2018-02-234-26/+31
| * | | | | | Backport PrometheusClient::Error and all->common_metrics renamePawel Chojnacki2018-02-236-47/+57
| |/ / / / /
| * | | | | Merge branch 'users-autocomplete' into 'master'Douwe Maan2018-02-2311-19/+78
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Added changelog for user search improvementsusers-autocompleteYorick Peterse2018-02-223-5/+8
| | * | | | Optimise searching for users using short queriesYorick Peterse2018-02-226-5/+54
| | * | | | Removed pagination from AutocompleteUsersFinderYorick Peterse2018-02-224-11/+14
| | * | | | Don't pluck IDs in AutocompleteUsersFinderYorick Peterse2018-02-221-3/+7
| | |/ / /
| * | | | Merge branch 'dm-go-get-api-token' into 'master'Nick Thomas2018-02-234-17/+97
| |\ \ \ \
| | * | | | Allow token authentication on go-get requestDouwe Maan2018-02-234-17/+97
| |/ / / /
| * | | | Merge branch '43261-fix-import-from-url-name-collision-active-tab' into 'master'Phil Hughes2018-02-234-9/+28
| |\ \ \ \
| | * | | | Make import tab/form active when importing project by URL and validation fails43261-fix-import-from-url-name-collision-active-tabEric Eastwood2018-02-204-9/+28
| * | | | | Merge branch 'bvl-external-auth-port' into 'master'Douwe Maan2018-02-23114-348/+2509
| |\ \ \ \ \
| | * | | | | Use `Redactor` to hide cross project informationbvl-external-auth-portBob Van Landuyt2018-02-226-93/+70
| | * | | | | Port `read_cross_project` ability from EEBob Van Landuyt2018-02-22115-346/+2530
| * | | | | | Merge branch '42938-add-tip-push-to-create' into 'master'Phil Hughes2018-02-2311-10/+118
| |\ \ \ \ \ \
| | * | | | | | Add Tip about Push to Create project on New Project pageAndré Luís2018-02-2311-10/+118
| |/ / / / / /
| * | | | | | Merge branch '41619-turn-on-legacy-authorization-for-new-clusters-on-gke' int...Kamil Trzciński2018-02-224-3/+15
| |\ \ \ \ \ \
| | * | | | | | Modify cluster creation API method to enable legacy_apac as defaultMayra Cabrera2018-02-224-3/+15
| | | |_|/ / / | | |/| | | |
| * | | | | | Merge branch '42431-add-auto-devops-and-clusters-button-to-projects' into 'ma...Rémy Coutable2018-02-2228-449/+1156
| |\ \ \ \ \ \
| | * | | | | | Unify use of can_current_user_push_code Presenter42431-add-auto-devops-and-clusters-button-to-projectsOswaldo Ferreira2018-02-222-2/+2
| | * | | | | | Use select instead rejectOswaldo Ferreira2018-02-221-2/+2
| | * | | | | | Move can_current_user_push_to_branch to PresenterOswaldo Ferreira2018-02-223-8/+10
| | * | | | | | Simplify project check with duck typingOswaldo Ferreira2018-02-221-1/+1
| | * | | | | | Move project presenter instance creation to controllerOswaldo Ferreira2018-02-223-2/+2
View Lorry Controller Status