summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add another counter to calculate method call ratioab-routable-two-step-searchAndreas Brandl2019-08-301-5/+7
| | | | | | We should see the ratio drop down when enabling the Feature. Recommendation by @andrewn
* Add method call count instrumentationAndreas Brandl2019-08-301-0/+11
|
* Perform two-step Routable lookup by pathAndreas Brandl2019-08-302-3/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to lookup a Project or Namespace by path, we prefer an exact match (case-sensitive) but in absence of that, we'd also take a case-insensitive match. The case-insensitive matching with preference for the exact match is a bit more involved in SQL as the exact lookup. Yet, the majority of cases will be an exact match. The thinking here is that we can optimize the lookup by performing an exact match first and only if there is no result, we perform the case-insensitive lookup. Data for GitLab.com: * We have about 15M records in routes table * About 2,500 routes exist where there's more than one record with the same `lower(path)` It is possible for a user to craft requests that would always trigger the 2-step search (e.g. we have a route for `/foo/bar`, the request is always for `/FOO/bar`). In this case, the change at hand is not beneficial as it would run an additional query. However, based on the data, it is highly likely that the vast majority of requests can be satisfied with an exact match only. The context for this change is https://gitlab.com/gitlab-org/gitlab-ce/issues/64590#note_208156463.
* 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.
| * | | | | | | Merge branch 'security-2853-prevent-comments-on-private-mrs' into 'master'GitLab Release Tools Bot2019-08-296-75/+371
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure only authorised users can create notes on merge requests and issues See merge request gitlab/gitlabhq!3137
| | * | | | | | | Prevent unauthorised comments on merge requestsAlex Kalderimis2019-08-076-75/+371
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Prevent creating notes on inaccessible MRs This applies the notes rules at the MR scope. Rather than adding extra rules to the Project level policy, preventing :create_note here is better since it only prevents creating notes on MRs. * Prevent creating notes in inaccessible Issues without this policy, non-team-members are allowed to comment on issues even when the project has the private-issues policy set. This means that without this change, users are allowed to comment on issues that they cannot read. * Add CHANGELOG entry
| * | | | | | | | Merge branch 'security-epic-notes-api-reveals-historical-info-ce-master' ↵GitLab Release Tools Bot2019-08-2911-23/+42
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Filter out old system notes for epics in notes api endpoint response See merge request gitlab/gitlabhq!3224
| | * | | | | | | | Use `stub_full_request` to fix spec failureHeinrich Lee Yu2019-08-283-16/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also change test URL sequest to .test TLD
| | * | | | | | | | Return NO_ACCESS if user is nilPatrick Derichs2019-08-281-0/+2
| | | | | | | | | |
| | * | | | | | | | Filter out old system notes for epicsPatrick Derichs2019-08-287-7/+16
| | | | | | | | | |
| * | | | | | | | | Merge branch 'security-personal-snippets' into 'master'GitLab Release Tools Bot2019-08-2912-10/+77
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add direct upload support for personal snippets See merge request gitlab/gitlabhq!3226
| | * | | | | | | | | Add direct upload support for personal snippetsJan Provaznik2019-08-2312-10/+77
| | | | | | | | | | |