summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Apply suggestion to app/assets/javascripts/project_find_file.js61078-empty-state-file-finderJarek Ostrowski2019-09-111-5/+1
|
* Add empty state if theres no matching filesJarek Ostrowski2019-09-114-1/+26
| | | | | | | | | | Add changelog Add to DOM, add and remove if results Remove unneeded var and log Remove unneeded id Move return Fix if statement, change string in haml Add string to gitlab pot
* Merge branch ↵Clement Ho2019-09-092-0/+164
|\ | | | | | | | | | | | | '9102-hide-dismissed-vulnerabilities-in-the-group-security-dashboard-backport' into 'master' Add toggle to show/hide dismissed vulnerabilities (ports ee!15333) See merge request gitlab-org/gitlab-ce!32413
| * Backport "Add toggle to hide dismissed vulnerabilities"9102-hide-dismissed-vulnerabilities-in-the-group-security-dashboard-backportPaul Gascou-Vaillancourt2019-09-042-0/+164
| | | | | | | | Backport of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/15333
* | Merge branch 'kamil-improve-import-export' into 'master'Stan Hu2019-09-0910-19/+547
|\ \ | | | | | | | | | | | | Improve performance and (memory usage (a little)) of project export See merge request gitlab-org/gitlab-ce!32423
| * | Improve performance and memory usage of project exportKamil Trzciński2019-09-0910-19/+547
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ActiveModel::Serialization is simple in that it recursively calls `as_json` on each object to serialize everything. However, for a model like a Project, this can generate a query for every single association, which can add up to tens of thousands of queries and lead to memory bloat. To improve this, we can do several things: 1. We use `tree:` and `preload:` to automatically generate a list of all preloads that could be used to serialize objects in bulk. 2. We observe that a single project has many issues, merge requests, etc. Instead of serializing everything at once, which could lead to database timeouts and high memory usage, we take each top-level association and serialize the data in batches. For example, we serialize the first 100 issues and preload all of their associated events, notes, etc. before moving onto the next batch. When we're done, we serialize merge requests in the same way. We repeat this pattern for the remaining associations specified in import_export.yml.
* | Merge branch '67209-fix-docs-lint-docs' into 'master'Marcia Ramos2019-09-091-2/+2
|\ \ | | | | | | | | | | | | | | | | | | Resolve "Job Failed #290891184 - docs lint broken in `master`" Closes #67209 See merge request gitlab-org/gitlab-ce!32825
| * | Fix trailing spaces in 'doc/update/mysql_to_postgresql.md'Rémy Coutable2019-09-091-2/+2
| | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | Merge branch 'docs-import-note-clarify' into 'master'Achilleas Pipinellis2019-09-091-12/+17
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Docs: Clarified note for preferred integration method Closes #28683 See merge request gitlab-org/gitlab-ce!32770
| * | Docs: Clarified note for preferred integration methodMatt Penna2019-09-091-12/+17
|/ /
* | Merge branch 'docs/refactor-intro-text-gitlab-apps' into 'master'Marcia Ramos2019-09-091-23/+19
|\ \ | | | | | | | | | | | | Align introduced text to standard See merge request gitlab-org/gitlab-ce!32804
| * | Align introduced text to standardEvan Read2019-09-091-23/+19
|/ /
* | Merge branch 'docs/edit-db-load-balance' into 'master'Marcia Ramos2019-09-091-3/+3
|\ \ | | | | | | | | | | | | | | | | | | Fix capitalization of GitLab Closes #67023 See merge request gitlab-org/gitlab-ce!32800
| * | Fix capitalization of GitLabEvan Read2019-09-091-3/+3
|/ /
* | Merge branch ↵Marcia Ramos2019-09-091-1/+9
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | '43903-doc-update-to-mysql_to_postgresql-md-adding-timeout-parameters-2' into 'master' docs update to mysql_to_postgresql.md adding timeout parameters Closes #43903 See merge request gitlab-org/gitlab-ce!31462
| * | docs update to mysql_to_postgresql.md adding timeout parametersAlexander Strachan2019-09-091-1/+9
|/ /
* | Merge branch 'fj-11777-lower-search-count-limits' into 'master'Stan Hu2019-09-096-13/+28
|\ \ | | | | | | | | | | | | | | | | | | Improve performance of search by lowering counters Closes gitlab-ee#11777 See merge request gitlab-org/gitlab-ce!32211
| * | Lower searches count limitFrancisco Javier López2019-09-096-13/+28
|/ / | | | | | | | | Lowering the limit when performing search from 1001 to 101. This will allow us to speed this process.
* | Merge branch '61927-skeleton-pages-internal-api' into 'master'Kamil Trzciński2019-09-098-1/+132
|\ \ | | | | | | | | | | | | Add skeleton Pages internal API See merge request gitlab-org/gitlab-ce!32732
| * | Add skeleton Pages internal API61927-skeleton-pages-internal-apiKrasimir Angelov2019-09-068-1/+132
| | | | | | | | | | | | | | | | | | | | | Basic `/internal/pages` endpoint that will be used for Pages virtual domains internal API. The endpoint is currently behind feature flag and provides authetication similar to how Workhorse is authenticating with the GitLab.
* | | Merge branch 'patch-73' into 'master'Achilleas Pipinellis2019-09-091-1/+1
|\ \ \ | | | | | | | | | | | | | | | | Update repository_mirroring.md See merge request gitlab-org/gitlab-ce!32797
| * | | Update repository_mirroring.md as per ↵Ben Radcliffe2019-09-081-1/+1
| | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ee/issues/10361#note_198445760
* | | | Merge branch 'job-rules-e2e' into 'master'Kamil Trzciński2019-09-0910-30/+382
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Passing job:rules downstream and E2E specs for job:rules configuration See merge request gitlab-org/gitlab-ce!32609
| * | | | Passing job:rules downstream and E2E specs for job:rules configurationdrew2019-09-0910-30/+382
|/ / / /
* | | | Merge branch 'events-delete-all' into 'master'Lin Jen-Shin2019-09-096-6/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Use delete_all for deleting events See merge request gitlab-org/gitlab-ce!32751
| * | | | Use delete_all for deleting eventsevents-delete-allJan Provaznik2019-09-076-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because we don't have any destroy callbacks (or other logic triggered on event destroy), there is no reason for deleting events inefficiently one by one, instead we can use :delete_all.
* | | | | Merge branch 'patch-76' into 'master'Achilleas Pipinellis2019-09-091-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Correct typo in documentation See merge request gitlab-org/gitlab-ce!32791
| * | | | | Correct typo in documentationPaulo Ribeiro2019-09-091-1/+1
|/ / / / /
* | | | | Merge branch 'make-epics-position-migration-robust' into 'master'Andreas Brandl2019-09-091-3/+18
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make epic_issues relative_position migration more robust Closes #66923 See merge request gitlab-org/gitlab-ce!32646
| * | | | | Make epic_issues relative_position migration more robustmake-epics-position-migration-robustSean McGivern2019-09-041-3/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If someone installed EE, then downgraded to CE before this column was added, upgrading to the latest version of CE will fail: 1. We have a backport migration for the entire EE schema but the table `epic_issues` exists, just not the `relative_position` column. 2. The migration that changes the default (quite reasonably) didn't check if the column exists. If the column doesn't exist, we can just create it with the correct default.
* | | | | | Merge branch 'plafoucriere-master-patch-99848' into 'master'Achilleas Pipinellis2019-09-091-1/+11
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add complete list of personas in feature issue template See merge request gitlab-org/gitlab-ce!32778
| * | | | | | Add complete list of personas in feature issue templatePhilippe Lafoucrière2019-09-091-1/+11
|/ / / / / /
* | | | | | Merge branch 'fix-doc-interruptible-env-default' into 'master'Ash McKenzie2019-09-091-1/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes interruptible property documentation See merge request gitlab-org/gitlab-ce!32758
| * | | | | | Fixes documentation about default value of interruptible propertyCédric Tabin2019-09-091-1/+1
| | | | | | |
| * | | | | | Adds the introduced header of the interruptible propertyCédric Tabin2019-09-061-0/+2
| | | | | | |
* | | | | | | Merge branch '46686-bump-kubeclient-version-qa' into 'master'Nick Thomas2019-09-093-3/+8
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump Kubeclient to 4.4.0 See merge request gitlab-org/gitlab-ce!32811
| * | | | | | | Bump Kubeclient to 4.4.046686-bump-kubeclient-version-qaTiger2019-09-093-3/+8
| | | | | | | |
* | | | | | | | Merge branch '67188-ce-and-ee-pipelines-not-created-on-dev' into 'master'Lin Jen-Shin2019-09-091-1/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make the 'package-and-qa-manual:master' job only run on .com Closes #67188 See merge request gitlab-org/gitlab-ce!32812
| * | | | | | | Make the 'package-and-qa-manual:master' job only run on .comRémy Coutable2019-09-091-1/+2
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | | Merge branch 'patch-76' into 'master'Ray Paik2019-09-091-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix typo in backup_restore.md See merge request gitlab-org/gitlab-ce!32767
| * | | | | | | fix typo in backup_restore.mdDan Hahne2019-09-061-1/+1
| | | | | | | |
* | | | | | | | Merge branch 'dind-example-doc' into 'master'Evan Read2019-09-091-0/+7
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add DinD example note for k8s executors See merge request gitlab-org/gitlab-ce!32160
| * | | | | | | | Add DinD example note for k8s executorsKyle Russell2019-09-091-0/+7
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using the DinD example that stores the built image in the container registry may not be visible to the Kubernetes executor if the default image pull policy defaults to IfNotPresent.
* | | | | | | | Merge branch 'docs/sast-ds-docker-version' into 'master'Evan Read2019-09-092-18/+20
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Document workaround for SAST failures See merge request gitlab-org/gitlab-ce!32665
| * | | | | | | | Document workaround for SAST failuresAchilleas Pipinellis2019-09-092-18/+20
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There's an error that occurs when the Docker version used to run the SAST job is 19.03.00, and the job will fail. Advise the users what to do in case they bump into this.
* | | | | | | | Merge branch 'docs-realign-danger-doc' into 'master'Evan Read2019-09-091-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bring typo fix from EE into CE See merge request gitlab-org/gitlab-ce!32808
| * | | | | | | | Bring typo fix from EE into CEMarcel Amirault2019-09-091-1/+1
|/ / / / / / / /
* | | | | | | | Merge branch 'reduce-parse-options-complexity' into 'master'Ash McKenzie2019-09-091-8/+12
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor parse_options() in push_options.rb Closes #67091 See merge request gitlab-org/gitlab-ce!32756
| * | | | | | | | Refactor parse_options() in push_options.rbreduce-parse-options-complexityChristian Couder2019-09-071-8/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This improves code quality by reducing Cognitive Complexity. This fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/67091
* | | | | | | | | Merge branch ↵Ash McKenzie2019-09-0928-39/+732
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '51123-error-500-viewing-admin-page-due-to-statement-timeout-on-counting-total-notes-again' into 'master' Resolve "Add Widget for statistics in Admin/Dashboard page" See merge request gitlab-org/gitlab-ce!32449
View Lorry Controller Status