summaryrefslogtreecommitdiff
path: root/spec
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'patch-28' into 'master'Douwe Maan2017-11-024-1/+37
|\
| * Address Douwe's feedbackRémy Coutable2017-11-022-2/+11
| * Simplify the live debugger resume mechanism: press any keyRémy Coutable2017-10-261-11/+2
| * Ensure no exception is raised if the Gitaly process is already gone in TestEn...Rémy Coutable2017-10-171-0/+2
| * Improve the LiveDebugger exit handler and documentationRémy Coutable2017-10-171-9/+13
| * Add LiveDebugger#live_debug to debug Capybara in feature tests.Rémy Coutable2017-10-163-1/+31
* | Merge branch 'jivl-fix-cancel-button-file-upload-new-issue' into 'master'Filipa Lacerda2017-11-021-0/+10
|\ \
| * | Fix cancel button not working when uploading a file on the new issue pagejivl-fix-cancel-button-file-upload-new-issueJose Ivan Vargas2017-11-011-0/+10
* | | Merge branch 'multi-file-editor-binary-editor' into 'master'Filipa Lacerda2017-11-021-5/+13
|\ \ \
| * | | Fix binary files not showing anything in edit modemulti-file-editor-binary-editorPhil Hughes2017-11-011-5/+13
* | | | Merge branch 'vue-update' into 'master'Tim Zallmann2017-11-022-8/+10
|\ \ \ \
| * | | | karma spec updatesvue-updatePhil Hughes2017-11-012-8/+10
* | | | | Fix encoding issue with Repository.ls_filesKim Carlbäcker2017-11-026-0/+7
* | | | | Merge branch 'jej/lfs-change-detection' into 'master'Douwe Maan2017-11-014-29/+179
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Detect changes to LFS pointers for pruning and integrity checkJames Edwards-Jones2017-11-014-29/+179
* | | | | Merge branch '35914-merge-request-update-worker-is-slow' into 'master'Sean McGivern2017-11-011-20/+28
|\ \ \ \ \
| * | | | | reword `targets` to `metric tags`micael.bergeron2017-10-311-3/+3
| * | | | | add metrics tagging to the sidekiq middlewaremicael.bergeron2017-10-311-20/+28
* | | | | | Refactor/group links controllerFrancisco Javier López2017-11-012-0/+38
* | | | | | Export logo and labels select as ES6 modulesFilipa Lacerda2017-11-011-2/+1
* | | | | | Merge branch 'backport-workhorse-show-all-refs' into 'master'Douwe Maan2017-11-011-2/+16
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Support show-all-refs for git over HTTPNick Thomas2017-10-301-2/+16
* | | | | | Merge branch 'feature/migrate-find-wiki-file-to-gitaly' into 'master'Sean McGivern2017-11-013-28/+92
|\ \ \ \ \ \
| * | | | | | Migrate Gitlab::Git::Wiki#file to Gitalyfeature/migrate-find-wiki-file-to-gitalyAhmad Sherif2017-10-313-28/+92
* | | | | | | Merge branch 'go-get-ssh' into 'master'Douwe Maan2017-11-011-53/+85
|\ \ \ \ \ \ \
| * | | | | | | Returns a ssh url for go-get=1Guilherme Vieira2017-10-311-53/+85
* | | | | | | | Resolve "Convert fuzzaldrin-plus.js library to be a Yarn managed library"Tim Zallmann2017-11-011-1/+0
| |/ / / / / / |/| | | | | |
* | | | | | | Merge branch 'feature/migrate-find-wiki-page-to-gitaly' into 'master'Sean McGivern2017-10-311-18/+28
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Migrate Gitlab::Git::Wiki#page to Gitalyfeature/migrate-find-wiki-page-to-gitalyAhmad Sherif2017-10-311-18/+28
* | | | | | | Merge branch 'dm-ldap-identity-normalize-dn' into 'master'Sean McGivern2017-10-315-8/+22
|\ \ \ \ \ \ \
| * | | | | | | Normalize LDAP DN when looking up identityDouwe Maan2017-10-315-8/+22
* | | | | | | | Merge branch 'multi-file-editor-vuex' into 'master'Filipa Lacerda2017-10-3121-1089/+639
|\ \ \ \ \ \ \ \
| * | | | | | | | fixed up upload feature after master mergemulti-file-editor-vuexPhil Hughes2017-10-311-33/+36
| * | | | | | | | Merge branch 'master' into multi-file-editor-vuexPhil Hughes2017-10-317-9/+174
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' into multi-file-editor-vuexPhil Hughes2017-10-316-76/+105
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| * | | | | | | | | spec fixesPhil Hughes2017-10-312-2/+2
| * | | | | | | | | spec fixesPhil Hughes2017-10-302-2/+6
| * | | | | | | | | addressed feedback from reviewPhil Hughes2017-10-305-17/+25
| * | | | | | | | | Merge branch 'master' into multi-file-editor-vuexPhil Hughes2017-10-3038-165/+826
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | updated karma specsPhil Hughes2017-10-2719-1008/+581
* | | | | | | | | | | Load participants asyncEric Eastwood2017-10-3121-125/+502
* | | | | | | | | | | Merge branch 'fix/import-issue-assignees' into 'master'Sean McGivern2017-10-315-1/+21
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | fix spec failureJames Lopez2017-10-311-0/+3
| * | | | | | | | | | | fix specsfix/import-issue-assigneesJames Lopez2017-10-313-7/+10
| * | | | | | | | | | | fix missing issue assigneesJames Lopez2017-10-313-1/+15
| | |_|_|/ / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Allow promoting project milestones to group milestonesFelipe Artur2017-10-313-7/+117
| |_|_|_|/ / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge branch 'feature/migrate-wiki-delete-page-to-gitaly' into 'master'Sean McGivern2017-10-312-15/+25
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Migrate Gitlab::Git::Wiki#delete_page to GitalyAhmad Sherif2017-10-312-15/+25
* | | | | | | | | | | Merge branch '39561-seed_fu-fails-to-load-gitlab-test' into 'master'Sean McGivern2017-10-312-2/+103
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Handle large values on `MergeRequestDiffCommit` dates39561-seed_fu-fails-to-load-gitlab-testAlejandro Rodríguez2017-10-302-2/+103
| | |_|_|_|/ / / / / / | |/| | | | | | | | |