summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Resolve "Link to Clusters in Auto DevOps instead of Kubernetes service"Fabio Busatto2018-01-251-4/+4
* Merge branch '42161-gitaly-commitservice-encoding-undefinedconversionerror-u-...Rémy Coutable2018-01-251-0/+23
|\
| * 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
* | Merge branch 'fl-mr-widget-refactor' into 'master'Phil Hughes2018-01-253-153/+127
|\ \
| * | Moves more mr widget components into vue filesfl-mr-widget-refactorFilipa Lacerda2018-01-243-153/+127
* | | Add a gRPC health check to ensure Gitaly is upsh-add-gitaly-health-checkStan Hu2018-01-243-0/+123
* | | Merge branch 'fix/add-formatted-data-to-wiki-page' into 'master'Robert Speicher2018-01-241-0/+11
|\ \ \
| * | | Add formatted_data attribute to Git::WikiPageAhmad Sherif2018-01-241-0/+11
* | | | Merge branch 'search-100' into 'master'Yorick Peterse2018-01-242-1/+59
|\ \ \ \
| * | | | Use limit for search count queriessearch-100Jan Provaznik2018-01-232-1/+59
* | | | | Merge branch '40744-idempotent-ids' into 'master'Robert Speicher2018-01-2428-61/+85
|\ \ \ \ \
| * | | | | 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 Gitalyfeature/migrate-get-lfs-ptrs-to-gitalyAhmad Sherif2018-01-241-15/+28
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'dm-project-system-hooks-in-transaction' into 'master'Robert Speicher2018-01-242-1/+20
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | 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
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Workaround a recaptcha pop-up that cannot be testedRémy Coutable2018-01-241-0/+3
| |/ / /
* | | | Merge branch 'feature/migrate-bundle-to-disk-to-gitaly' into 'master'Robert Speicher2018-01-241-0/+28
|\ \ \ \
| * | | | Migrate repository bundling to Gitalyfeature/migrate-bundle-to-disk-to-gitalyAhmad Sherif2018-01-241-0/+28
| |/ / /
* | | | Merge branch 'PNSalocin/gitlab-ce-24035-api-create-application' into 'master'Rémy Coutable2018-01-241-0/+86
|\ \ \ \ | |/ / / |/| | |
| * | | 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 MockAdapterwinh-axios-mock-restoreWinnie Hellmann2018-01-239-14/+14
* | | | GitalyClient::ConflictsService#conflicts? should return true for conflicts wi...fix/gitaly-can-be-merged-for-missing-conflict-filesAhmad Sherif2018-01-231-1/+7
| |/ / |/| |
* | | Fix a migration spec messing up the MergeRequestDiff DB schema42340-ci-failing-on-mergerequestdiff-commits_countRémy Coutable2018-01-231-0/+4
* | | 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 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 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 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
|\ \ \
| * | | 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
* | | | Merge branch '40612-cannot-change-project-visibility-from-private-even-when-o...Robert Speicher2018-01-222-6/+20
|\ \ \ \
| * | | | 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 runnerSean McGivern2018-01-191-0/+156
* | | | | Merge branch 'sh-fix-error-500-no-avatars' into 'master'Robert Speicher2018-01-222-1/+19
|\ \ \ \ \
| * | | | | Fix Error 500 when repository has no avatarsh-fix-error-500-no-avatarsStan Hu2018-01-202-1/+19