summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add discussion APIjprovazn-apiJan Provaznik2018-03-0722-596/+1311
| | | | | * adds basic discussions API for issues and snippets * reorganizes notes specs (so same tests can be used for all noteable types - issues, MRs, snippets)
* 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
| * | | remove the "test" bundle and apply it conditionally within main.jsremove-test-bundleMike Greiling2018-03-014-5/+5
| | | |
* | | | Merge branch '41905_merge_request_and_issue_metrics' into 'master'Sean McGivern2018-03-025-17/+118
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | expose metrics in merge request api Closes #41905 See merge request gitlab-org/gitlab-ce!16589
| * | | | expose metrics in merge request apihaseeb2018-03-025-17/+118
|/ / / /
* | | | Merge branch 'two_factor_auth_webpack_bundle_tag_refactor' into 'master'Clement Ho2018-03-023-6/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Removes webpack bundle tag for two factor auth js See merge request gitlab-org/gitlab-ce!17330
| * | | | remove two_factor_auth bundletwo_factor_auth_webpack_bundle_tag_refactorMike Greiling2018-03-013-6/+1
| |/ / /
* | | | Merge branch 'refactor-protected-branches' into 'master'Jacob Schatz2018-03-024-13/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Remove protected branches webpack bundle tag See merge request gitlab-org/gitlab-ce!17374
| * | | | Remove protected branches webpack bundle tagClement Ho2018-03-024-13/+4
|/ / / /
* | | | Merge branch '33570-slack-notify-default-branch' into 'master'Sean McGivern2018-03-023-3/+32
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Slack notifications - Respect "Notify only default branch" for push events Closes #33570 See merge request gitlab-org/gitlab-ce!17345
| * | | | SlackService - respect `notify_only_default_branch` for push eventsMario de la Ossa2018-03-023-3/+32
| | | | |
* | | | | Merge branch 'docs-incoming-email-ce' into 'master'Marcia Ramos2018-03-028-361/+436
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Update incoming emails documents See merge request gitlab-org/gitlab-ce!17481
| * | | | | Update incoming emails documentsdocs-incoming-email-ceLin Jen-Shin2018-03-028-361/+436
| | | | | |
* | | | | | Merge branch ↵Sean McGivern2018-03-021-7/+7
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '43548-update-language-about-usage-ping-in-admin-settings-and-docs' into 'master' Resolve "Update language about usage ping in admin settings" Closes #43548 See merge request gitlab-org/gitlab-ce!17468
| * | | | | Clarify usage ping wording in admin areaSean McGivern2018-03-021-7/+7
| | | | | |
* | | | | | Merge branch 'feature/fetch-commit-signs-from-gitaly-in-batch' into 'master'Sean McGivern2018-03-0212-101/+193
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fetch commit signatures from Gitaly in batches Closes gitaly#1046 See merge request gitlab-org/gitlab-ce!17456
| * | | | | | Fetch commit signatures from Gitaly in batchesfeature/fetch-commit-signs-from-gitaly-in-batchAhmad Sherif2018-03-0112-101/+193
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes gitaly#1046
* | | | | | | Merge branch 'jprovazn-ancestor-labels' into 'master'Grzegorz Bizon2018-03-025-7/+70
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support additional LabelsFinder parameters for group labels See merge request gitlab-org/gitlab-ce!17447
| * | | | | | | Allow to include also descendant group labelsJan Provaznik2018-03-024-11/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because epic index page includes also epics from subgroups it's necessary to also get descendant group labels for filtering. https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/4773#note_61236542
| * | | | | | | Support additional LabelsFinder parameters for group labelsJan Provaznik2018-03-023-2/+37
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In some situations (listing labels for epics) we want to list only group ancestor labels, this is already supported in LabelsFinder we just need to enable additional parameters. Also `set_issuables_index` method now loads project labels only if @project is set (which is not used for epic group labels).
* | | | | | | Merge branch 'zj-version-string-grouping-ci' into 'master'Grzegorz Bizon2018-03-024-3/+11
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | Allow CI/CD Jobs being grouped on version strings See merge request gitlab-org/gitlab-ce!17455
| * | | | | | Update docs on grouping CI jobsZeger-Jan van de Weg2018-03-021-1/+2
| | | | | | |
| * | | | | | Allow CI/CD Jobs being grouped on version stringsZeger-Jan van de Weg2018-03-013-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes grouping on version number available. In general I'd like to group based on MAJOR.MINOR version numbers for Gitaly.
* | | | | | | Merge branch 'an/log-documentation' into 'master'Stan Hu2018-03-021-1/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update documentation WRT to request parameters See merge request gitlab-org/gitlab-ce!17469
| * | | | | | | Update documentation WRT to request parametersan/log-documentationAndrew Newdigate2018-03-011-1/+2
| | | | | | | |
* | | | | | | | Merge branch '32831-single-deploy-of-runner-in-k8s-cluster' into 'master'Kamil Trzciński2018-03-0135-411/+758
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extend Cluster Applications to install GitLab Runner to Kubernetes cluster Closes #32831 See merge request gitlab-org/gitlab-ce!17134
| * | | | | | | | Extend Cluster Applications to install GitLab Runner to Kubernetes clusterMayra Cabrera2018-03-0135-411/+758
|/ / / / / / / /
* | | | | | | | Merge branch 'webpack-registry' into 'master'Jacob Schatz2018-03-014-4/+5
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove registry list webpack entry point See merge request gitlab-org/gitlab-ce!17459
| * | | | | | | | Remove registry list webpack entry pointClement Ho2018-03-014-4/+5
|/ / / / / / / /
* | | | | | | | Merge branch 'sh-remove-trailing-lines' into 'master'Jacob Schatz2018-03-012-2/+0
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove trailing newline that was causing an EE conflict See merge request gitlab-org/gitlab-ce!17465
| * | | | | | | | Remove trailing newline that was causing an EE conflictStan Hu2018-03-012-2/+0
|/ / / / / / / /
* | | | | | | | Merge branch 'bvl-add-missing-externalized-strings' into 'master'Douwe Maan2018-03-011-26/+148
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | Add some strings that were missing in gitlab.pot See merge request gitlab-org/gitlab-ce!17467
| * | | | | | | Add some strings that were missing in gitlab.potbvl-add-missing-externalized-stringsBob Van Landuyt2018-03-011-26/+148
| | | | | | | |
* | | | | | | | Merge branch 'winh-fix-vuex-docs' into 'master'Filipa Lacerda2018-03-011-4/+4
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | Small fixes in Vuex docs See merge request gitlab-org/gitlab-ce!17471
View Lorry Controller Status