summaryrefslogtreecommitdiff
path: root/app/controllers
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '43510-merge-requests-and-issues-don-t-show-for-all-subgroups' i...Grzegorz Bizon2018-02-272-5/+0
|\
| * Fix subgroup issue and MR pages empty states and counts43510-merge-requests-and-issues-don-t-show-for-all-subgroupsSean McGivern2018-02-272-5/+0
* | Backport custom metrics ce componentsPaweł Chojnacki2018-02-232-24/+27
* | Merge branch 'master' into '29497-pages-custom-domain-dns-verification'Robert Speicher2018-02-231-2/+2
|\ \
| * \ Merge branch '43496-error-message-for-gke-clusters-persists-in-the-next-page'...bjk/kube_state_metricsKamil Trzciński2018-02-231-2/+2
| |\ \ | | |/ | |/|
| | * Do not persist Google Project Billing Failure errors after a reloadMatija Čupić2018-02-221-2/+2
* | | Add DNS verification to Pages custom domainsNick Thomas2018-02-231-3/+15
|/ /
* | Merge branch '43261-fix-import-from-url-name-collision-active-tab' into 'master'Phil Hughes2018-02-231-1/+1
|\ \
| * | Make import tab/form active when importing project by URL and validation fails43261-fix-import-from-url-name-collision-active-tabEric Eastwood2018-02-201-1/+1
* | | Merge branch 'bvl-external-auth-port' into 'master'Douwe Maan2018-02-2321-24/+92
|\ \ \
| * | | Port `read_cross_project` ability from EEBob Van Landuyt2018-02-2221-24/+92
* | | | Merge branch '42431-add-auto-devops-and-clusters-button-to-projects' into 'ma...Rémy Coutable2018-02-221-0/+2
|\ \ \ \ | |_|_|/ |/| | |
| * | | Move project presenter instance creation to controllerOswaldo Ferreira2018-02-221-0/+2
| |/ /
* | | Merge branch 'fix-500-for-invalid-upload-path' into 'master'Sean McGivern2018-02-221-1/+4
|\ \ \ | |/ / |/| |
| * | Fix 500 error when loading an invalid upload URLSean McGivern2018-02-221-1/+4
* | | Merge branch 'refactor-issuable-finder-to-use-inheritance' into 'master'Rémy Coutable2018-02-216-12/+22
|\ \ \ | |/ / |/| |
| * | Refactor IssuableFinder to extract model-specific logicrefactor-issuable-finder-to-use-inheritanceSean McGivern2018-02-216-12/+22
| |/
* | Revert "Merge branch 'zj-n-1-root-show' into 'master'"Zeger-Jan van de Weg2018-02-201-1/+4
|/
* Merge branch '41722-track-gcp-billing-enabled-project-changes' into 'master'Kamil Trzciński2018-02-141-8/+6
|\
| * Refactor CheckGcpProjectBillingWorkerMatija Čupić2018-02-121-8/+6
* | Merge branch '26466-natural-sort-mrs' into 'master'Sean McGivern2018-02-131-2/+1
|\ \ | |/ |/|
| * Change issue show page to group MRs by projects and namespacesJeff Stubler2018-02-131-2/+1
* | Merge branch 'fix/gh-namespace-issue' into 'security-10-4'James Lopez2018-02-091-17/+7
* | Replace $.post in importer status with axiosClement Ho2018-02-095-38/+53
* | Merge branch 'zj-n-1-root-show' into 'master'Douwe Maan2018-02-081-4/+1
|\ \
| * | Don't allow N +1 calls from Root#showZeger-Jan van de Weg2018-02-071-4/+1
* | | Merge branch 'pawel/connect_to_prometheus_through_proxy-30480' into 'master'Robert Speicher2018-02-071-0/+1
|\ \ \
| * \ \ Merge branch 'master' into pawel/connect_to_prometheus_through_proxy-30480Mike Greiling2018-02-0638-130/+260
| |\ \ \
| * \ \ \ Merge branch 'master' into pawel/connect_to_prometheus_through_proxy-30480Mike Greiling2018-01-313-8/+22
| |\ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'upstream/master' into pawel/connect_to_promethe...Pawel Chojnacki2018-01-2915-55/+83
| |\ \ \ \ \
| * \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into pawel/connect_to_promethe...Pawel Chojnacki2018-01-1722-15/+91
| |\ \ \ \ \ \
| * | | | | | | Manual Configuration instead of Activation. Prometheus Service just got a bit...Pawel Chojnacki2018-01-021-0/+1
* | | | | | | | Backport of LFS File Locking APIrd-35856-backport-lfs-file-locking-apiRubén Dávila2018-02-073-3/+75
* | | | | | | | Merge branch '41209-ci-linter-fails-on-gitlab-ci-blob-viewer' into 'master'Kamil Trzciński2018-02-071-4/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Handle all YAML parser exceptions in .gitlab-ci.yml (fixes #41209)41209-ci-linter-fails-on-gitlab-ci-blob-viewerDylan Griffith2018-02-071-4/+1
* | | | | | | | | Merge branch 'ce-39118-dynamic-pipeline-variables-fe' into 'master'Kamil Trzciński2018-02-072-75/+39
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix static_analysis failurece-39118-dynamic-pipeline-variables-feMatija Čupić2018-02-062-6/+22
| * | | | | | | | | Switch emphasis from controller format to updateMatija Čupić2018-02-052-14/+14
| * | | | | | | | | Remove usage of VariablePresenter in controllerMatija Čupić2018-02-052-16/+4
| * | | | | | | | | Add GroupVariableSerializer for Ci::GroupVariableMatija Čupić2018-02-051-2/+2
| * | | | | | | | | Add VariableSerializer for Ci::VariableMatija Čupić2018-02-051-2/+2
| * | | | | | | | | Return all variables after UPDATEMatija Čupić2018-02-052-2/+12
| * | | | | | | | | Use `resource` in Group Variables routing schemeMatija Čupić2018-02-051-1/+12
| * | | | | | | | | Use `resource` in Project Variables routing schemeMatija Čupić2018-02-051-1/+12
| * | | | | | | | | Format validation errors as human readable messagesMatija Čupić2018-02-052-2/+2
| * | | | | | | | | Pass validation errors in JSON endpointMatija Čupić2018-02-052-2/+2
| * | | | | | | | | Remove redundant routes in Groups::VariablesControllerMatija Čupić2018-02-051-49/+0
| * | | | | | | | | Port #save_multiple to Groups::VariablesControllerMatija Čupić2018-02-051-1/+15
| * | | | | | | | | Remove redundant routes in VariablesControllerMatija Čupić2018-02-051-51/+0
| * | | | | | | | | Use nested attributes for updating multiple variablesMatija Čupić2018-02-051-21/+3
View Lorry Controller Status