summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add missing window.gapi mockadd-missing-gapi-mockIllya Klymov2019-09-101-0/+2
|
* Merge branch 'sh-sidekiq-logging-json' into 'master'Mayra Cabrera2019-09-091-1/+1
|\ | | | | | | | | Enable JSON logs for Sidekiq by default See merge request gitlab-org/gitlab-ce!32842
| * Enable JSON logs for Sidekiq by defaultStan Hu2019-09-091-1/+1
| | | | | | | | | | JSON logs include arguments by default, and they're easier to parse/filter.
* | Merge branch 'qa/e2e-tests-for-issue-weights' into 'master'Walmyr Lima e Silva Filho2019-09-094-2/+10
|\ \ | | | | | | | | | | | | Backport of end-to-end test for visualizing issue weight on different pages See merge request gitlab-org/gitlab-ce!32766
| * | Update issue resource to allow for adding weightqa/e2e-tests-for-issue-weightsWalmyr Lima2019-09-061-1/+2
| | |
| * | Prepend ee page object on its counterpartWalmyr Lima2019-09-061-0/+2
| | |
| * | Update page object with new element and methodWalmyr Lima2019-09-061-0/+5
| | |
| * | Update view for testabilityWalmyr Lima2019-09-061-1/+1
| | |
* | | Merge branch 'jivanvl-add-caret-icon-dashboard' into 'master'Clement Ho2019-09-094-3/+90
|\ \ \ | |_|/ |/| | | | | | | | Add caret icons to the monitoring dashboard See merge request gitlab-org/gitlab-ce!32239
| * | Add caret icons to the monitoring dashboardjivanvl-add-caret-icon-dashboardJose Vargas2019-09-094-3/+90
| | | | | | | | | | | | | | | The carets will function as a button that will allow the panels from the monitoring dashboard to collapse and show panels
* | | Merge branch '13095-missing-borders-between-settings-items' into 'master'Paul Slaughter2019-09-091-3/+7
|\ \ \ | | | | | | | | | | | | | | | | [CE] Resolve "Missing borders between settings items" See merge request gitlab-org/gitlab-ce!32828
| * | | CE - Resolve "Missing borders between settings items"Marcel van Remmerden2019-09-091-3/+7
| | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/14877
* | | | Merge branch 'api_settings' into 'master'Douglas Barbosa Alexandre2019-09-096-6/+54
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve application settings API Closes #58180 See merge request gitlab-org/gitlab-ce!31149
| * | | | Changelog for "Improve application settings API" !31149Mathieu Parent2019-09-091-0/+5
| | | | |
| * | | | Settings API: domain_{black,white}list should be arraysMathieu Parent2019-09-095-7/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As in documentation. Fixes: #58180. Also remove the requirement between domain_blacklist_enabled and domain_blacklist.
| * | | | Show domain_blacklist and domain_whitelist in the settings APIMathieu Parent2019-09-092-2/+6
| | | | |
| * | | | App settings: Allow all import sources from APIMathieu Parent2019-09-091-1/+1
| | | | |
* | | | | Merge branch 'add-cloud-provider-selector-buttons' into 'master'Douglas Barbosa Alexandre2019-09-0913-34/+158
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add cloud provider selector buttons See merge request gitlab-org/gitlab-ce!32302
| * | | | | Create new feature flagged UI for cloud providersEnrique Alcántara2019-09-0913-34/+158
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Create HAML UI select a cloud provider to create a cluster. - Add query param to :new cluster view to display a specific cluster provider form depending on the value of the provider query param. - Update unit tests and e2e tests to reflect these changes
* | | | | Merge branch 'pl-project-service-json' into 'master'Douglas Barbosa Alexandre2019-09-094-46/+123
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Expose update project service JSON endpoint See merge request gitlab-org/gitlab-ce!32759
| * | | | | Expose update project service JSON endpointPeter Leitzen2019-09-094-46/+123
|/ / / / / | | | | | | | | | | | | | | | | | | | | Utilize `json_fields` to expose fields via `Service#as_json(only: json_fields)`.
* | | | | Merge branch 'gitaly-version-v1.62.0' into 'master'Michael Kozono2019-09-092-1/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Upgrade Gitaly to v1.62.0 See merge request gitlab-org/gitlab-ce!32608
| * | | | | Upgrade Gitaly to v1.62.0GitalyBot2019-09-092-1/+6
|/ / / / /
* | | | | Merge branch '60724-watch-button' into 'master'Clement Ho2019-09-093-3/+8
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | Give notification buttons btn-xs class Closes #60724 See merge request gitlab-org/gitlab-ce!32827
| * | | | Give notification buttons btn-xs class60724-watch-buttonJarek Ostrowski2019-09-093-3/+8
| | | | | | | | | | | | | | | | | | | | Add changelog
* | | | | 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
View Lorry Controller Status