summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Move shared examples into the only file where usedextract_creates_cluster_from_project_clusters_controllerThong Kuah2018-10-172-75/+87
* Extracts creation of cluster to controller concernThong Kuah2018-10-1712-277/+403
* Merge branch 'refactor-project-cluster-controller-specs' into 'master'Grzegorz Bizon2018-10-161-180/+106
|\
| * Revert back to go but use arguments for some casesThong Kuah2018-10-161-114/+99
| * Use subject in controller specThong Kuah2018-10-151-261/+202
* | Merge branch '51972-prometheus-not-showing-as-installed-even-though-it-is' in...Sean McGivern2018-10-1614-76/+127
|\ \
| * | Show available clusters when installed or updatedPeter Leitzen2018-10-1614-76/+127
* | | Merge branch 'ce-7015-epic-states-notes' into 'master'Kamil Trzciński2018-10-161-1/+1
|\ \ \
| * | | Make source param optional according to EE changeJarka Košanová2018-10-111-1/+1
* | | | Merge branch 'rails5-fix-utf' into 'master'Sean McGivern2018-10-162-8/+22
|\ \ \ \ | |_|/ / |/| | |
| * | | Use InvalidUTF8ErrorHandler only for rails 4Jan Provaznik2018-10-132-8/+22
| | |/ | |/|
* | | Merge branch 'docs-update-maintenance-path-typo-ck' into 'master'Achilleas Pipinellis2018-10-161-1/+1
|\ \ \
| * | | Fix typo: 9.5.8 => 9.5.10Chenjerai Katanda2018-10-151-1/+1
* | | | Merge branch 'docs/fix-link-to-when-delayed' into 'master'Achilleas Pipinellis2018-10-163-2/+2
|\ \ \ \
| * | | | Fix link to 'when delayed' YAML configuration itemEvan Read2018-10-163-2/+2
|/ / / /
* | | | Merge branch 'da-fix-does-not-import-projects-over-ssh' into 'master'Stan Hu2018-10-165-28/+57
|\ \ \ \
| * | | | Does not allow an import_url with SSH protocolDouglas Barbosa Alexandre2018-10-155-28/+57
* | | | | Merge branch 'revert-f90fc922' into 'master'Mike Greiling2018-10-1522-117/+38
|\ \ \ \ \
| * | | | | Revert "Merge branch 'ce-6983-promote-starting-a-gitlab-com-trial' into 'mast...Luke Bennett2018-10-1222-117/+38
* | | | | | Merge branch 'docs-fix-img-shadow' into 'master'Achilleas Pipinellis2018-10-151-1/+1
|\ \ \ \ \ \
| * | | | | | Fixes image shadowMarcia Ramos2018-10-151-1/+1
* | | | | | | Merge branch 'define-stage-labels-in-issue-workflow' into 'master'Mek Stittri2018-10-151-0/+34
|\ \ \ \ \ \ \
| * | | | | | | Define Stage labels in issue workflowFabio Busatto2018-10-151-0/+34
|/ / / / / / /
* | | | | | | Merge branch 'docs-update-remove-push-rules-feauture-not-yet-available' into ...Douwe Maan2018-10-151-1/+0
|\ \ \ \ \ \ \
| * | | | | | | Update doc/user/group/index.mdAlexander Strachan2018-10-121-1/+0
* | | | | | | | Merge branch 'replace-i-to-icons-in-vue-components' into 'master'Clement Ho2018-10-1522-87/+99
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Replace `<i>` in vue components with `<icon>`George Tsiolis2018-10-1522-87/+99
|/ / / / / / /
* | | | | | | Merge branch 'sh-remove-koding' into 'master'Douwe Maan2018-10-1578-1052/+27
|\ \ \ \ \ \ \
| * | | | | | | Remove unneeded I8N text for KodingStan Hu2018-10-1230-90/+0
| * | | | | | | Remove Koding integration and documentationStan Hu2018-10-1278-962/+27
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch '52532-unable-to-toggle-issuable-sidebar-out-of-collapsed-state'...Clement Ho2018-10-154-32/+6
|\ \ \ \ \ \ \
| * | | | | | | Remove unused eslint disableClement Ho2018-10-151-1/+1
| * | | | | | | Remove obsolete usage of gl.lazyLoader.loadCheckLukas Eipert2018-10-154-31/+5
* | | | | | | | Merge branch 'qa-add-a-cop-to-forbit-element-with-pattern' into 'master'Stan Hu2018-10-1548-152/+298
|\ \ \ \ \ \ \ \
| * | | | | | | | Disable the QA/ElementWithPattern cop for existing offensesRémy Coutable2018-10-1543-152/+160
| * | | | | | | | Add a new QA::ElementWithPattern copRémy Coutable2018-10-155-0/+138
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch 'bvl-merge-base-multiple-revisions' into 'master'Douwe Maan2018-10-157-16/+29
|\ \ \ \ \ \ \ \
| * | | | | | | | Allow getting the merge base of multiple revisionsBob Van Landuyt2018-10-127-16/+29
* | | | | | | | | Merge branch 'ready-for-review-doc' into 'master'Douwe Maan2018-10-151-1/+15
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add documentation how to assign a merge request for reviewJarka Kadlecová2018-10-151-1/+15
| |/ / / / / / / /
* | | | | | | | | Merge branch 'zj-remove-linguist' into 'master'Robert Speicher2018-10-1523-90/+5846
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Remove dependencies on LinguistZeger-Jan van de Weg2018-10-1223-90/+5846
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge branch '34758-refactor-cluster-services' into 'master'Dmitriy Zaporozhets2018-10-155-26/+30
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Pass in project as kwarg for CreateServiceThong Kuah2018-10-155-26/+30
* | | | | | | | | | Merge branch '52669-fixes-quick-actions-preview' into 'master'Douglas Barbosa Alexandre2018-10-154-2/+16
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fixes close/reopen quick actions preview for issues and merge_requestsJacopo2018-10-154-2/+16
| | |_|_|_|_|_|_|/ / | |/| | | | | | | |
* | | | | | | | | | Merge branch '34758-fix-code-reuse-clusters-applications_controller' into 'ma...Dmitriy Zaporozhets2018-10-158-43/+174
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | |
| * | | | | | | | | Remove un-used inheritance from serviceThong Kuah2018-10-157-26/+47
| * | | | | | | | | Move non-controller code into dedicated serviceThong Kuah2018-10-154-27/+137
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge branch '49417-improve-settings-pages-design-by-prioritizing-content-gro...Phil Hughes2018-10-1534-112/+494
|\ \ \ \ \ \ \ \ \