summaryrefslogtreecommitdiff
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | Merge branch 'secure-disallow-read-user-scope-to-read-project-events' into ↵GitLab Release Tools Bot2019-04-294-47/+63
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | 'master' Disallow read user scope to read project events See merge request gitlab/gitlabhq!3067
| * | | Add new api class for projects eventsMałgorzata Ksionek2019-04-244-47/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor api events class to use external helper Move specs from old class Add changelog and magic string Refactor events class to be more explicit Remove blank line
* | | | Merge branch 'fix-lazy-blobs-requesting-all-previous-blobs' into 'master'Dmitriy Zaporozhets2019-04-251-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure that we only request blobs in one batch Closes #60829 See merge request gitlab-org/gitlab-ce!27625
| * | | | Ensure that we only request blobs in one batchSean McGivern2019-04-241-2/+2
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Blob.lazy adds a blob to a batch to load at a later point, using the BatchLoader library. Whenever any lazy blob's attributes are accessed, all lazy blobs requested to that point will be loaded. BatchLoader, the library we use for this, should only request items in a batch once. That is, if we have these batches: 1. a, b, c 2. d, e, f Then a, b, and c should only be requested in the first batch. But if you modify the list of items in the batch, then the second batch will request a, b, c, d, e, f, which is almost certainly not what we want! https://github.com/exAspArk/batch-loader/issues/44 is the upstream issue for this, but we can also solve this in our application by not modifying the arguments we're using inside a BatchLoader batch.
* | | | Merge branch 'get-rid-of-user-namespace-method' into 'master'Dmitriy Zaporozhets2019-04-252-4/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Get rid of the user_namespace API helper method See merge request gitlab-org/gitlab-ce!27636
| * | | | Get rid of the user_namespace API helper methodRémy Coutable2019-04-242-4/+2
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | Update list_last_commits_for_tree response path field to path_bytesJohn Cai2019-04-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updates the gitaly client to use path_bytes field instead of the deprecated path field in list_last_commits_for_tree_response. Also adds a test to guard against non-utf8 path data
* | | | | Added list_pages method to avoid loading all wiki pages contentFrancisco Javier López2019-04-253-8/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Inside a wiki, when we show the sidebar or browse to the `pages`, all page contents are retrieved from Gitaly and that is a waste of resources, since no content from that pages are going to be showed. This MR introduces the method `ProjectWiki#list_pages`, which uses new wiki_list_pages RPC call to retrieve pages without content Also in the `WikisController` we're using the method to show pages in the sidebar and also on the `pages` page.
* | | | | Merge branch 'autodevops_remote_private_helm_repository' into 'master'Stan Hu2019-04-241-1/+1
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | Adding ability to specify helm chart repo using environment variables Closes #49520 See merge request gitlab-org/gitlab-ce!27123
| * | | | Adding ability to specify helm chart repo using environment variablesStuart Moore2019-04-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Part of https://gitlab.com/gitlab-org/gitlab-ce/issues/49520 (Covers helm charts; does not cover docker repos)
* | | | | Fix bug when project export to remote url failsFrancisco Javier López2019-04-241-4/+1
| | | | |
* | | | | Merge branch '60800-properly-authorize-our-own-graphql-scalar-types' into ↵Dmitriy Zaporozhets2019-04-241-3/+3
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Properly authorize our own GraphQL scalar types Closes #60800 See merge request gitlab-org/gitlab-ce!27563
| * | | | Check for all scalar types60800-properly-authorize-our-own-graphql-scalar-typesBrett Walker2019-04-221-3/+3
| | | | |
* | | | | Merge branch '60730-service-response' into 'master'Dmitriy Zaporozhets2019-04-241-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce ServiceResponse to wrap around response Closes #60730 See merge request gitlab-org/gitlab-ce!27516
| * | | | | Introduce ServiceResponse to wrap around responseLin Jen-Shin2019-04-221-2/+2
| |/ / / / | | | | | | | | | | | | | | | See https://gitlab.com/gitlab-org/gitlab-ce/issues/60730
* | | | | Move scoped_label into label presenterJan Provaznik2019-04-231-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When rendering a label we want to check 'scoped_label' feature availability on a project/group where label is being used. For this reason a label presenter is used in UI and information about context project/group is passed to this presenter.
* | | | | Merge branch ↵Michael Kozono2019-04-232-0/+92
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'ce-11199-add-a-rake-task-to-seed-insights-data-for-a-given-project' into 'master' Provide a new gitlab:seed:issues task See merge request gitlab-org/gitlab-ce!27454
| * | | | | Provide a new gitlab:seed:issues taskce-11199-add-a-rake-task-to-seed-insights-data-for-a-given-projectRémy Coutable2019-04-232-0/+92
| |/ / / / | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | Merge branch 'support-negative-matches' into 'master'Grzegorz Bizon2019-04-234-2/+74
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Support negative matches See merge request gitlab-org/gitlab-ce!27510
| * | | | | Support negative matchesKamil Trzciński2019-04-234-2/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds support for != and !~ operators giving more flexibility in comparing values
* | | | | | Add feature flag to disable LFS checkIgor2019-04-231-0/+1
|/ / / / /
* | | | | Merge branch 'upgrade-to-rails-5-1' into 'master'Rémy Coutable2019-04-232-8/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Upgrade Rails to 5.1 See merge request gitlab-org/gitlab-ce!27480
| * | | | | Upgrade Rails to 5.1.6.1Jasper Maes2019-04-232-8/+4
| |/ / / / | | | | | | | | | | | | | | | Model.new.attributes now also returns encrypted attributes.
* | | | | Merge branch 'sh-avoid-fetching-temp-refs-within-project' into 'master'Douwe Maan2019-04-231-7/+25
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't create a temp reference for branch comparisons within project Closes #58315 See merge request gitlab-org/gitlab-ce!24038
| * | | | | Make use of local ref if it is reachablesh-avoid-fetching-temp-refs-within-projectOswaldo Ferreira2019-04-191-9/+23
| | | | | |
| * | | | | Remove source_branch_name commit checkStan Hu2019-04-181-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | This should already be done in Gitlab::Git:Compare.
| * | | | | Don't create a temp reference for branch comparisons within projectStan Hu2019-04-181-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A temp reference is only needed to fetch a branch from another project, as in the case for forked repositories. For branch comparisons within the same project, we can just use the existing branch names to do the comparison. Relates to https://gitlab.com/gitlab-org/gitlab-ce/issues/38689#note_126107862
* | | | | | Remove protected_branch_creation feature flag59572-remove-protected-branch-creation-flagPatrick Bajao2019-04-221-5/+1
| |/ / / / |/| | | |
* | | | | Merge branch 'retry-review-deploy-twice' into 'master'Lin Jen-Shin2019-04-191-0/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Retry the review-deploy job twice and make the Review App cleanup more efficient See merge request gitlab-org/gitlab-ce!27489
| * | | | | Make the Review App cleanup more efficientretry-review-deploy-twiceRémy Coutable2019-04-191-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure that the cleanup starts right away. Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | | Merge branch 'bvl-graphql-only-authorize-rendered-fields' into 'master'Lin Jen-Shin2019-04-194-44/+61
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Only check abilities on rendered GraphQL nodes Closes #58647 and #60355 See merge request gitlab-org/gitlab-ce!27273
| * | | | | | Only check abilities on rendered GraphQL nodesBob Van Landuyt2019-04-184-44/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With this we only check abilities on the rendered edges of a GraphQL connection instead of all the nodes in it.
* | | | | | | Merge branch '39858-add-group-owned-info-to-projects-api' into 'master'Douwe Maan2019-04-191-1/+9
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Return group information on Project endpoint Closes #39858 See merge request gitlab-org/gitlab-ce!27427
| * | | | | | Adds namespace information to project endpoint39858-add-group-owned-info-to-projects-apiMayra Cabrera2019-04-181-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Namespace now return avatar_url and web_url - NamespaceBasic entity was modified to include avatar_url and web_url, information is fetched differently depending if the Namespace is a user or a group Includes documentation changes Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/39858
* | | | | | | Merge branch 'protected-runner-registration' into 'master'Kamil Trzciński2019-04-191-1/+3
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | Add configuration of access_level for runners on registration via API See merge request gitlab-org/gitlab-ce!27490
| * | | | | | Add configuration of access_level for runners on registration via APIzelin-l2019-04-181-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow setting access_level of new runner to not_protected (default) or ref_protected Minor update to relevant docs and tests
* | | | | | | Merge branch 'sh-bump-ruby-required-version-check' into 'master'Michael Kozono2019-04-181-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump required Ruby version check to 2.5.3 Closes #60704 See merge request gitlab-org/gitlab-ce!27495
| * | | | | | | Bump required Ruby version check to 2.5.3Stan Hu2019-04-181-1/+1
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Relates to https://gitlab.com/gitlab-org/gitlab-ce/issues/58079 Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/60704
* | | | | | | Migrate correlation and tracing code to LabKitan-use-labkitAndrew Newdigate2019-04-1819-563/+14
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change is a fairly straightforward refactor to extract the tracing and correlation-id code from the gitlab rails codebase into the new LabKit-Ruby project. The corresponding import into LabKit-Ruby was in https://gitlab.com/gitlab-org/labkit-ruby/merge_requests/1 The code itself remains very similar for now. Extracting it allows us to reuse it in other projects, such as Gitaly-Ruby. This will give us the advantages of correlation-ids and distributed tracing in that project too.
* | | | | | Merge branch ↵Kamil Trzciński2019-04-171-1/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '60500-disable-jit-kubernetes-resource-creation-for-project-level-clusters' into 'master' Disable JIT Kubernetes resource creation for project level clusters Closes #60500 See merge request gitlab-org/gitlab-ce!27352
| * | | | | | Disable JIT resource creation for project clusters60500-disable-jit-kubernetes-resource-creation-for-project-level-clustersTiger2019-04-161-1/+3
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | JIT resource creation blocks deployments if a user is self-managing their cluster, as it will fail the build if unable to create a namespace and service account. Using a custom namespace and service account was previously supported for project level clusters, so we should preserve this functionality. https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/27352
* | | | | | Merge branch 'sh-backport-list-commits-by-oid-rugged' into 'master'Douwe Maan2019-04-172-1/+21
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bring back Rugged implementation of ListCommitsByOid See merge request gitlab-org/gitlab-ce!27441
| * | | | | | Bring back Rugged implementation of ListCommitsByOidStan Hu2019-04-172-1/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This brings back changes in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/20432. For users using Gitaly on top of NFS, accessing the Git data directly via Rugged may be faster than going through than Gitaly. This merge request introduces the feature flag `rugged_list_commits_by_oid` to activate the Rugged method. For one customer, we saw that ListCommitsByOid was the second highest used endpoint that may be causing increased load.
* | | | | | | Merge branch 'sh-add-gitaly-backtrace' into 'master'Sean McGivern2019-04-172-4/+13
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add backtrace to Gitaly performance bar Closes #60092 See merge request gitlab-org/gitlab-ce!27345
| * | | | | | | Add backtrace to Gitaly performance barStan Hu2019-04-172-4/+13
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds the backtrace to a table to show exactly where the Gitaly call was made to make it easier to understand where the call originated. This change also collapses the details in the same row to improve the usability when there is a backtrace.
* | | | | | | Merge branch '24704-restore-download-repository-path' into 'master'Rémy Coutable2019-04-172-8/+64
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Restore "download repository path" feature, now with fixes and a feature flag Closes gitlab-workhorse#218 and #24704 See merge request gitlab-org/gitlab-ce!27275
| * | | | | | | Add a feature flag for subdirectory archivesNick Thomas2019-04-161-15/+35
| | | | | | | |
| * | | | | | | JSON-encoded binary fields should use Base64::encode64Nick Thomas2019-04-161-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is not interoperable to use Base64::urlsafe_encode64 for fields in JSON that contain binary (as opposed to UTF8-safe) data. For instance, the Golang JSON decoder (which is what gitlab-workhorse uses) insists upon the standard base64 encoding.
| * | | | | | | Revert "Revert "Merge branch '24704-download-repository-path' into 'master'""Nick Thomas2019-04-162-7/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 171818df0a72097aa1a804c8213666b3f66b0966.
* | | | | | | | Merge branch 'tortuetorche/gitlab-ce-patch-auto-deploy-extra-values' into ↵Grzegorz Bizon2019-04-171-0/+3
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'master' Allow extra args for helm in Auto-DevOps See merge request gitlab-org/gitlab-ce!26838