summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update jira-ruby to 1.7.1Takuya Noguchi2019-08-304-3/+14
| | | | Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
* Merge branch 'renovate/gitlab-packages' into 'master'Kushal Pandya2019-08-302-10/+10
|\ | | | | | | | | Update GitLab Packages See merge request gitlab-org/gitlab-ce!32419
| * Update GitLab PackagesLukas Eipert2019-08-292-10/+10
| |
* | Merge branch 'nfriend-add-anchor-tag-to-release-block' into 'master'Kushal Pandya2019-08-302-1/+5
|\ \ | | | | | | | | | | | | Add `id` attribute to release blocks See merge request gitlab-org/gitlab-ce!32360
| * | Add id to release blocknfriend-add-anchor-tag-to-release-blockNathan Friend2019-08-282-1/+5
| | | | | | | | | | | | | | | This commit adds an id attribute to release blocks to allow them to be targeted as anchor links.
* | | Merge branch 'ce-13479-rename-atmtwps-to-mtwps' into 'master'Paul Slaughter2019-08-303-11/+7
|\ \ \ | | | | | | | | | | | | | | | | CE backport for gitlab-org/gitlab-ee!15535: Resolve "Rename `ATMTWPS` to `MTWPS` in code" See merge request gitlab-org/gitlab-ce!32112
| * | | Rename ATMTWPS to MTWPS (CE)ce-13479-rename-atmtwps-to-mtwpsNathan Friend2019-08-223-11/+7
| | | | | | | | | | | | | | | | This commit does a find-and-replace from ATMTWPS -> MTWPS.
* | | | Merge branch 'docs_api_commits' into 'master'Evan Read2019-08-301-5/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Update doc/api/deploy_keys.md See merge request gitlab-org/gitlab-ce!32069
| * | | | Update doc/api/deploy_keys.mdAlexis Sánchez2019-08-301-5/+8
|/ / / /
* | | | Merge branch '66264-moved-issue-reference' into 'master'Jan Provaznik2019-08-305-2/+23
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Use "moved" instead of "closed" in issue references" Closes #66264 See merge request gitlab-org/gitlab-ce!32277
| * | | | Resolve "Use "moved" instead of "closed" in issue references"Juliette de Rancourt2019-08-305-2/+23
|/ / / /
* | | | Merge branch 'patch-76' into 'master'Evan Read2019-08-301-4/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Fixed grammar and inconsistencies with capitalization See merge request gitlab-org/gitlab-ce!32337
| * | | | Fixed grammar and inconsistencies with capitalizationShan2019-08-301-4/+4
|/ / / /
* | | | Merge branch ↵Ash McKenzie2019-08-303-1/+18
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '65251-default-clusters-namespace_per_environment-column-to-true' into 'master' Default clusters namespace_per_environment to true See merge request gitlab-org/gitlab-ce!32139
| * | | | Default clusters namespace_per_environment to trueTiger2019-08-303-1/+18
| | | | |
* | | | | Merge branch '62055-find-file-links-encoding' into 'master'Paul Slaughter2019-08-303-1/+83
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix "Find Files Links Not URL Encoded" Closes #62055 See merge request gitlab-org/gitlab-ce!31311
| * | | | | URL-encode file links in find fileJan Beckmann2019-08-303-1/+83
|/ / / / / | | | | | | | | | | | | | | | Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/62055
* | | | | Merge branch '65742-make-be_url-stricter' into 'master'Thong Kuah2019-08-303-11/+42
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add `be_http_url` matcher Closes #65742 See merge request gitlab-org/gitlab-ce!32054
| * | | | | Allow be_url to specify the typeAlex Kalderimis2019-08-303-11/+42
|/ / / / / | | | | | | | | | | | | | | | | | | | | This allows the be_url matcher to be more specific. By default, it only matches HTTP and HTTPS URIs.
* | | | | Merge branch 'rz_pages_letsencrypt' into 'master'Evan Read2019-08-301-0/+3
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | Add caution that this feature requires 2 IP's See merge request gitlab-org/gitlab-ce!31962
| * | | | Apply suggestion to ↵Ronald van Zon2019-08-301-0/+3
|/ / / / | | | | | | | | | | | | doc/user/project/pages/custom_domains_ssl_tls_certification/lets_encrypt_integration.md
* | | | Merge branch 'patch-15' into 'master'Evan Read2019-08-301-0/+36
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | docs: add docker-in-docker from registry example See merge request gitlab-org/gitlab-ce!31101
| * | | | docs: add docker-in-docker from registry exampleNeroBurner2019-08-291-0/+36
| | | | | | | | | | | | | | | | | | | | - use specific docker version 19.03.1 in example
* | | | | Merge branch 'docs-dotcom-add-limit' into 'master'Evan Read2019-08-301-1/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Docs: Add raw endpoints limit for GL.com settings See merge request gitlab-org/gitlab-ce!32288
| * | | | | Docs: Add raw endpoints limit for GL.com settingsCynthia Ng2019-08-301-1/+5
|/ / / / /
* | | | | Merge branch 'docs-markdown-fixes' into 'master'Evan Read2019-08-305-5/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fix broken markdown in various docs See merge request gitlab-org/gitlab-ce!32440
| * | | | | Fix broken markdown in various docsMarcel Amirault2019-08-305-5/+6
|/ / / / /
* | | | | Merge branch 'patch-79' into 'master'Ray Paik2019-08-301-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Fixed spelling See merge request gitlab-org/gitlab-ce!32434
| * | | | | Fixed spellingShan2019-08-291-1/+1
| | |_|_|/ | |/| | |
* | | | | Merge branch 'revert-79fa2cd9' into 'master'Evan Read2019-08-301-5/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Merge branch 'nik-api-snippets-fix' into 'master'" Closes #66673 See merge request gitlab-org/gitlab-ce!32295
| * | | | | Revert "Merge branch 'nik-api-snippets-fix' into 'master'"revert-79fa2cd9Stan Hu2019-08-271-5/+5
| | | | | | | | | | | | | | | | | | This reverts merge request !28571
* | | | | | Merge branch 'docs-markdownlint-fixes-2' into 'master'Evan Read2019-08-3027-45/+39
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix markdown in various docs (part 2) See merge request gitlab-org/gitlab-ce!32269
| * | | | | | Fix markdown in various docsMarcel Amirault2019-08-3027-45/+39
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clean up issues that may cause the docs-lint test to fail, such as trailing whitespace, no EOF newline, blockquotes, etc
* | | | | | Merge branch 'lint/fix-failing-markdown-file' into 'master'Evan Read2019-08-301-6/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add second space to lines failing lint See merge request gitlab-org/gitlab-ce!32435
| * | | | | | Remove spaces from lines failing lintThomas Randolph2019-08-291-6/+6
|/ / / / / /
* | | | | | Merge branch 'fix-test-design-link' into 'master'Evan Read2019-08-301-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Broken Link to Test Design See merge request gitlab-org/gitlab-ce!32279
| * | | | | | Broken Link to Test DesignDavid H. Wilkins2019-08-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - previous link engineering/quality/guidelines/test-engineering/test-design is missing and apparently should be engineering/quality/test-engineering/#test-heuristics
* | | | | | | Merge branch 'docs-ado-extra-build-args' into 'master'Evan Read2019-08-301-0/+29
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document the AUTO_DEVOPS_BUILD_IMAGE_EXTRA_ARGS project variable See merge request gitlab-org/gitlab-ce!32057
| * | | | | | | Document the AUTO_DEVOPS_BUILD_IMAGE_EXTRA_ARGS project variableHordur Freyr Yngvason2019-08-301-0/+29
|/ / / / / / /
* | | | | | | Merge branch 'ce-backport-of-ml-web-terminal-spec-qa' into 'master'Dan Davison2019-08-2911-23/+153
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport changes from EE MR 8186 See merge request gitlab-org/gitlab-ce!31707
| * | | | | | | Backport changes from EEce-backport-of-ml-web-terminal-spec-qaMark Lapierre2019-08-2911-23/+153
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/8186
* | | | | | | | Merge branch 'patch-78' into 'master'Ray Paik2019-08-291-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed spelling See merge request gitlab-org/gitlab-ce!32432
| * | | | | | | | Fixed spellingShan2019-08-291-1/+1
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge branch 'patch-77' into 'master'Ray Paik2019-08-291-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed spelling See merge request gitlab-org/gitlab-ce!32431
| * | | | | | | | Fixed spellingShan2019-08-291-1/+1
| |/ / / / / / /
* | | | | | | | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqRobert Speicher2019-08-29150-343/+3045
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'security-enable-image-proxy' into 'master'GitLab Release Tools Bot2019-08-2934-17/+592
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use image proxy to mitigate stealing ip addresses Closes #2812 See merge request gitlab/gitlabhq!2926
| | * | | | | | | | disable cop Migration/AddLimitToStringColumnsBrett Walker2019-08-231-2/+2
| | | | | | | | | |
| | * | | | | | | | Fix failing spec due to changes UpdateServiceBrett Walker2019-08-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for ApplicationSettings
| | * | | | | | | | Add support for using a Camo proxy serverBrett Walker2019-08-2333-16/+591
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | User images and videos will get proxied through the Camo server in order to keep malicious sites from collecting the IP address of users.