summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix broken FKcreate_knative_serviceThong Kuah2019-03-272-3/+3
|
* Revert "Fix FK type mismatchgin mySQL"Thong Kuah2019-03-271-1/+1
| | | | This reverts commit 27eaebd54279e1c13e60f50e243da885452e28b9.
* Fix FK type mismatch in mySQLThong Kuah2019-03-271-1/+1
|
* Add Paas::Service modelThong Kuah2019-03-274-1/+52
| | | | | This models a Knative Service for a namespace/project. We can have multiple Services for a namespace/project
* Add Paas::Namespace modelThong Kuah2019-03-274-1/+50
| | | | This models the namespaces for a project
* Add Paas::Cluster modelThong Kuah2019-03-274-1/+53
| | | | | There are a lot of similaritis with Clusters::Cluster so we may end up re-using that model instead
* Add Knative Service resourceThong Kuah2019-03-272-0/+92
| | | | | | | | Teaches GitLab how to generate a Knative service resource. Assuming runLatest, out of runLatest, release, manual, or pinned (DEPRECATED). https://github.com/knative/serving/blob/master/docs/spec/spec.md#service
* Merge branch 'tz-gl-stylelint' into 'master'Kushal Pandya2019-03-269-32/+776
|\ | | | | | | | | Stylelints for duplicate selectors and using BS4 classes See merge request gitlab-org/gitlab-ce!26409
| * First iteration of GitLab own StylelintsTim Zallmann2019-03-269-32/+776
|/ | | | | | | | DRYed the code Changed new rules to warnings Manual prettified and added stylelint rules
* Merge branch 'docs-add-existing-cluster-fixup' into 'master'Evan Read2019-03-261-47/+30
|\ | | | | | | | | Docs: Improve add existing cluster section See merge request gitlab-org/gitlab-ce!26266
| * Docs: Fixup duplicated sectionsThong Kuah2019-03-261-47/+30
|/ | | | | | | | | | | We are mentioning the commands needed to obtain these fields twice. Merge them into the single place. - For API URL we only had the command at the bottom so move this up. - For CA certificate, we already have the command at the top of the section - For Token, we already have an similar command at the top of the section
* Merge branch '52366-improved-group-lists-ui-spinners' into 'master'Fatih Acet2019-03-267-11/+16
|\ | | | | | | | | | | | | Update spinners in group list component Closes #52366 See merge request gitlab-org/gitlab-ce!26572
| * Update spinners in group list componentDennis Tang2019-03-267-11/+16
| |
* | Merge branch 'mg-update-reviewer-suggestions' into 'master'Douglas Barbosa Alexandre2019-03-261-1/+17
|\ \ | | | | | | | | | | | | Update frontend-specific files in reviewer roulette See merge request gitlab-org/gitlab-ce!26566
| * | Apply suggestion to lib/gitlab/danger/helper.rbMike Greiling2019-03-251-1/+1
| | |
| * | Update frontend-specific files in reviewer rouletteMike Greiling2019-03-251-1/+17
| | |
* | | Merge branch 'MaxWinterstein-unify-copy-comit-sha' into 'master'Fatih Acet2019-03-263-2/+8
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Unify behaviour of 'Copy commit SHA to clipboard' on job view Closes #58343 See merge request gitlab-org/gitlab-ce!25829
| * | | Unify behaviour of 'Copy commit SHA to clipboard'Max Winterstein2019-03-093-2/+8
| | | |
* | | | Update CHANGELOG.md for 11.9.1GitLab Release Tools Bot2019-03-258-37/+17
| | | | | | | | | | | | [ci skip]
* | | | Merge branch 'refactor-create-merge-request-e2e-test-suite' into 'master'Mark Lapierre2019-03-251-26/+30
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | Refactor create merge request test suite See merge request gitlab-org/gitlab-ce!26499
| * | | Move simplest test to the top and more complex to the bottomWalmyr2019-03-251-26/+30
|/ / / | | | | | | | | | | | | | | | | | | Also, make both `it` statments part of the same `describe`. Finally, remove duplication of strings by defining variables and re-using them.
* | | Merge branch 'docs-update-ssot-security-requirements' into 'master'Marcia Ramos2019-03-251-11/+6
|\ \ \ | | | | | | | | | | | | | | | | Add ssot link to security reviews documentation See merge request gitlab-org/gitlab-ce!26291
| * | | Add ssot link to security reviews documentationJames Ritchey2019-03-251-11/+6
|/ / /
* | | Merge branch 'ce-1974-update-user-name-upon-ldap-sync' into 'master'Douwe Maan2019-03-253-14/+16
|\ \ \ | | | | | | | | | | | | | | | | Backport 'Update user name upon LDAP sync' from EE See merge request gitlab-org/gitlab-ce!26432
| * | | Backport 'Update user name upon LDAP sync' from EERémy Coutable2019-03-253-14/+16
| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | Merge branch 'ce-mw-update-gl-search-box' into 'master'Phil Hughes2019-03-252-5/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (CE port) Replace GlSearchBox with GlSearchBoxByType Closes gitlab-ee#10637 See merge request gitlab-org/gitlab-ce!26548
| * | | | (CE port) Replace GlSearchBox with GlSearchBoxByTypeMartin Wortschack2019-03-252-5/+5
|/ / / /
* | | | Merge branch '56954-improve-knative-after-installing-tiller' into 'master'Sean McGivern2019-03-255-1/+49
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improvements for Knative installation Closes #56954 See merge request gitlab-org/gitlab-ce!26339
| * | | | Improvements for Knative installationMayra Cabrera2019-03-255-1/+49
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | Displays Knative domain field automatically after Helm is successfully installed. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/56954
* | | | Merge branch ↵Rémy Coutable2019-03-251-2/+44
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'ce-6543-extract-ee-specific-files-lines-for-some-discussion-tests' into 'master' Resolve CE/EE differences in MergeRequestPresenter spec See merge request gitlab-org/gitlab-ce!26546
| * | | | Resolve CE/EE differences in MergeRequestPresenter specSean McGivern2019-03-251-2/+44
| | |_|/ | |/| |
* | | | Merge branch 'winh-eslint-config-danger' into 'master'Mike Greiling2019-03-251-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Mark .eslintrc.yml as frontend change for Danger See merge request gitlab-org/gitlab-ce!26549
| * | | | Mark .eslintrc.yml as frontend change for DangerWinnie Hellmann2019-03-251-1/+1
| |/ / /
* | | | Merge branch '10641-settings-css' into 'master'57620-add-time-preferences-to-user-bePhil Hughes2019-03-251-0/+52
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes EE differences for settings.scss Closes gitlab-ee#10641 See merge request gitlab-org/gitlab-ce!26543
| * | | | Removes EE differences for settings.scssFilipa Lacerda2019-03-251-0/+52
| |/ / /
* | | | Merge branch '10642-groups-css' into 'master'Phil Hughes2019-03-251-0/+49
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes EE differences for groups.scss Closes gitlab-ee#10642 See merge request gitlab-org/gitlab-ce!26544
| * | | | Removes EE differences for groups.scssFilipa Lacerda2019-03-251-0/+49
| |/ / /
* | | | Merge branch 'docs-improve-end-to-ends-tests-to-mention-review-qa-all-job' ↵Lin Jen-Shin2019-03-254-10/+43
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Mention review-qa-all in the end-to-end tests documentation See merge request gitlab-org/gitlab-ce!26541
| * | | | Mention review-qa-all in the end-to-end tests documentationRémy Coutable2019-03-254-10/+43
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | Merge branch '10638-secondary-css' into 'master'Phil Hughes2019-03-251-0/+27
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes EE differences for secondary_navigation_elements Closes gitlab-ee#10638 See merge request gitlab-org/gitlab-ce!26537
| * | | | | Removes EE differences for secondary_navigation_elementsFilipa Lacerda2019-03-251-0/+27
| | |_|/ / | |/| | |
* | | | | Merge branch '10604-pannels-css' into 'master'Phil Hughes2019-03-251-1/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes EE differences for panels.scss Closes gitlab-ee#10604 See merge request gitlab-org/gitlab-ce!26492
| * | | | | Removes EE differences for panels.scssFilipa Lacerda2019-03-221-1/+0
| | | | | |
* | | | | | Merge branch 'sh-fix-github-import-creator' into 'master'Douglas Barbosa Alexandre2019-03-253-4/+9
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | GitHub importer: Use the project creator to create branches from forks Closes #59396 See merge request gitlab-org/gitlab-ce!26510
| * | | | | GitHub importer: Use the project creator to create branches from forksStan Hu2019-03-233-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The project owner may actually be a group, in which case the branch creation would fail due to a lack of username. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/59396
* | | | | | Merge branch 'fix/missing-border' into 'master'Annabel Dunstone Gray2019-03-252-0/+6
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix(ui-bug): missing border of comments Closes #58915 and #58538 See merge request gitlab-org/gitlab-ce!26242
| * | | | | Fix border radius of discussion commentsFarhad Yasir2019-03-252-0/+6
|/ / / / /
* | | | | Merge branch 'revert-8fcdf34e' into 'master'Phil Hughes2019-03-252-5/+5
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | Revert "Merge branch 'renovate/gitlab-ui-2.x' into 'master'" (CE backport) See merge request gitlab-org/gitlab-ce!26535
| * | | | Revert "Merge branch 'renovate/gitlab-ui-2.x' into 'master'"Winnie Hellmann2019-03-252-5/+5
|/ / / / | | | | | | | | | | | | This reverts merge request !26380
* | | | Merge branch '57984-store-branch-name' into 'master'Phil Hughes2019-03-256-10/+23
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolves "Branch name is lost if I change commit mode in Web IDE" Closes #57984 See merge request gitlab-org/gitlab-ce!26180
View Lorry Controller Status