summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'zj-circuit-breaker-removal' into 'master'Douwe Maan2018-10-1061-2058/+65
|\ | | | | | | | | | | | | Remove Git circuit breaker Closes #45405 See merge request gitlab-org/gitlab-ce!22212
| * Remove Git circuit breakerZeger-Jan van de Weg2018-10-1061-2058/+65
| | | | | | | | | | | | | | Was introduced in the time that GitLab still used NFS, which is not required anymore in most cases. By removing this, the API it calls will return empty responses. This interface has to be removed in the next major release, expected to be 12.0.
* | Merge branch '7631-remove-security-report-summary-from-pipelines-view' into ↵Fatih Acet2018-10-101-2/+0
|\ \ | | | | | | | | | | | | | | | | | | 'master' Backport of CE changes from https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/7844 See merge request gitlab-org/gitlab-ce!22221
| * | Remove security report summary from pipelines viewLukas Eipert2018-10-091-2/+0
| | | | | | | | | | | | | | | This removes the Vue component, corresponding tests and haml/bundle entry points for the Security Report summary in the pipelines view
* | | Merge branch 'docs/service-template' into 'master'Marcia Ramos2018-10-101-2/+4
|\ \ \ | | | | | | | | | | | | | | | | Clarify what happens when enabling a service template See merge request gitlab-org/gitlab-ce!22240
| * | | Clarify what happens when enabling a service templateAchilleas Pipinellis2018-10-091-2/+4
| | | |
* | | | Merge branch 'docs-update-nfs-ha-git_data_dirs' into 'master'Marcia Ramos2018-10-101-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Update the HA NFS docs See merge request gitlab-org/gitlab-ce!22239
| * | | | update the HA NFS docsabuerer2018-10-091-2/+2
| |/ / /
* | | | Merge branch 'docs/autodevops-enable-auto' into 'master'Marcia Ramos2018-10-101-10/+12
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Move the Auto DevOps note to the top See merge request gitlab-org/gitlab-ce!21745
| * | | | Move the Auto DevOps note to the topAchilleas Pipinellis2018-10-091-10/+12
| |/ / /
* | | | Merge branch 'ml-qa-add-file-templates' into 'master'Sean McGivern2018-10-1021-26/+377
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Add test of adding file templates via Web IDE and Files view See merge request gitlab-org/gitlab-ce!21914
| * | | | Add tests of adding file templatesMark Lapierre2018-10-0921-26/+377
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds tests that adds new files via file templates via the Files view and the Web IDE. Includes changes to page objects and associated code Fetches template content from the API rather than hardcoding strings that will need to be updated if the templates change. Some of the content is stored as flat files but we can't use them because they're not included in the docker images gitlab-qa uses.
* | | | | Merge branch 'jej/inline-rspec-filepath-cop' into 'master'Rémy Coutable2018-10-101-1/+10
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | Inline RSpec/FilePath rubocop rule See merge request gitlab-org/gitlab-ce!22233
| * | | | Inline RSpec/FilePath rubocop ruleJames Edwards-Jones2018-10-091-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | Moves RSpec/FilePath cop from gitlab-styles, so we can specify filepaths to ignore without hardcoding them in the gem.
* | | | | Merge branch 'priority-bug-sla-clarity' into 'master'Mek Stittri2018-10-101-6/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Clarify SLA for defects See merge request gitlab-org/gitlab-ce!22229
| * | | | | Clarify SLA for defectsMek Stittri2018-10-091-6/+6
| | | | | |
* | | | | | Merge branch 'patch-28' into 'master'Achilleas Pipinellis2018-10-091-2/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove duplicated item in Administration Documentation See merge request gitlab-org/gitlab-ce!21933
| * | | | | | Remove duplicated item in Administration DocumentationMichael Bisbjerg2018-10-091-2/+1
|/ / / / / /
* | | | | | Merge branch 'gt-update-wiki-empty-state' into 'master'Fatih Acet2018-10-092-1/+6
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | Update wiki empty state See merge request gitlab-org/gitlab-ce!22218
| * | | | | Update wiki empty stateGeorge Tsiolis2018-10-092-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | - Align heading text to the left according to #40468
* | | | | | Merge branch 'qa-60-reorganize-menu-classes' into 'master'Rémy Coutable2018-10-0935-60/+66
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reorganize menu files Closes gitlab-org/quality/team-tasks#60 See merge request gitlab-org/gitlab-ce!22115
| * | | | | Reorganize menu filesqa-60-reorganize-menu-classes-squash-trysliaquat2018-10-0935-60/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add missed files Use correct method Implement review feedback Add missing frozen_string_literal Squash 5 commits
* | | | | | Merge branch ↵Mike Greiling2018-10-092-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '52399-link-for-rbac-experimental-support-is-going-to-the-wrong-anchor' into 'master' Resolve "Link for RBAC (experimental support) is going to the wrong anchor" See merge request gitlab-org/gitlab-ce!22216
| * | | | | | Fix anchor for RBAC support help linkThong Kuah2018-10-092-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The RBAC section header was changed, causing the anchor to change as well. For our first release with RBAC support, it is important we get the link right.
* | | | | | | Merge branch '52367-cleanup-web-hooks-columns' into 'master'Rémy Coutable2018-10-095-37/+31
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unencrypted webhook token and URL columns Closes #52367 See merge request gitlab-org/gitlab-ce!22199
| * | | | | | | Remove unencrypted webhook token and URL columnsNick Thomas2018-10-095-37/+31
| | | | | | | |
* | | | | | | | Merge branch '52372-pipeline-s-page-shows-vue-error-on-master' into 'master'Mike Greiling2018-10-092-2/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "pipeline's page shows vue error on master" Closes #52372 See merge request gitlab-org/gitlab-ce!22201
| * | | | | | | | Resolve "pipeline's page shows vue error on master"Filipa Lacerda2018-10-092-2/+2
|/ / / / / / / /
* | | | | | | | Merge branch 'patch-29' into 'master'Rémy Coutable2018-10-091-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove a duplicated word in the README file See merge request gitlab-org/gitlab-ce!22200
| * | | | | | | | Update README.mdpockata2018-10-081-1/+1
| |/ / / / / / /
* | | | | | | | Merge branch '52233-harmonize-eslint-prettier' into 'master'Fatih Acet2018-10-0966-115/+93
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Harmonize prettier and eslint configs" Closes #52233 See merge request gitlab-org/gitlab-ce!22126
| * | | | | | | | Resolve "Harmonize prettier and eslint configs"Mike Greiling2018-10-0966-115/+93
|/ / / / / / / /
* | | | | | | | Merge branch 'improve-downstream-pipeline-trigger' into 'master'Nick Thomas2018-10-091-24/+49
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve downstream pipeline trigger class See merge request gitlab-org/gitlab-ce!22110
| * | | | | | | | Improve downstream pipeine trigger classRémy Coutable2018-10-081-24/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | Merge branch 'qa-304-auto-devops-open-live-environment' into 'master'Rémy Coutable2018-10-098-2/+73
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Assert prod environment is live after Auto Devops See merge request gitlab-org/gitlab-ce!22131
| * | | | | | | | | Move to using qa-* selectorsThong Kuah2018-10-096-7/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds the corresponding qa-* classes into the view files for each new Page element we added. Adjust the click actions to match.
| * | | | | | | | | Assert prod environment is live after Auto DevopsThong Kuah2018-10-085-0/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Goes to Operations > Environments and clicks on the "View deployment" link for production.
* | | | | | | | | | Merge branch '43953-add-troubleshooting-to-github-import' into 'master'Achilleas Pipinellis2018-10-091-14/+18
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | doc-Resolve "Add Troubleshooting to Github Import" Closes #43953 See merge request gitlab-org/gitlab-ce!17583
| * | | | | | | | | | Refactor GitHub import raketask docsAchilleas Pipinellis2018-10-091-36/+18
| | | | | | | | | | |
| * | | | | | | | | | Update github_import.mdDavin Walker2018-10-091-0/+22
| | |_|_|_|_|_|_|/ / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'docs-improve-repository_files' into 'master'Achilleas Pipinellis2018-10-091-3/+12
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve the Repository files documentation See merge request gitlab-org/gitlab-ce!22225
| * | | | | | | | | | Improve the Repository files documentationRémy Coutable2018-10-091-3/+12
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | | | | Merge branch 'qa_spec_admin_cluster_create_cluster_role_binding' into 'master'Rémy Coutable2018-10-091-1/+11
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QA: Use basic auth to create cluster role binding See merge request gitlab-org/gitlab-ce!22190
| * | | | | | | | | | Fix commands for kubectl >= 1.12Thong Kuah2018-10-091-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `--username` and `--password` top level options have been removed. Fortunately we have a backwards compatible way of setting the credentials via `kubectl config set-credentials <name>`, and using the `--user <name>` top level option which is available at least in 1.10 (and possibly farther back).
| * | | | | | | | | | Use basic auth to create cluster role bindingThong Kuah2018-10-081-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The alternative is the user has `container.admin` permissions. This approach is preferred as this means the QA spec can be run by any GitLabber and indeed any contributor who can create a GKE cluster.
* | | | | | | | | | | Merge branch 'docs/rs-feature-flag-check-by-default' into 'master'Yorick Peterse2018-10-091-0/+24
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Documentation for feature flags defaulting to on Closes gitlab-ee#7883 See merge request gitlab-org/gitlab-ce!22157
| * | | | | | | | | | Documentation for feature flags defaulting to onRobert Speicher2018-10-051-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/7883
* | | | | | | | | | | Merge branch 'tsumitsu-master-patch-1' into 'master'Achilleas Pipinellis2018-10-096-49/+25
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | docs/Tsumitsu Fix render issue in GFM documentation page See merge request gitlab-org/gitlab-ce!21997
| * | | | | | | | | | | docs/Tsumitsu Fix render issue in GFM documentation pagesmit_tooned2018-10-096-49/+25
|/ / / / / / / / / / /
* | | | | | | | | | | Merge branch '52408-pip-cache-dir-to-cache-python-dependencies' into 'master'Kamil Trzciński2018-10-093-3/+8
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the standard PIP_CACHE_DIR for Python dependency caching template Closes #52408 See merge request gitlab-org/gitlab-ce!22211