summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add changelog exclusion language for docs-only changesdocs-clarify-no-changelog-for-docs-only-changesLucas Charles2019-08-231-0/+1
|
* Merge branch 'ce-jej/fix-sso-enforced-docker-registry-auth' into 'master'Kamil Trzciński2019-08-232-0/+9
|\ | | | | | | | | [CE backport] Enforced SSO shouldn't break container registry authentication See merge request gitlab-org/gitlab-ce!32110
| * JwtController avoids activating session checksce-jej/fix-sso-enforced-docker-registry-authJames Edwards-Jones2019-08-222-0/+9
| | | | | | | | | | This used without a session and issues a sessionless token, so we should avoid causing access checks based on the session.
* | Merge branch '62322-add-optional-id-to-label-api-put-delete-pd' into 'master'Kamil Trzciński2019-08-236-137/+285
|\ \ | | | | | | | | | | | | | | | | | | Add label_id parameter to label API for PUT and DELETE Closes #62322 See merge request gitlab-org/gitlab-ce!31804
| * | Add label_id parameter to label API for PUT and DELETEPatrick Derichs2019-08-236-137/+285
|/ / | | | | | | Add specs for new parameter and updated documentation as well.
* | Merge branch 'jc-fix-auto-rugged-detection' into 'master'Lin Jen-Shin2019-08-232-1/+12
|\ \ | | | | | | | | | | | | Handle when server info doesn't have the storage in question See merge request gitlab-org/gitlab-ce!32023
| * | Handle when server info doesn't have the storage in questionJohn Cai2019-08-232-1/+12
| | |
* | | Update CHANGELOG.md for 12.2.1GitLab Release Tools Bot2019-08-234-15/+13
| | | | | | | | | [ci skip]
* | | Merge branch 'sh-eliminate-gitaly-nplus-one-notes' into 'master'Kamil Trzciński2019-08-236-57/+78
|\ \ \ | | | | | | | | | | | | | | | | Eliminate Gitaly N+1 queries with notes API See merge request gitlab-org/gitlab-ce!32089
| * | | Eliminate Gitaly N+1 queries with notes APIsh-eliminate-gitaly-nplus-one-notesStan Hu2019-08-226-57/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Similar to https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/31834, we see that in https://gitlab.com/gitlab-org/gitlab-ce/issues/65957 there can be hundreds, even thousands, of Gitaly requests in the `/api/:version/projects/:id/merge_requests/:noteable_id/notes` endpoint. Previously, the API to retrieve notes generated hundreds of Gitaly calls to determine whether a system note should be shown to the user. It did this by: 1. Rendering the Markdown 2. Extracting cross-references from the Markdown 3. Issuing a Gitaly `FindCommit` RPC for every reference to validate that the commit exists. The last step is unnecessary because we don't need to display a commit if the user doesn't have access to the project in the first place. `RendersNotes#prepare_notes_for_rendering` is already used in `MergeRequestsController`, which is why we don't see N+1 Gitaly calls there. We use it here to optimize the note redaction process.
* | | | Merge branch 'qa/quarantine-filter-issue-comments-test' into 'master'Walmyr Lima e Silva Filho2019-08-231-1/+2
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | Quarantine filter issue comments test See merge request gitlab-org/gitlab-ce!32152
| * | | Quarantine filter issue comments testqa/quarantine-filter-issue-comments-testWalmyr Lima2019-08-231-1/+2
| | | |
* | | | Merge branch 'docs-health-check-failure-examples' into 'master'Achilleas Pipinellis2019-08-231-13/+69
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Docs health check failure examples Closes #64193 See merge request gitlab-org/gitlab-ce!31945
| * | | | Docs health check failure examplesSean Arnold2019-08-231-13/+69
|/ / / /
* | | | Merge branch '57402-upate-issues-list-sort-options-ce' into 'master'Jan Provaznik2019-08-238-23/+49
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | CE: Update sort options for issues list See merge request gitlab-org/gitlab-ce!31849
| * | | | Update sort options for issues list57402-upate-issues-list-sort-options-ceAlexandru Croitor2019-08-238-23/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Increase sort options for issues list from updated_at and create_at, to include more options close to what is required in actual issue list UI. This helps us to use REST API for issues list with sorting capabilities https://gitlab.com/gitlab-org/gitlab-ce/issues/57402
* | | | | Merge branch 'qa-ml-fail-early-if-template-not-found' into 'master'Walmyr Lima e Silva Filho2019-08-232-2/+15
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | Fail E2E tests early if template not found via API See merge request gitlab-org/gitlab-ce!31955
| * | | | Fail E2E tests early if template not found via APIMark Lapierre2019-08-232-2/+15
|/ / / /
* | | | Merge branch '62514-update-prometheus-metrics-docs' into 'master'Achilleas Pipinellis2019-08-231-33/+110
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 62514 - update prometheus metrics docs Closes #62514 See merge request gitlab-org/gitlab-ce!31987
| * | | | 62514 - update prometheus metrics docsDavid Wilkins2019-08-231-33/+110
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Strikeout for metrics that aren't reported anymore - added :thumbsup: for all the metrics that appear to be still available - Added :new: for the new metrics. - Determine Release when the new metrics appeared - Add descriptions for the new metrics - remove the adornments :new: and :thumbsup: - removce the lines with strikeout
* | | | Merge branch 'master' into 'master'Stan Hu2019-08-231-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Reduce dedup calls to gc only See merge request gitlab-org/gitlab-ce!32083
| * | | | Reduce dedup calls to gc onlyBoris Krylov2019-08-221-1/+1
| | | | |
* | | | | Merge branch 'winh-deduplicate-board-headers' into 'master'Kushal Pandya2019-08-236-6/+43
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Hide duplicate board list while dragging See merge request gitlab-org/gitlab-ce!32099
| * | | | | Hide duplicate board list while draggingWinnie Hellmann2019-08-236-6/+43
|/ / / / /
* | | | | Merge branch 'docs-12713-vulnerabilities-dl-api' into 'master'Achilleas Pipinellis2019-08-231-5/+11
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Update dependencies api doc See merge request gitlab-org/gitlab-ce!32061
| * | | | | Update dependencies api docTetiana Chupryna2019-08-231-5/+11
|/ / / / /
* | | | | Merge branch 'ac-uploads-docs' into 'master'Nick Thomas2019-08-233-0/+274
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document uploads development guidelines Closes #63097 See merge request gitlab-org/gitlab-ce!31290
| * | | | | Document uploads development guidelinesAlessio Caiazza2019-08-233-0/+274
|/ / / / / | | | | | | | | | | | | | | | Explain Workhorse acceleration features
* | | | | Merge branch 'frozen_string_lib_2' into 'master'Nick Thomas2019-08-23201-3/+401
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add frozen_string_literal to lib part 2 See merge request gitlab-org/gitlab-ce!32094
| * | | | | Fix frozen string errorfrozen_string_lib_2Thong Kuah2019-08-231-1/+2
| | | | | |
| * | | | | Fix frozen string errorsThong Kuah2019-08-232-2/+2
| | | | | |
| * | | | | Add frozen_string_literal to lib part 2Thong Kuah2019-08-23199-0/+397
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using the sed script from https://gitlab.com/gitlab-org/gitlab-ce/issues/59758
* | | | | | Merge branch '66022-git-clone-url-box-on-wiki-git-access-page-is-broken' ↵Annabel Dunstone Gray2019-08-239-38/+29
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "Git clone URL box on Wiki git access page is broken" Closes #66022 See merge request gitlab-org/gitlab-ce!31898
| * | | | | | Fix broken git clone box on wiki git access pageHimanshu Kapoor2019-08-239-38/+29
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some CSS fixes to fix the position of the git clone box on the wiki git access page. This fix also includes fixes for various responsive states.
* | | | | | Merge branch '64385-charts-scroll-handle-icon-has-disappeared' into 'master'Filipa Lacerda2019-08-233-1/+14
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix charts scroll handle icon See merge request gitlab-org/gitlab-ce!31825
| * | | | | | fix charts scroll handle iconLaura Montemayor2019-08-233-1/+14
|/ / / / / /
* | | | | | Merge branch 'labkit-cache-tracing' into 'master'Nick Thomas2019-08-234-4/+14
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Redis interceptor tracing See merge request gitlab-org/gitlab-ce!30238
| * | | | | | Add cache tracing and Redis tracingAndrew Newdigate2019-08-234-4/+14
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change adds Distributed Tracing support for two new types of events 1. Redis Calls 1. ActiveSupport (Rails) Caching Operations The intention is to help application developers and infrastructure SREs to understand the pressure that caching operations can have on the application when running at scale. The Redis and Caching spans can be viewed in the Jaeger UI by clicking the "Trace" link in the performance bar when running on GDK.
* | | | | | Merge branch 'optimise-build-queue-service' into 'master'Grzegorz Bizon2019-08-235-51/+103
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Optimise UpdateBuildQueueService Closes #66438 See merge request gitlab-org/gitlab-ce!32095
| * | | | | | Optimise build queue serviceoptimise-build-queue-serviceKamil Trzciński2019-08-225-51/+103
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes BuildQueueService to force refresh runners that are considered to have recent queue. Such runners are the ones that connected within online interval + time to expire runner cache.
* | | | | | | Merge branch 'docs-65631-rename-approval-rule' into 'master'Achilleas Pipinellis2019-08-233-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update documentation screenshot See merge request gitlab-org/gitlab-ce!31995
| * | | | | | | Update documentation screenshotSamantha Ming2019-08-233-1/+1
|/ / / / / / /
* | | | | | | Merge branch 'v12-upgrade-recommendation-docs' into 'master'Achilleas Pipinellis2019-08-231-0/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add version 12 upgrade recommendations Closes #63907 See merge request gitlab-org/gitlab-ce!30201
| * | | | | | | Add version 12 upgrade recommendationsGreg Myers2019-08-231-0/+1
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | Updates doc/policy/maintenance.md, adds upgrade path from 11 -> 12
* | | | | | | Merge branch 'docs-capitalization-1' into 'master'Achilleas Pipinellis2019-08-2324-43/+43
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | Update capitalization in /administration, /api, others See merge request gitlab-org/gitlab-ce!32136
| * | | | | | Update capitalization in admin, api, othersMarcel Amirault2019-08-2324-43/+43
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Update capitalization in /administration, /api, /ci and /customization
* | | | | | Merge branch ↵Jan Provaznik2019-08-233-3/+12
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '49392-exempt-jwt-auth-for-user-gitlab-ci-token-from-rate-limiting' into 'master' Exempt `jwt/auth` for user `gitlab-ci-token` from rate limiting Closes #49392 See merge request gitlab-org/gitlab-ce!31909
| * | | | | | Exempt `jwt/auth` for user `gitlab-ci-token` from rate limitingMarius Bobin2019-08-233-3/+12
|/ / / / / /
* | | | | | Merge branch 'qa-ml-fix-view-commit-patch-test' into 'master'Sanad Liaquat2019-08-231-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Failure in qa/specs/features/browser_ui/3_create/repository/user_views_commit_diff_patch_spec.rb" Closes gitlab-org/quality/staging#69 See merge request gitlab-org/gitlab-ce!32087
| * | | | | | Fix failing testqa-ml-fix-view-commit-patch-testMark Lapierre2019-08-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Optionally check for quotes and escape the name