summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Update CONTRIBUTING.md43872-add-next-patch-release-as-a-priority-labelFabio Busatto2018-03-051-1/+2
|
* Update CONTRIBUTING.mdFabio Busatto2018-03-051-4/+11
|
* Merge branch '41616-api-issues-between-date' into 'master'Sean McGivern2018-03-0514-14/+219
|\ | | | | | | | | | | | | Resolve "API support for selecting only updated issues before/after a given date" Closes #41616 See merge request gitlab-org/gitlab-ce!17417
| * Adds updated_at filter to issues and merge_requests APIJacopo2018-03-0514-14/+219
| |
* | Merge branch 'priority-changes' into 'master'Victor Wu2018-03-051-0/+11
|\ \ | | | | | | | | | | | | Priority labels and severity labels See merge request gitlab-org/gitlab-ce!17362
| * | Add severity labels to contributing.mdpriority-changesVictor Wu2018-03-051-3/+14
| | |
* | | Merge branch 'jprovazn-scoped-limit' into 'master'Sean McGivern2018-03-058-63/+97
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Use limited count queries also for scoped searches Closes #43242 See merge request gitlab-org/gitlab-ce!17452
| * | | Use limited count queries also for scoped searchesJan Provaznik2018-03-058-63/+97
|/ / /
* | | Merge branch '42712_api_branches_add_search_param_20180207' into 'master'Rémy Coutable2018-03-054-2/+41
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Update API: add search param to branches Closes #42712 See merge request gitlab-org/gitlab-ce!17005
| * | | Update API: add search param to branchesbunufi2018-03-054-2/+41
| | | |
* | | | Merge branch 'an/workhorse-3.8.0' into 'master'Rémy Coutable2018-03-052-1/+6
|\ \ \ \ | |/ / / |/| | | | | | | | | | | Upgrade GitLab Workhorse to 3.8.0 for structured logging support See merge request gitlab-org/gitlab-ce!17479
| * | | Upgrade GitLab Workhorse to 3.8.0 for structured logging supportan/workhorse-3.8.0Andrew Newdigate2018-03-022-1/+6
| | | |
* | | | Merge branch 'patch-28' into 'master'Rémy Coutable2018-03-051-0/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Add a note about the "List MR pipelines" endpoint only being available from 10.5.0 See merge request gitlab-org/gitlab-ce!17375
| * | | | Add a note about the "List MR pipelines" endpoint only being available from ↵Jakub Kadlubiec2018-03-051-0/+3
|/ / / / | | | | | | | | | | | | 10.5.0
* | | | Merge branch 'sh-fix-backup-restore-cleanup' into 'master'Rémy Coutable2018-03-051-2/+19
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Clean up backup/restore temporary directory See merge request gitlab-org/gitlab-ce!17499
| * | | | Clean up backup/restore temporary directorysh-fix-backup-restore-cleanupStan Hu2018-03-021-2/+19
| | | | |
* | | | | Merge branch 'docs-darwinjs-update-ssh' into 'master'Rémy Coutable2018-03-051-4/+47
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Exposing the existence of, concepts and configuration detail of Global Shared Deployment keys. See merge request gitlab-org/gitlab-ce!17487
| * | | | | Docs: update ssh docMarcia Ramos2018-03-051-4/+47
|/ / / / /
* | | | | Merge branch '43334-reply-by-email-did-not-pick-up-unsubscribe-quick-action' ↵Rémy Coutable2018-03-059-65/+104
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 'master' Resolve "Reply-by-email did not pick up /unsubscribe quick action" Closes #43334 See merge request gitlab-org/gitlab-ce!17482
| * | | | | Fix quick actions for users who cannot update issues and MRs43334-reply-by-email-did-not-pick-up-unsubscribe-quick-actionSean McGivern2018-03-029-65/+104
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are several quick actions now that don't need this access - /todo and /unsubscribe for instance - but when these were first added, there weren't. Quick actions are now responsible for checking their own permissions.
* | | | | | Merge branch '43811-no-docker-no-put-down-the-kitchen-sink' into 'master'Rémy Coutable2018-03-051-1/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "codequality: make our dependency on jq < 182MiB" Closes #43811 See merge request gitlab-org/gitlab-ce!17492
| * | | | | | codequality: Install jq directly instead of pulling it via dockerNick Thomas2018-03-021-1/+2
| | | | | | |
* | | | | | | Merge branch 'ee-4862-verify-file-checksums' into 'master'Sean McGivern2018-03-0516-60/+378
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Foreground verification of uploads and LFS objects See merge request gitlab-org/gitlab-ce!17402
| * | | | | | | Foreground verification of uploads and LFS objectsee-4862-verify-file-checksumsNick Thomas2018-03-0216-60/+378
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'remove-projects-finder-from-todos-finder' into 'master'Sean McGivern2018-03-052-9/+11
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't use ProjectsFinder in TodosFinder Closes #43767 See merge request gitlab-org/gitlab-ce!17462
| * | | | | | | Don't use ProjectsFinder in TodosFinderremove-projects-finder-from-todos-finderYorick Peterse2018-03-022-9/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using ProjectsFinder in TodosFinder to limit todos to the right projects leads to overly complicated and slow database queries. This commit removes the use of ProjectsFinder in favour of using Project.public_or_visible_to_current_user directly. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/43767
* | | | | | | | Merge branch 'remove-ide' into 'master'Tim Zallmann2018-03-05105-8051/+0
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove IDE from CE See merge request gitlab-org/gitlab-ce!17458
| * | | | | | | | removed IDE buttonremove-idePhil Hughes2018-03-021-1/+0
| | | | | | | | |
| * | | | | | | | removed show_new_branch_formPhil Hughes2018-03-021-6/+0
| | | | | | | | |
| * | | | | | | | removed helper methodsPhil Hughes2018-03-024-29/+0
| | | | | | | | |
| * | | | | | | | Remove IDE from CEPhil Hughes2018-03-02100-8015/+0
| | | | | | | | |
* | | | | | | | | Merge branch 'fix/gb/remove-unused-pipelines-prometheus-metric' into 'master'Kamil Trzciński2018-03-051-16/+0
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unsued pipelines-related prometheus metric See merge request gitlab-org/gitlab-ce!17515
| * | | | | | | | | Remove unsued pipelines-related prometheus metricGrzegorz Bizon2018-03-051-16/+0
|/ / / / / / / / /
* | | | | | | | | Merge branch 'patch-1' into 'master'Stan Hu2018-03-031-0/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update proofreader.md See merge request gitlab-org/gitlab-ce!17503
| * | | | | | | | | Update proofreader.mdFilip Mech2018-03-031-0/+2
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'docs/spring-db-migration-error' into 'master'Yorick Peterse2018-03-032-0/+41
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Add docs for persistent `ActiveRecord::PendingMigrationError` with Spring See merge request gitlab-org/gitlab-ce!17473
| * | | | | | | | Add docs for persistent `ActiveRecord::PendingMigrationError` with Springdocs/spring-db-migration-errorEric Eastwood2018-03-012-0/+41
| | | | | | | | |
* | | | | | | | | Merge branch 'remove-mr-notes-bundle' into 'master'Fatih Acet2018-03-024-10/+8
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove mr_notes webpack bundle See merge request gitlab-org/gitlab-ce!17497
| * | | | | | | | | Remove mr_notes webpack bundleMike Greiling2018-03-024-10/+8
|/ / / / / / / / /
* | | | | | | | | Merge branch '42877-fix-visibility-change-performance' into 'master'Yorick Peterse2018-03-025-40/+74
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert Project.public_or_visible_to_user changes but apply change to SnippetsFinder Closes #42877 See merge request gitlab-org/gitlab-ce!17476
| * | | | | | | | | Extract method User#authorizations_for_projects.42877-fix-visibility-change-performanceAndreas Brandl2018-03-024-17/+40
| | | | | | | | | |
| * | | | | | | | | Use yield instead of block.call.Andreas Brandl2018-03-021-6/+6
| | | | | | | | | |
| * | | | | | | | | Apply query changes to snippets only.Andreas Brandl2018-03-022-3/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This applies the changes introduced in `Project.public_or_visible_to_user` to the snippets finder only. We know that for `SnippetsFinder`, this change improves SQL timing from 5/23/25s to 0.7/2/4s (mean/p95/p99). At the same time, the scope was too broad, (negatively) affecting SQL timings in various other places: https://gitlab.com/gitlab-com/infrastructure/issues/3772 With this commit, the snippets dashboard stays usuable as we generally don't run into statement timeouts. In contrast to the earlier change in !17088, the scope of the change is limited to `SnippetsFinder` only, thus not affecting other places.
| * | | | | | | | | Revert Project.public_or_visible_to_user changesYorick Peterse2018-03-023-38/+18
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These changes were introduced in MR https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/17088. In https://gitlab.com/gitlab-com/infrastructure/issues/3772 we discovered these changes lead to a pretty drastic increase in SQL response timings. We'll revert these changes so we can work on a better solution in the mean time without GitLab.com (or other installations) experiecing reduced performance in the mean time.
* | | | | | | | | Merge branch 'terminal-bundle-refactor' into 'master'Jacob Schatz2018-03-024-3/+4
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed terminal webpack bundle tag See merge request gitlab-org/gitlab-ce!17494
| * | | | | | | | | Removed terminal webpack bundle tagterminal-bundle-refactorConstance Okoghenun2018-03-024-3/+4
| | | | | | | | | |
* | | | | | | | | | Merge branch 'kp-add-query-param-support-search-token-endpoint' into 'master'Kushal Pandya2018-03-027-2/+68
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for query params for labels endpoint See merge request gitlab-org/gitlab-ce!17477
| * | | | | | | | | Add `isGroupDecendent` to init configKushal Pandya2018-03-023-0/+6
| | | | | | | | | |
| * | | | | | | | | Add support for query params for labels endpointKushal Pandya2018-03-024-2/+62
| |/ / / / / / / /
* | | | | | | | | Merge branch 'remove-test-bundle' into 'master'Clement Ho2018-03-024-5/+5
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Remove the "test" bundle and apply it conditionally within main.js See merge request gitlab-org/gitlab-ce!17472