Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Move shared examples into the only file where usedextract_creates_cluster_from_project_clusters_controller | Thong Kuah | 2018-10-17 | 2 | -75/+87 |
* | Extracts creation of cluster to controller concern | Thong Kuah | 2018-10-17 | 12 | -277/+403 |
* | Merge branch 'refactor-project-cluster-controller-specs' into 'master' | Grzegorz Bizon | 2018-10-16 | 1 | -180/+106 |
|\ | |||||
| * | Revert back to go but use arguments for some cases | Thong Kuah | 2018-10-16 | 1 | -114/+99 |
| * | Use subject in controller spec | Thong Kuah | 2018-10-15 | 1 | -261/+202 |
* | | Merge branch '51972-prometheus-not-showing-as-installed-even-though-it-is' in... | Sean McGivern | 2018-10-16 | 14 | -76/+127 |
|\ \ | |||||
| * | | Show available clusters when installed or updated | Peter Leitzen | 2018-10-16 | 14 | -76/+127 |
* | | | Merge branch 'ce-7015-epic-states-notes' into 'master' | Kamil Trzciński | 2018-10-16 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | Make source param optional according to EE change | Jarka Košanová | 2018-10-11 | 1 | -1/+1 |
* | | | | Merge branch 'rails5-fix-utf' into 'master' | Sean McGivern | 2018-10-16 | 2 | -8/+22 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | Use InvalidUTF8ErrorHandler only for rails 4 | Jan Provaznik | 2018-10-13 | 2 | -8/+22 |
| | |/ | |/| | |||||
* | | | Merge branch 'docs-update-maintenance-path-typo-ck' into 'master' | Achilleas Pipinellis | 2018-10-16 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | Fix typo: 9.5.8 => 9.5.10 | Chenjerai Katanda | 2018-10-15 | 1 | -1/+1 |
* | | | | Merge branch 'docs/fix-link-to-when-delayed' into 'master' | Achilleas Pipinellis | 2018-10-16 | 3 | -2/+2 |
|\ \ \ \ | |||||
| * | | | | Fix link to 'when delayed' YAML configuration item | Evan Read | 2018-10-16 | 3 | -2/+2 |
|/ / / / | |||||
* | | | | Merge branch 'da-fix-does-not-import-projects-over-ssh' into 'master' | Stan Hu | 2018-10-16 | 5 | -28/+57 |
|\ \ \ \ | |||||
| * | | | | Does not allow an import_url with SSH protocol | Douglas Barbosa Alexandre | 2018-10-15 | 5 | -28/+57 |
* | | | | | Merge branch 'revert-f90fc922' into 'master' | Mike Greiling | 2018-10-15 | 22 | -117/+38 |
|\ \ \ \ \ | |||||
| * | | | | | Revert "Merge branch 'ce-6983-promote-starting-a-gitlab-com-trial' into 'mast... | Luke Bennett | 2018-10-12 | 22 | -117/+38 |
* | | | | | | Merge branch 'docs-fix-img-shadow' into 'master' | Achilleas Pipinellis | 2018-10-15 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fixes image shadow | Marcia Ramos | 2018-10-15 | 1 | -1/+1 |
* | | | | | | | Merge branch 'define-stage-labels-in-issue-workflow' into 'master' | Mek Stittri | 2018-10-15 | 1 | -0/+34 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Define Stage labels in issue workflow | Fabio Busatto | 2018-10-15 | 1 | -0/+34 |
|/ / / / / / / | |||||
* | | | | | | | Merge branch 'docs-update-remove-push-rules-feauture-not-yet-available' into ... | Douwe Maan | 2018-10-15 | 1 | -1/+0 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Update doc/user/group/index.md | Alexander Strachan | 2018-10-12 | 1 | -1/+0 |
* | | | | | | | | Merge branch 'replace-i-to-icons-in-vue-components' into 'master' | Clement Ho | 2018-10-15 | 22 | -87/+99 |
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | |||||
| * | | | | | | | Replace `<i>` in vue components with `<icon>` | George Tsiolis | 2018-10-15 | 22 | -87/+99 |
|/ / / / / / / | |||||
* | | | | | | | Merge branch 'sh-remove-koding' into 'master' | Douwe Maan | 2018-10-15 | 78 | -1052/+27 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Remove unneeded I8N text for Koding | Stan Hu | 2018-10-12 | 30 | -90/+0 |
| * | | | | | | | Remove Koding integration and documentation | Stan Hu | 2018-10-12 | 78 | -962/+27 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | Merge branch '52532-unable-to-toggle-issuable-sidebar-out-of-collapsed-state'... | Clement Ho | 2018-10-15 | 4 | -32/+6 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Remove unused eslint disable | Clement Ho | 2018-10-15 | 1 | -1/+1 |
| * | | | | | | | Remove obsolete usage of gl.lazyLoader.loadCheck | Lukas Eipert | 2018-10-15 | 4 | -31/+5 |
* | | | | | | | | Merge branch 'qa-add-a-cop-to-forbit-element-with-pattern' into 'master' | Stan Hu | 2018-10-15 | 48 | -152/+298 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Disable the QA/ElementWithPattern cop for existing offenses | Rémy Coutable | 2018-10-15 | 43 | -152/+160 |
| * | | | | | | | | Add a new QA::ElementWithPattern cop | Rémy Coutable | 2018-10-15 | 5 | -0/+138 |
| | |_|_|/ / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'bvl-merge-base-multiple-revisions' into 'master' | Douwe Maan | 2018-10-15 | 7 | -16/+29 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Allow getting the merge base of multiple revisions | Bob Van Landuyt | 2018-10-12 | 7 | -16/+29 |
* | | | | | | | | | Merge branch 'ready-for-review-doc' into 'master' | Douwe Maan | 2018-10-15 | 1 | -1/+15 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Add documentation how to assign a merge request for review | Jarka Kadlecová | 2018-10-15 | 1 | -1/+15 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge branch 'zj-remove-linguist' into 'master' | Robert Speicher | 2018-10-15 | 23 | -90/+5846 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Remove dependencies on Linguist | Zeger-Jan van de Weg | 2018-10-12 | 23 | -90/+5846 |
| | |_|_|/ / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch '34758-refactor-cluster-services' into 'master' | Dmitriy Zaporozhets | 2018-10-15 | 5 | -26/+30 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Pass in project as kwarg for CreateService | Thong Kuah | 2018-10-15 | 5 | -26/+30 |
* | | | | | | | | | | Merge branch '52669-fixes-quick-actions-preview' into 'master' | Douglas Barbosa Alexandre | 2018-10-15 | 4 | -2/+16 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Fixes close/reopen quick actions preview for issues and merge_requests | Jacopo | 2018-10-15 | 4 | -2/+16 |
| | |_|_|_|_|_|_|/ / | |/| | | | | | | | | |||||
* | | | | | | | | | | Merge branch '34758-fix-code-reuse-clusters-applications_controller' into 'ma... | Dmitriy Zaporozhets | 2018-10-15 | 8 | -43/+174 |
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / |/| | | | | | | | | | |||||
| * | | | | | | | | | Remove un-used inheritance from service | Thong Kuah | 2018-10-15 | 7 | -26/+47 |
| * | | | | | | | | | Move non-controller code into dedicated service | Thong Kuah | 2018-10-15 | 4 | -27/+137 |
| | |/ / / / / / / | |/| | | | | | | | |||||
* | | | | | | | | | Merge branch '49417-improve-settings-pages-design-by-prioritizing-content-gro... | Phil Hughes | 2018-10-15 | 34 | -112/+494 |
|\ \ \ \ \ \ \ \ \ |