summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add changelog entrygitaly-version-v1.61.0GitalyBot2019-08-221-0/+5
|
* Update Gitaly version to v1.61.0GitalyBot2019-08-221-1/+1
|
* Merge branch 'harishsr-kube-cheatsheet-logs-docs' into 'master'Achilleas Pipinellis2019-08-221-5/+15
|\ | | | | | | | | Add missing content from debug's kubectl cheat sheet See merge request gitlab-org/gitlab-ce!31971
| * Add missing content from debug's kubectl cheat sheetHarish Ramachandran2019-08-221-5/+15
|/
* Merge branch 'qa/issue-boards-e2e-tests' into 'master'Rémy Coutable2019-08-227-5/+11
|\ | | | | | | | | Backport of EE MR See merge request gitlab-org/gitlab-ce!31903
| * Expose id attribute on label resourceqa/issue-boards-e2e-testsWalmyr Lima2019-08-201-0/+1
| |
| * Allow issue fabrication with milestoneWalmyr Lima2019-08-201-2/+4
| |
| * Add testability on viewsWalmyr Lima2019-08-205-3/+6
| |
* | Merge branch 'add_links_to_latest_pipelines' into 'master'Rémy Coutable2019-08-226-6/+106
|\ \ | | | | | | | | | | | | | | | | | | Issue #39099: Add links for latest pipelines Closes #50499 See merge request gitlab-org/gitlab-ce!20865
| * | Issue #39099: Add links for latest pipelinesAlex Ives2019-08-226-6/+106
| | |
* | | Merge branch 'docs/uncompressed-artifacts' into 'master'Achilleas Pipinellis2019-08-221-7/+9
|\ \ \ | | | | | | | | | | | | | | | | Make it clear that the artifacts count as uncompressed See merge request gitlab-org/gitlab-ce!32045
| * | | Make it clear that the artifacts count as uncompressedAchilleas Pipinellis2019-08-221-7/+9
|/ / /
* | | Merge branch 'sidekiq_job_cpu_time' into 'master'Kamil Trzciński2019-08-222-11/+72
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Log time spent on CPU to sidekiq.log Closes #65390 See merge request gitlab-org/gitlab-ce!31866
| * | | Log time spent on CPU to sidekiq.logBalakumar2019-08-222-11/+72
|/ / /
* | | Merge branch 'avoid-race-condition-of-archive-trace-cron-worker' into 'master'Kamil Trzciński2019-08-225-5/+70
|\ \ \ | | | | | | | | | | | | | | | | Avoid conflicts between ArchiveTracesCronWorker and ArchiveTraceWorker See merge request gitlab-org/gitlab-ce!31376
| * | | Avoid conflicts between ArchiveTraceWorkersavoid-race-condition-of-archive-trace-cron-workerShinya Maeda2019-08-225-5/+70
| | | | | | | | | | | | | | | | | | | | | | | | This commits avoiding conflicts between ArchiveTraceWorker and ArchiveTracesCronWorker by changing the target of the latter worker.
* | | | Merge branch 'renovate/gitlab-ui-5.x' into 'master'Clement Ho2019-08-222-5/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Update dependency @gitlab/ui to v5.18.0 See merge request gitlab-org/gitlab-ce!31872
| * | | | Update dependency @gitlab/ui to v5.18.0Lukas Eipert2019-08-222-5/+5
| | | | |
* | | | | Merge branch 'id-etag-caching-for-mr-widget' into 'master'Rémy Coutable2019-08-223-46/+3
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | Remove mergeTrain from FE since it's used only in EE See merge request gitlab-org/gitlab-ce!32068
| * | | | Remove mergeTrain from FE since it's used only in EEIgor2019-08-223-46/+3
|/ / / /
* | | | Merge branch 'feat/smime-signed-notification-emails' into 'master'Sean McGivern2019-08-2219-3/+515
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | feat: smime signed notification emails See merge request gitlab-org/gitlab-ce!30644
| * | | | feat: SMIME signed notification emailsDiego Louzán2019-08-2019-3/+515
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add mail interceptor the signs outgoing email with SMIME - Add lib and helpers to work with SMIME data - New configuration params for setting up SMIME key and cert files
* | | | | Merge branch 'mc-storage-namespaces-case-study-docs' into 'master'Marin Jankovski2019-08-222-0/+179
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Adds new DB case study for namespaces statistics See merge request gitlab-org/gitlab-ce!31547
| * | | | | Adds new DB case study for namespaces statisticsMayra Cabrera2019-08-222-0/+179
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | Includes a new database case study about all the approaches taken to store and update the namespace statistics in a performan manner performant approach to store and update the namespaces statistics
* | | | | Merge branch 'trim-docs-pipeline' into 'master'Rémy Coutable2019-08-225-12/+14
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add docs exceptions to two pipeline jobs See merge request gitlab-org/gitlab-ce!32082
| * | | | | Add docs exceptions to two pipeline jobsMarcel Amirault2019-08-225-12/+14
|/ / / / /
* | | | | Merge branch 'docs-improve_doc_about_bridge_jobs_limitations' into 'master'Grzegorz Bizon2019-08-221-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | Improve doc about bridge job limitations See merge request gitlab-org/gitlab-ce!32058
| * | | | Improve doc about bridge job limitationsOlivier Gonzalez2019-08-221-1/+1
|/ / / /
* | | | Merge branch '66368-remove-unnecessary-check-in-mr-hook' into 'master'Jan Provaznik2019-08-221-5/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unneeded check for merge_request.project Closes #66368 See merge request gitlab-org/gitlab-ce!32086
| * | | | Remove unneeded check for merge_request.project66368-remove-unnecessary-check-in-mr-hookHeinrich Lee Yu2019-08-221-5/+3
| | | | |
* | | | | Merge branch 'latest-pipeline' into 'master'Filipa Lacerda2019-08-224-3/+8
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Updated latest pipeline tag tooltip to be more descriptive See merge request gitlab-org/gitlab-ce!31624
| * | | | | Updated latest pipeline tag tooltip to be more descriptiveDimitrie Hoekstra2019-08-224-3/+8
|/ / / / /
* | | | | Merge branch 'docs-ce-node-mdl-poc' into 'master'Achilleas Pipinellis2019-08-2238-89/+70
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Prepare the docs project for markdownlint See merge request gitlab-org/gitlab-ce!31960
| * | | | | Update docs to pass new markdownlintMarcel Amirault2019-08-2238-89/+70
|/ / / / / | | | | | | | | | | | | | | | | | | | | Deletes extra spaces and line, makes lists consistent, and fixes links.
* | | | | Merge branch ↵Kushal Pandya2019-08-226-0/+56
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'ee-2502-refactor-ee-app-assets-javascripts-approvals-components-approvers_select-vue-to-remove-approverusers' into 'master' Add a new method to `Api.js`: `projectUsers` See merge request gitlab-org/gitlab-ce!31801
| * | | | | Add new API method: projectUsersee-2502-refactor-ee-app-assets-javascripts-approvals-components-approvers_select-vue-to-remove-approverusersHimanshu Kapoor2019-08-193-0/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The new API method projectUsers gets all the users added to a particular project.
| * | | | | Add a skip_users filter to the project users APINick Thomas2019-08-193-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This functionality is available in the /autocomplete users pseudo-API. We're attempting to replace that with the canonical API, so it needs support for this parameter too.
* | | | | | Merge branch 'docs/license-compliance' into 'master'Achilleas Pipinellis2019-08-2210-39/+39
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename License Management to License Compliance Closes #63329 See merge request gitlab-org/gitlab-ce!31590
| * | | | | | Rename License Management to License ComplianceAchilleas Pipinellis2019-08-2210-39/+39
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As part of https://gitlab.com/gitlab-org/gitlab-ee/issues/8910, all occurrences of License Management are replace with License Compliance.
* | | | | | Merge branch 'po-inforef-feature-flags' into 'master'Stan Hu2019-08-221-2/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Gitaly info-ref cache feature flags See merge request gitlab-org/gitlab-ce!31890
| * | | | | | Add Gitaly info-ref cache feature flagsPaul Okstad2019-08-221-2/+4
|/ / / / / /
* | | | | | Merge branch 'disable-dast-on-master' into 'master'Rémy Coutable2019-08-223-18/+22
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure the `dast` job does not run on `master` See merge request gitlab-org/gitlab-ce!32047
| * | | | | | Ensure the dast job does not run on masterdisable-dast-on-masterRémy Coutable2019-08-213-18/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | Merge branch 'add-nonce-js-views' into 'master'Kushal Pandya2019-08-221-1/+16
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | Add CSP nonce when handling JS views See merge request gitlab-org/gitlab-ce!31839
| * | | | | | Add CSP nonce when handling JS viewsadd-nonce-js-viewsHeinrich Lee Yu2019-08-221-1/+16
|/ / / / / / | | | | | | | | | | | | | | | | | | Prevents errors when we have CSP enabled
* | | | | | Merge branch 'docs-fix-case-zm' into 'master'Achilleas Pipinellis2019-08-211-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Correct case of GitLab in section header See merge request gitlab-org/gitlab-ce!31879
| * | | | | | Correct case of GitLab in section headerdocs-fix-case-zmZeff Morgan2019-08-151-1/+1
| | | | | | |
* | | | | | | Update VERSION to 12.3.0-prev12.3.0.preGitLab Release Tools Bot2019-08-211-1/+1
| | | | | | |
* | | | | | | Update CHANGELOG.md for 12.2.0GitLab Release Tools Bot2019-08-21217-1088/+240
| | | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | | | Merge branch 'sidekiq-interrupt-running-jobs-deadset' into 'master'Stan Hu2019-08-212-2/+14
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Put cancelled job in DeadSet See merge request gitlab-org/gitlab-ce!32070