summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* SSoT for administration/high_availability docsdocs/ssot-admin-haAchilleas Pipinellis2019-07-1513-7/+115
| | | | | | - Make sure we have type defined in the frontmatter - Add troubleshooting sections where absent - Meaningful intros where absent
* Merge branch 'docs/gb/serverless-function-dockerfile-runtime' into 'master'Evan Read2019-07-151-13/+22
|\ | | | | | | | | Add a note about implicit Dockerfile serverless runtime See merge request gitlab-org/gitlab-ce!30672
| * Add a note about implicit Dockerfile serverless runtimeGrzegorz Bizon2019-07-151-13/+22
|/
* Merge branch 'expand-acronym' into 'master'Achilleas Pipinellis2019-07-151-1/+1
|\ | | | | | | | | expand (CD) acronym See merge request gitlab-org/gitlab-ce!30646
| * expand (CD) acronymmokha2019-07-111-1/+1
| | | | | | | | | | | | | | | | > Do not use acronyms when you can avoid it as you can't assume people > know what you are talking about. Example: instead of MR, write merge > request. - https://about.gitlab.com/handbook/communication/#writing-style-guidelines
* | Merge branch 'patch-46' into 'master'Evan Read2019-07-151-0/+36
|\ \ | | | | | | | | | | | | Add example of ENV variables for image and services. See merge request gitlab-org/gitlab-ce!27320
| * | Fixed wrong placement of "variables:" statement in yml file.Thad Guidry2019-07-151-0/+36
|/ / | | | | | | Verified snippet works with 11.10.1
* | Merge branch 'issue/55953-docs' into 'master'Achilleas Pipinellis2019-07-1552-274/+273
|\ \ | | | | | | | | | | | | Rename "discussions" to "threads" in docs See merge request gitlab-org/gitlab-ce!30037
| * | Rename "discussions" to "threads" in docsMichel Engelen2019-07-1552-274/+273
|/ /
* | Merge branch 'sh-filter-geo-output' into 'master'Ash McKenzie2019-07-151-1/+2
|\ \ | | | | | | | | | | | | Filter Geo proxied data from api_json.log See merge request gitlab-org/gitlab-ce!30687
| * | Filter Geo proxied data from api_json.logsh-filter-geo-outputStan Hu2019-07-141-1/+2
|/ / | | | | | | | | | | Currently the base64-encoded value of the push-to-secondary data is saved in `api_json.log`, and this can easily be hundreds of megabytes. We should filter this from the logs.
* | Merge branch 'docs-code-block-style-7' into 'master'Evan Read2019-07-1517-920/+930
|\ \ | | | | | | | | | | | | Fix whitespace in user and misc docs See merge request gitlab-org/gitlab-ce!30605
| * | Fix whitespace in user, and misc, docsMarcel Amirault2019-07-1517-920/+930
|/ / | | | | | | | | | | | | | | | | | | Many code blocks are 4spaced, and they render in GitLab without coloring as a result, even though they are fenced with a language label. If in a list, other items woll render as being in a code block too, even if not meant to. This fixes all these issues, and cleans up minor whitespace issues in /user, /security, /ssh and /migrate_ci_to_ce docs.
* | Merge branch 'AddMoreFileExtentionsTo-file_type_icon_class' into 'master'Lin Jen-Shin2019-07-152-9/+32
|\ \ | | | | | | | | | | | | Add more file extentions to file type icon class See merge request gitlab-org/gitlab-ce!30316
| * | Add more file extentions to file type icon classPeter Dave Hello2019-07-152-9/+32
|/ /
* | Merge branch 'remove-obsolete-chaos-routes' into 'master'Lin Jen-Shin2019-07-151-7/+0
|\ \ | | | | | | | | | | | | Remove obsolete chaos routes See merge request gitlab-org/gitlab-ce!30706
| * | Remove obsolete chaos routesremove-obsolete-chaos-routesLuke Bennett2019-07-131-7/+0
| | |
* | | Merge branch 'docs-markdown-lint-update' into 'master'Evan Read2019-07-152-4/+21
|\ \ \ | | | | | | | | | | | | | | | | Update markdown lint style and option files See merge request gitlab-org/gitlab-ce!30595
| * | | Update markdown lint style and option filesMarcel Amirault2019-07-152-4/+21
|/ / / | | | | | | | | | | | | | | | Add commented lines explaining the file, and including rules that should pass already, and commented out rules that can be added in the future, for reference.
* | | Merge branch 'docs-blank-lines' into 'master'Evan Read2019-07-1527-203/+44
|\ \ \ | | | | | | | | | | | | | | | | Remove extra blank lines from docs See merge request gitlab-org/gitlab-ce!30650
| * | | Remove extra blank lines from docsMarcel Amirault2019-07-1527-203/+44
|/ / / | | | | | | | | | | | | | | | Removing extra blank lines in docs that serve no purpose, as well as some --- lines that also are not needed.
* | | Merge branch 'docs/secure-rm-deprecated-jobs' into 'master'Evan Read2019-07-155-523/+75
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove deprecated docs sections of Secure jobs Closes #63739 See merge request gitlab-org/gitlab-ce!30527
| * | | Remove deprecated docs sections of Secure jobsdocs/secure-rm-deprecated-jobsAchilleas Pipinellis2019-07-095-523/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The manual job definitions are deprecated and are not guaranteed to work as expected. We should not confuse our users with including them in the docs. This deletes all the deprecated sections and cleans up the configuration section significantly.
* | | | Merge branch 'docs-trailing-spaces-2' into 'master'Evan Read2019-07-1515-96/+95
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Remove trailing whitespace in docs (part 2) See merge request gitlab-org/gitlab-ce!30649
| * | | | Remove trailing whitespace in docsMarcel Amirault2019-07-1515-96/+95
|/ / / / | | | | | | | | | | | | | | | | Remove unneeded trailing whitespace in lines in /security /workflow /user docs
* | | | Merge branch 'ce-port-ee-10565' into 'master'Grzegorz Bizon2019-07-141-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Single codebase: Remove an extra whitespace in test files See merge request gitlab-org/gitlab-ce!30710
| * | | | Remove an extra whitespace in test filesTakuya Noguchi2019-07-141-1/+1
| | |/ / | |/| | | | | | | | | | | | | | | | | | Partial CE backport of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/10565 Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
* | | | Merge branch 'typo-fix' into 'master'Stan Hu2019-07-1348-48/+48
|\ \ \ \ | |/ / / |/| | | | | | | | | | | Fix typo "beetween" in timeout validation message See merge request gitlab-org/gitlab-ce!30705
| * | | Fix typo "beetween" in timeout validation messageDaniel Danner2019-07-1348-48/+48
|/ / /
* | | Merge branch 'qa-unquarantine-autodevops-spec' into 'master'Dan Davison2019-07-121-2/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Unquarantine previously failing autodevops spec Closes gitlab-org/quality/nightly#108 See merge request gitlab-org/gitlab-ce!30691
| * | | Unquarantine previously failing autodevops specddavison2019-07-121-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | create_project_with_auto_devops_spec.rb # runs autodevops was previous failing This previously failing test has passed consecutively
* | | | Merge branch '11470-snowplow-tracking-for-notes-does-not-work-in-firefox' ↵Clement Ho2019-07-121-1/+1
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | into 'master' CE backport of reply button tracker refactor See merge request gitlab-org/gitlab-ce!28298
| * | | CE backport of reply button tracker refactor11470-snowplow-tracking-for-notes-does-not-work-in-firefoxConstance Okoghenun2019-05-131-1/+1
| | | | | | | | | | | | | | | | EE MR https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/12578
* | | | Merge branch 'winh-multiple-boards-service' into 'master'Mike Greiling2019-07-123-0/+209
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Move functions for multiple boards in BoardService to core (CE-backport) See merge request gitlab-org/gitlab-ce!30624
| * | | | Add functions for multiple boards to BoardServiceWinnie Hellmann2019-07-123-0/+209
|/ / / / | | | | | | | | | | | | (cherry picked from commit 9dbefac95a8b60b93ba7b05fd7bf69b80b395f54)
* | | | Merge branch 'qa-nightly-115-fix-retry-until' into 'master'Dan Davison2019-07-123-5/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | CE port of "Fix page refresh in retry_until" See merge request gitlab-org/gitlab-ce!30656
| * | | | Fix page refresh in retry_untilqa-nightly-115-fix-retry-untilSanad Liaquat2019-07-123-5/+5
| | | | |
* | | | | Merge branch '64416-lodash-4.6.2-for-prototype-pollution' into 'master'Mike Greiling2019-07-122-6/+11
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update lodash to 4.7.14 and lodash.mergewith to 4.6.2 Closes #64416 See merge request gitlab-org/gitlab-ce!30602
| * | | | | Update lodash to 4.7.14 and lodash.mergewith to 4.6.2Takuya Noguchi2019-07-112-6/+11
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
* | | | | | Merge branch 'button-bug-fixes' into 'master'Annabel Dunstone Gray2019-07-122-1/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Project Badge Buttons See merge request gitlab-org/gitlab-ce!30678
| * | | | | | Fix Project ButtonsAndrew Fontaine2019-07-122-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Correct the border colour of the count badge buttons.
* | | | | | | Merge branch 'z-index-fix-for-diff-file-dropdown' into 'master'Fatih Acet2019-07-122-1/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | z-index fixed for diff file dropdown See merge request gitlab-org/gitlab-ce!30657
| * | | | | | | z-index fixed for diff file dropdownFaruk Can2019-07-122-1/+6
|/ / / / / / /
* | | | | | | Merge branch 'docs/fix-link-on-e2e-quick-start-guide' into 'master'Walmyr2019-07-121-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix link on end-to-end quick start guide doc See merge request gitlab-org/gitlab-ce!30680
| * | | | | | | Fix link on end-to-end quick start guide docWalmyr Lima2019-07-121-1/+1
| | | | | | | |
* | | | | | | | Merge branch 'remove-auto-ssl-ff' into 'master'Nick Thomas2019-07-1211-102/+46
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove auto ssl feature flags See merge request gitlab-org/gitlab-ce!30628
| * | | | | | | | Remove auto ssl feature flagsVladimir Shushlin2019-07-1211-102/+46
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remove feature flag for admin settings * remove feature flag for domain settings
* | | | | | | | Merge branch 'fix-only-https-pages-domains' into 'master'Nick Thomas2019-07-122-12/+27
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix saving domain without certificate for auto_ssl See merge request gitlab-org/gitlab-ce!30673
| * | | | | | | | Fix saving domain without certificate for auto_sslfix-only-https-pages-domainsVladimir Shushlin2019-07-122-12/+27
| | | | | | | | |
* | | | | | | | | Merge branch '51952-redirect-to-webide-in-fork' into 'master'Sean McGivern2019-07-124-8/+47
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Open WebIDE in fork when user doesn't have access See merge request gitlab-org/gitlab-ce!30642