summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Upgrade graphql gem to 1.8.4bw-move-funtion-to-resolverBrett Walker2019-08-236-7/+39
| | | | and pass real query contexts into certain specs
* Replace echo function with a resolverBrett Walker2019-08-235-26/+19
| | | | | The `GraphQL::Function` has been deprecated in favor of resolvers.
* Merge branch 'fe-fix-issuable-sidebar-icon-of-notification-disabled' into ↵Mike Greiling2019-08-233-3/+10
|\ | | | | | | | | | | | | 'master' Fix issuable sidebar icon of notification disabled See merge request gitlab-org/gitlab-ce!32134
| * Fix issuable sidebar icon of notification disabledPaul Slaughter2019-08-233-3/+10
| | | | | | | | by adding the proper notification icon
* | Merge branch 'docs/fix-template-link' into 'master'Mike Lewis2019-08-231-1/+1
|\ \ | | | | | | | | | | | | Fix link to issue template See merge request gitlab-org/gitlab-ce!32144
| * | Fix link to issue templateAchilleas Pipinellis2019-08-231-1/+1
|/ /
* | Merge branch '64505-add-rubocop-cop-to-enforce-string-length-on-migrations' ↵Stan Hu2019-08-2373-51/+431
|\ \ | | | | | | | | | | | | | | | | | | into 'master' Adds cop to enforce string limits on migrations See merge request gitlab-org/gitlab-ce!31433
| * | Adds cop to enforce string limits on migrationsMayra Cabrera2019-08-2373-51/+431
|/ / | | | | | | | | | | | | This cop will analyze migrations that add columns with string, and report an offense if the string has no limit enforced Related to https://gitlab.com/gitlab-org/gitlab-ce/issues/64505
* | Merge branch ↵Mayra Cabrera2019-08-239-11/+93
|\ \ | | | | | | | | | | | | | | | | | | '55999-misleading-pipeline-tooltip-messages-and-misleading-ci-status-icons-on-simple-commits' into 'master' Change misleading pipeline status tooltip See merge request gitlab-org/gitlab-ce!31861
| * | Change misleading pipeline status tooltipScott Hampton2019-08-239-11/+93
|/ / | | | | | | | | | | | | | | | | | | Some pipeline status icon tooltips were showing "Commit: ..." which customers found to be misleading since it was not the commit that was failing but the pipeline. We are changing all status icon tooltips to say "Pipeline: ..." instead of "Commit: ..." now.
* | Merge branch '66402-use-visual-review-tools-npm-package' into 'master'Mike Greiling2019-08-2327-1217/+19
|\ \ | | | | | | | | | | | | Resolve "Use Visual Review Tools NPM package" See merge request gitlab-org/gitlab-ce!32159
| * | Move visual review toolbar to NPMshampton2019-08-2327-1217/+19
| | | | | | | | | | | | | | | Remove the visual review toolbar code in favor of using the NPM package.
* | | Merge branch '64269-pipeline-api-fails-with-401' into 'master'Mayra Cabrera2019-08-234-1/+253
|\ \ \ | | | | | | | | | | | | | | | | Read pipelines from public projects though API See merge request gitlab-org/gitlab-ce!31816
| * | | Read pipelines from public projects though APIMarius Bobin2019-08-234-1/+253
|/ / / | | | | | | | | | | | | Allow users to read pipelines for public projects with public builds enabled without providing an access token.
* | | Merge branch '66037-deployment-user' into 'master'Tim Zallmann2019-08-235-3/+42
|\ \ \ | | | | | | | | | | | | | | | | Return correct user for manual deployments See merge request gitlab-org/gitlab-ce!32004
| * | | Extract logic who created deployment into Deployment#deployed_by66037-deployment-userKrasimir Angelov2019-08-225-3/+42
| | | | | | | | | | | | | | | | | | | | | | | | Prefer the deployable user over the deployment user. Related to https://gitlab.com/gitlab-org/gitlab-ce/issues/66037.
* | | | Merge branch 'new-cycle-analytics-backend-stage-events' into 'master'Mayra Cabrera2019-08-2320-0/+635
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | New cycle analytics backend stage events See merge request gitlab-org/gitlab-ce!31713
| * | | | Implement validation logic to ProjectStageAdam Hegyi2019-08-2320-0/+635
|/ / / / | | | | | | | | | | | | | | | | | | | | - Introducting StageEvents to define the available events - Define the event pairing rules, since some events are not compatible - Express default Cycle Analytics stages with the event structure
* | | | Merge branch 'jc-add-ff-for-all-lfs-pointers-go' into 'master'Stan Hu2019-08-231-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Adding gitaly feature flag for go implementation of get all lfs pointers See merge request gitlab-org/gitlab-ce!31696
| * | | | Adding gitaly feature flag for go implementation of get all lfs pointersjc-add-ff-for-all-lfs-pointers-goJohn Cai2019-08-231-0/+1
| | | | |
* | | | | Merge branch '55360-redundant-index-in-the-releases-table_v2' into 'master'Mayra Cabrera2019-08-233-1/+26
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Remove redundant index See merge request gitlab-org/gitlab-ce!31487
| * | | | | Remove redundant indexSean Carroll2019-08-233-1/+26
|/ / / / /
* | | | | 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