summaryrefslogtreecommitdiff
path: root/spec
Commit message (Collapse)AuthorAgeFilesLines
* Revert "Merge branch 'remove-rugged-walk' into 'master'"revert-430b3f0eJacob Vosmaer (GitLab)2018-01-251-0/+38
| | | This reverts merge request !16525
* Resolve "Link to Clusters in Auto DevOps instead of Kubernetes service"Fabio Busatto2018-01-251-4/+4
|
* 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.
* | Merge branch 'fl-mr-widget-refactor' into 'master'Phil Hughes2018-01-253-153/+127
|\ \ | | | | | | | | | | | | Moves more mr widget components into vue files See merge request gitlab-org/gitlab-ce!16677
| * | Moves more mr widget components into vue filesfl-mr-widget-refactorFilipa Lacerda2018-01-243-153/+127
| | | | | | | | | | | | | | | Adds i18n Adds better test coverage
* | | 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 'fix/add-formatted-data-to-wiki-page' into 'master'Robert Speicher2018-01-241-0/+11
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add formatted_data attribute to Git::WikiPage Closes #39805 See merge request gitlab-org/gitlab-ce!16682
| * | | Add formatted_data attribute to Git::WikiPageAhmad Sherif2018-01-241-0/+11
| | | | | | | | | | | | | | | | Related to #39805
* | | | Merge branch 'search-100' into 'master'Yorick Peterse2018-01-242-1/+59
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Use limit for search count queries See merge request gitlab-org/gitlab-ce!16502
| * | | | Use limit for search count queriessearch-100Jan Provaznik2018-01-232-1/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-2428-61/+85
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the DatabaseCleaner 'deletion' strategy instead of 'truncation' Closes #30783 See merge request gitlab-org/gitlab-ce!16516
| * | | | | Avoid array indices to fixtures in JS specsNick Thomas2018-01-243-8/+11
| | | | | |
| * | | | | Work around a bug in DatabaseCleaner when using the deletion strategy on MySQLNick Thomas2018-01-241-0/+15
| | | | | |
| * | | | | Use the DatabaseCleaner 'deletion' strategy instead of 'truncation'Nick Thomas2018-01-2428-62/+68
| | | | | |
* | | | | | Merge branch 'feature/migrate-get-lfs-ptrs-to-gitaly' into 'master'Robert Speicher2018-01-241-15/+28
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Migrate .batch_lfs_pointers to Gitaly Closes gitaly#921 See merge request gitlab-org/gitlab-ce!16517
| * | | | | | Migrate .batch_lfs_pointers to Gitalyfeature/migrate-get-lfs-ptrs-to-gitalyAhmad Sherif2018-01-241-15/+28
| | |_|/ / / | |/| | | | | | | | | | | | | | | | Closes gitaly#921
* | | | | | Merge branch 'dm-project-system-hooks-in-transaction' into 'master'Robert Speicher2018-01-242-1/+20
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | Execute system hooks after-commit when executing project hooks See merge request gitlab-org/gitlab-ce!16673
| * | | | | Execute system hooks after-commit when executing project hooksdm-project-system-hooks-in-transactionDouwe Maan2018-01-242-1/+20
| | |_|/ / | |/| | |
* | | | | Merge branch '42361-workaround' into 'master'alejandro-testRobert Speicher2018-01-241-0/+3
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | Resolve "Spec failure in ./spec/features/issues/spam_issues_spec.rb" Closes #42361 See merge request gitlab-org/gitlab-ce!16671
| * | | | Workaround a recaptcha pop-up that cannot be testedRémy Coutable2018-01-241-0/+3
| |/ / / | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | Merge branch 'feature/migrate-bundle-to-disk-to-gitaly' into 'master'Robert Speicher2018-01-241-0/+28
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Migrate repository bundling to Gitaly Closes gitaly#929 See merge request gitlab-org/gitlab-ce!16563
| * | | | Migrate repository bundling to Gitalyfeature/migrate-bundle-to-disk-to-gitalyAhmad Sherif2018-01-241-0/+28
| |/ / / | | | | | | | | | | | | Closes gitaly#929
* | | | Merge branch 'PNSalocin/gitlab-ce-24035-api-create-application' into 'master'Rémy Coutable2018-01-241-0/+86
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Add application create API Closes #24035 See merge request gitlab-org/gitlab-ce!16643
| * | | Add application create APINicolas MERELLI2018-01-241-0/+86
| |/ /
* | | Merge branch 'winh-axios-mock-restore' into 'master'Filipa Lacerda2018-01-249-14/+14
|\ \ \ | | | | | | | | | | | | | | | | Use restore() instead of reset() for removing axios MockAdapter See merge request gitlab-org/gitlab-ce!16647
| * | | Use restore() instead of reset() for removing axios MockAdapterwinh-axios-mock-restoreWinnie Hellmann2018-01-239-14/+14
| | | |
* | | | GitalyClient::ConflictsService#conflicts? should return true for conflicts ↵fix/gitaly-can-be-merged-for-missing-conflict-filesAhmad Sherif2018-01-231-1/+7
| |/ / |/| | | | | | | | with missing side
* | | 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>
* | | Upgrade jasmine + raven to newer versionsTim Zallmann2018-01-234-42/+21
|/ /
* | Merge branch 'tz-upgrade-vue-again' into 'master'Filipa Lacerda2018-01-2313-42/+56
|\ \ | | | | | | | | | | | | Upgraded all vue libraries See merge request gitlab-org/gitlab-ce!16413
| * | Upgraded all vue librariesTim Zallmann2018-01-2313-42/+56
| |/
* | 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-235-12/+48
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | Incorporate Gitaly's OperationService.UserCommitFiles RPC Closes gitaly#890 See merge request gitlab-org/gitlab-ce!16307
| * | Incorporate Gitaly's OperationService.UserCommitFiles RPCgitaly-user-commit-filesAlejandro Rodríguez2018-01-222-8/+35
| | |
| * | Ensure hooks are deleted regardless of the project forking methodAlejandro Rodríguez2018-01-193-4/+13
| | |
* | | Merge branch '42119-non-triggered' into 'master'Grzegorz Bizon2018-01-231-3/+17
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Resolve ""This job has not been triggered yet" after hitting "Retry"" Closes #42119 See merge request gitlab-org/gitlab-ce!16583
| * | | Improve copy for the pending state42119-non-triggeredFilipa Lacerda2018-01-221-2/+2
| | | |
| * | | Improve pending case testFilipa Lacerda2018-01-221-2/+2
| | | |
| * | | Adds information for pending stateFilipa Lacerda2018-01-221-4/+5
| | | |
| * | | Update testsFilipa Lacerda2018-01-191-2/+1
| | | |
| * | | Do not render non triggered empty state for pending jobsFilipa Lacerda2018-01-191-0/+14
| | | | | | | | | | | | | | | | Put back non triggered information
* | | | Merge branch ↵Robert Speicher2018-01-222-6/+20
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '40612-cannot-change-project-visibility-from-private-even-when-owner' into 'master' Resolve "Cannot change project visibility from Private (even when owner)" Closes #40612 See merge request gitlab-org/gitlab-ce!16595
| * | | | fix spacing and wrap method params in parensMike Greiling2018-01-221-3/+3
| | | | |
| * | | | add test to can_change_visibility_level? methodMike Greiling2018-01-221-4/+14
| | | | |
| * | | | ensure fork_source returns nil when project is the root fork, add testsMike Greiling2018-01-221-0/+4
| | |_|/ | |/| |
* | | | 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.
* | | | | Merge branch 'sh-fix-error-500-no-avatars' into 'master'Robert Speicher2018-01-222-1/+19
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Error 500 when repository has no avatar Closes #42249 See merge request gitlab-org/gitlab-ce!16601
View Lorry Controller Status