summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add method to authorize reading from prometheus proxy63044-move-cluster-metricsRyan Cobb2019-08-261-0/+4
|
* Fix processor specRyan Cobb2019-08-231-1/+1
|
* Fix cluster dashboard specsRyan Cobb2019-08-235-9/+4
|
* Remove dashboard service authRyan Cobb2019-08-221-1/+1
|
* Reconcile ee changesRyan Cobb2019-08-229-20/+41
| | | | This reconciles some ee changes related to cluster metrics.
* Merge branch 'patch-73' into 'master'Stan Hu2019-08-221-1/+1
|\ | | | | | | | | Fix typo in Content Security Policy example See merge request gitlab-org/gitlab-ce!32103
| * Fix typo in Content Security Policy exampleJ0WI2019-08-221-1/+1
| |
* | Merge branch 'docs-admin-area-core-only' into 'master'66138-refactor-groupdata-in-embed-componentAchilleas Pipinellis2019-08-2212-12/+12
|\ \ | | | | | | | | | | | | Add core badges to admin_area docs See merge request gitlab-org/gitlab-ce!31746
| * | Add core badges to admin_area docsMarcel Amirault2019-08-2212-12/+12
|/ / | | | | | | Some admin_area docs were missing the Core Only badge
* | Merge branch 'docs-gitaly-cli-connect-failed' into 'master'Achilleas Pipinellis2019-08-221-0/+30
|\ \ | | | | | | | | | | | | Document Gitaly CLI connection troubleshooting See merge request gitlab-org/gitlab-ce!32079
| * | Document Gitaly CLI connection troubleshootingChristiaan Conover2019-08-221-0/+30
|/ / | | | | | | | | Provide documentation around possible reasons and solutions to CLI tools not being able to connect to Gitaly nodes.
* | Merge branch 'ce-8631-archiving-a-project-should-create-an-audit-event' into ↵Lin Jen-Shin2019-08-223-4/+99
|\ \ | | | | | | | | | | | | | | | | | | 'master' CE: Archiving a project should create an audit event See merge request gitlab-org/gitlab-ce!32039
| * | CE: Audit event for archiving and unarchiving projectsce-8631-archiving-a-project-should-create-an-audit-eventmanojmj2019-08-213-4/+99
| | |
* | | Merge branch 'improve-dnager-message-when-changelog-is-needed' into 'master'Rémy Coutable2019-08-221-7/+6
|\ \ \ | | | | | | | | | | | | | | | | Make it clear that it's ok to ignore Danger's 'no changelog' warning See merge request gitlab-org/gitlab-ce!32088
| * | | Make it clear that it's ok to ignore Danger's 'no changelog' warningimprove-dnager-message-when-changelog-is-neededRémy Coutable2019-08-221-7/+6
| | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | Merge branch 'ce-6878-add-epic-select-dropdown' into 'master'Nick Thomas2019-08-224-0/+109
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Add `searchBy` helper & `SidebarItemEpicsSelect` placeholder component See merge request gitlab-org/gitlab-ce!31859
| * | | | Add `searchBy` helper & `SidebarItemEpicsSelect`ce-6878-add-epic-select-dropdownKushal Pandya2019-08-224-0/+109
| | | | | | | | | | | | | | | | | | | | | | | | | - Adds `searchBy` util in common utils - Adds placeholder `SidebarItemEpicsSelect`
* | | | | Merge branch ↵Jan Provaznik2019-08-221-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'ce-12873-support-restricting-group-access-by-multiple-ip-subnets' into 'master' CE Port: Support restricting group access by multiple IP subnets See merge request gitlab-org/gitlab-ce!31959
| * | | | | CE: Support restricting group access by multiple IP subnetsce-12873-support-restricting-group-access-by-multiple-ip-subnetsmanojmj2019-08-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change adds support for adding multiple IP subnets for restricting access to groups
* | | | | | 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