summaryrefslogtreecommitdiff
path: root/spec/lib
Commit message (Collapse)AuthorAgeFilesLines
* Fix .batch_lfs_pointers accepting a lazy enumeratorfix/batch-lfs-pointers-accepting-lazy-enumAhmad Sherif2018-01-251-0/+15
|
* Merge branch ↵Rémy Coutable2018-01-251-0/+23
|\ | | | | | | | | | | | | | | | | '42161-gitaly-commitservice-encoding-undefinedconversionerror-u-c124-from-utf-8-to-ascii-8bit' into 'master' Resolve "Gitaly::CommitService: Encoding::UndefinedConversionError: U+C124 from UTF-8 to ASCII-8BIT" Closes #42161 See merge request gitlab-org/gitlab-ce!16637
| * Make sure we're passing ASCII-8BIT to Gitaly42161-gitaly-commitservice-encoding-undefinedconversionerror-u-c124-from-utf-8-to-ascii-8bitLin Jen-Shin2018-01-231-0/+23
| | | | | | | | when counting commit count.
* | Add a gRPC health check to ensure Gitaly is upsh-add-gitaly-health-checkStan Hu2018-01-243-0/+123
| | | | | | | | | | | | This will enable Geo to skip shards that not operational. Relates to gitlab-org/gitlab-ee#4329
* | Merge branch 'search-100' into 'master'Yorick Peterse2018-01-241-0/+58
|\ \ | | | | | | | | | | | | Use limit for search count queries See merge request gitlab-org/gitlab-ce!16502
| * | Use limit for search count queriessearch-100Jan Provaznik2018-01-231-0/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Search query is especially slow if a user searches a generic string which matches many records, in such case search can take tens of seconds or time out. To speed up the search query, we search only for first 1000 records, if there is >1000 matching records we just display "1000+" instead of precise total count supposing that with such amount the exact count is not so important for the user. Because for issues even limited search was not fast enough, 2-phase approach is used for issues: first we use simpler/faster query to get all public issues, if this exceeds the limit, we just return the limit. If the amount of matching results is lower than limit, we re-run more complex search query (which includes also confidential issues). Re-running the complex query should be fast enough in such case because the amount of matching issues is lower than limit. Because exact total_count is now limited, this patch also switches to to "prev/next" pagination. Related #40540
* | | Merge branch '40744-idempotent-ids' into 'master'Robert Speicher2018-01-246-7/+7
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Use the DatabaseCleaner 'deletion' strategy instead of 'truncation' Closes #30783 See merge request gitlab-org/gitlab-ce!16516
| * | | Use the DatabaseCleaner 'deletion' strategy instead of 'truncation'Nick Thomas2018-01-246-7/+7
| | | |
* | | | Migrate .batch_lfs_pointers to Gitalyfeature/migrate-get-lfs-ptrs-to-gitalyAhmad Sherif2018-01-241-15/+28
|/ / / | | | | | | | | | Closes gitaly#921
* | | Migrate repository bundling to Gitalyfeature/migrate-bundle-to-disk-to-gitalyAhmad Sherif2018-01-241-0/+28
|/ / | | | | | | Closes gitaly#929
* | Fix a migration spec messing up the MergeRequestDiff DB schema42340-ci-failing-on-mergerequestdiff-commits_countRémy Coutable2018-01-231-0/+4
| | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | Merge branch 'gitaly-update-remote-mirror' into 'master'Rémy Coutable2018-01-231-0/+14
|\ \ | | | | | | | | | | | | | | | | | | Incorporate Gitaly's RemoteService.UpdateRemoteMirror RPC Closes gitaly#936 See merge request gitlab-org/gitlab-ce!16536
| * | Incorporate Gitaly's RemoteService.UpdateRemoteMirror RPCgitaly-update-remote-mirrorAlejandro Rodríguez2018-01-221-0/+14
| | |
* | | Merge branch 'gitaly-user-commit-files' into 'master'Douwe Maan2018-01-231-0/+3
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | Incorporate Gitaly's OperationService.UserCommitFiles RPC Closes gitaly#890 See merge request gitlab-org/gitlab-ce!16307
| * | Ensure hooks are deleted regardless of the project forking methodAlejandro Rodríguez2018-01-191-0/+3
| | |
* | | Merge branch 'add-profiler-to-application' into 'master'Stan Hu2018-01-221-0/+156
|\ \ \ | | | | | | | | | | | | | | | | Add Gitlab::Profiler for profiling from a console or runner See merge request gitlab-org/gitlab-ce!16552
| * | | Add Gitlab::Profiler for profiling from a console or runnerSean McGivern2018-01-191-0/+156
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Gitlab::Profiler.profile takes a URL to profile, and returns the ruby-prof profile result. This is currently only for interactive use (in a console) or from the script runner. Note that when using this interactively, changes to the application within that console session will be used, so this can be used to test proposed performance changes.
* | | | Fix Error 500 when repository has no avatarsh-fix-error-500-no-avatarsStan Hu2018-01-201-0/+12
| |_|/ |/| | | | | | | | Closes #42249
* | | Merge branch '42159-utf8-uploads' into 'master'Douwe Maan2018-01-191-8/+9
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | Correctly escape UTF-8 path elements for uploads Closes #42159 See merge request gitlab-org/gitlab-ce!16560
| * | Correctly escape UTF-8 path elements for uploadsNick Thomas2018-01-181-8/+9
| | |
* | | Merge branch 'background-migration-fix' into 'master'Douwe Maan2018-01-181-1/+1
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Reduce UPDATEs for background column type changes Closes #42158 See merge request gitlab-org/gitlab-ce!16551
| * | Reduce UPDATEs for background column type changesbackground-migration-fixYorick Peterse2018-01-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prior to this commit we would essentially update all rows in a table, even those where the source column (e.g. `issues.closed_at`) was NULL. This in turn could lead to statement timeouts when using the default batch size of 10 000 rows per job. To work around this we don't schedule jobs for rows where the source value is NULL. We also don't update rows where the source column is NULL (as an extra precaution) or the target column already has a non-NULL value. Using this approach it should be possible to update 10 000 rows in the "issues" table in about 7.5 - 8 seconds. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/42158
* | | Merge branch 'gitaly-commit-signature' into 'master'Sean McGivern2018-01-183-14/+92
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Retrieve commit signatures with Gitaly Closes gitaly#923 See merge request gitlab-org/gitlab-ce!16467
| * | | Retrieve commit signatures with GitalyJacob Vosmaer (GitLab)2018-01-183-14/+92
| |/ /
* | | Remove Rugged::Walker from Repository#logJacob Vosmaer (GitLab)2018-01-181-38/+0
|/ /
* | Merge branch 'sh-backport-10-3-4-security-fixes' into 'master'Oswaldo Ferreira2018-01-176-29/+181
|\ \ | |/ |/| | | | | Backport 10.3.4 security fixes into master See merge request gitlab-org/gitlab-ce!16509
| * Make ruby lint happysh-backport-10-3-4-security-fixesOswaldo Ferreira2018-01-171-2/+2
| |
| * Merge branch 'fix/import-rce-10-3' into 'security-10-3'James Lopez2018-01-161-13/+44
| | | | | | | | | | | | | | | | | | | | [10.3] Fix RCE via project import mechanism See merge request gitlab/gitlabhq!2294 (cherry picked from commit dcfec507d6f9ee119d65a832393e7c593af1d3b2) 86d75812 Fix RCE via project import mechanism
| * Merge branch ↵Robert Speicher2018-01-161-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | '41293-fix-command-injection-vulnerability-on-system_hook_push-queue-through-web-hook' into 'security-10-3' Don't allow line breaks on HTTP headers See merge request gitlab/gitlabhq!2277 (cherry picked from commit 7fc0a6fc096768a5604d6dd24d7d952e53300c82) 073b8f9c Don't allow line breaks on HTTP headers
| * Merge branch 'sh-migrate-can-push-to-deploy-keys-projects-10-3' into ↵Douwe Maan2018-01-162-12/+8
| | | | | | | | | | | | | | | | | | | | | | | | 'security-10-3' [10.3] Migrate `can_push` column from `keys` to `deploy_keys_project` See merge request gitlab/gitlabhq!2276 (cherry picked from commit f6ca52d31bac350a23938e0aebf717c767b4710c) 1f2bd3c0 Backport to 10.3
| * Merge branch 'ac/fix-path-traversal' into 'security-10-3'Robert Speicher2018-01-161-0/+62
| | | | | | | | | | | | | | | | | | | | [10.3] Fix path traversal in gitlab-ci.yml cache:key See merge request gitlab/gitlabhq!2270 (cherry picked from commit c32d0c6807dfd41d7838a35742e6d0986871b389) df29094a Fix path traversal in gitlab-ci.yml cache:key
| * Merge branch 'ac/41346-xss-ci-job-output' into 'security-10-3'Robert Speicher2018-01-161-4/+51
| | | | | | | | | | | | | | | | | | | | [10.3] Fix XSS vulnerability in Pipeline job trace See merge request gitlab/gitlabhq!2258 (cherry picked from commit 44caa80ed9a2514a74a5eeab10ff51849d64851b) 5f86f3ff Fix XSS vulnerability in Pipeline job trace
* | Remove unused methods from Gitlab::GitJacob Vosmaer (GitLab)2018-01-171-8/+0
| |
* | Merge branch 'fix/gb/improve-manual-action-tooltips' into 'master'Grzegorz Bizon2018-01-171-4/+4
|\ \ | |/ |/| | | | | | | | | Fix running manual action tooltip Closes #41418 See merge request gitlab-org/gitlab-ce!16489
| * Fix running manual action tooltipGrzegorz Bizon2018-01-161-4/+4
| |
* | Merge branch 'jej/lfs-rev-list-handles-non-utf-paths-41627' into 'master'Stan Hu2018-01-161-1/+10
|\ \ | | | | | | | | | | | | | | | | | | Prevent RevList failing on non utf8 paths Closes #41627 See merge request gitlab-org/gitlab-ce!16440
| * | Prevent RevList failing on non utf8 pathsjej/lfs-rev-list-handles-non-utf-paths-41627James Edwards-Jones2018-01-161-1/+10
| | |
* | | Merge branch '42031-fix-links-to-uploads-in-wikis' into 'master'Douwe Maan2018-01-161-0/+8
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Wiki uploaded files are missing" Closes #42031 See merge request gitlab-org/gitlab-ce!16499
| * | | Fix links to uploaded files on wiki pagesNick Thomas2018-01-161-0/+8
| | | |
* | | | Merge branch 'print-list-of-available-backups' into 'master'Douwe Maan2018-01-161-0/+6
|\ \ \ \ | |/ / / |/| | | | | | | | | | | List backups avilable for restore See merge request gitlab-org/gitlab-ce!16465
| * | | Check for both backup filesprint-list-of-available-backupsBalasankar "Balu" C2018-01-161-1/+1
| | | |
| * | | Imitate other specsBalasankar "Balu" C2018-01-161-1/+1
| | | |
| * | | Try one expectation onlyBalasankar "Balu" C2018-01-161-2/+0
| | | |
| * | | Run the code to be testedBalasankar "Balu" C2018-01-151-0/+1
| | | |
| * | | List available backups for restoreBalasankar "Balu" C2018-01-151-0/+7
| | | |
* | | | Merge branch '41666-cannot-search-with-keyword-merge' into 'master'Rémy Coutable2018-01-161-12/+27
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve "Cannot search with keyword "merge"" Closes #41666 See merge request gitlab-org/gitlab-ce!16462
| * | | | Fix project search results for digits surrounded by colonsSean McGivern2018-01-161-12/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A file containing /:\d+:/ in its contents would break the search results if those contents were part of the results, because we were splitting on colons, which can't work with untrusted input. Changing to use the null byte as a separator is much safer.
* | | | | Prevent background migration spec from polluting later modelsSean McGivern2018-01-161-0/+4
| |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the schema changes after 20171114162227 for any of these models, and specs after this one use factories, then those factories will use the models with outdated column information cached. We shouldn't really use factories in migration specs, but this is a special case because there is a lot of git-related setup code in the model that would be painful to copy to the migration. Instead, we just manually reset the column information for the models we could pollute.
* | | | Merge branch '1819-override-ce' into 'master'Rémy Coutable2018-01-151-0/+158
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | CE: Override module to specify that we're overriding See merge request gitlab-org/gitlab-ce!16131
| * \ \ \ Merge remote-tracking branch 'upstream/master' into 1819-override-ceLin Jen-Shin2018-01-1243-710/+1978
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (621 commits) Add a note about GitLab QA page objects validator to docs Refactor dispatcher projects blame and blob path Update export message to mention we can download the file from the UI Fix Ctrl+Enter keyboard shortcut saving comment/note edit fix case where tooltip messes up :last-child selector Add reason to keep postgresql 9.2 for CI Remove warning noise in ProjectImportOptions Add changelog entry Add RedirectRoute factory Update Ingress extra cost note to be more generic Fix Rubocop offense Refactor dispatcher project branches path Revert "Revert "Fix Route validation for unchanged path"" Document that we need rsync for backing up Docs: move article "Laravel and Envoy w/ CI/CD" Recommend against the use of EFS Adds Rubocop rule for line break around conditionals Update CHANGELOG.md for 10.1.6 Filter out build traces from logged parameters Refactored project:n* imports in dispatcher.js ...
View Lorry Controller Status