Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'patch-28' into 'master' | Douwe Maan | 2017-11-02 | 4 | -1/+37 |
|\ | |||||
| * | Address Douwe's feedback | Rémy Coutable | 2017-11-02 | 2 | -2/+11 |
| * | Simplify the live debugger resume mechanism: press any key | Rémy Coutable | 2017-10-26 | 1 | -11/+2 |
| * | Ensure no exception is raised if the Gitaly process is already gone in TestEn... | Rémy Coutable | 2017-10-17 | 1 | -0/+2 |
| * | Improve the LiveDebugger exit handler and documentation | Rémy Coutable | 2017-10-17 | 1 | -9/+13 |
| * | Add LiveDebugger#live_debug to debug Capybara in feature tests. | Rémy Coutable | 2017-10-16 | 3 | -1/+31 |
* | | Merge branch 'jivl-fix-cancel-button-file-upload-new-issue' into 'master' | Filipa Lacerda | 2017-11-02 | 1 | -0/+10 |
|\ \ | |||||
| * | | Fix cancel button not working when uploading a file on the new issue pagejivl-fix-cancel-button-file-upload-new-issue | Jose Ivan Vargas | 2017-11-01 | 1 | -0/+10 |
* | | | Merge branch 'multi-file-editor-binary-editor' into 'master' | Filipa Lacerda | 2017-11-02 | 1 | -5/+13 |
|\ \ \ | |||||
| * | | | Fix binary files not showing anything in edit modemulti-file-editor-binary-editor | Phil Hughes | 2017-11-01 | 1 | -5/+13 |
* | | | | Merge branch 'vue-update' into 'master' | Tim Zallmann | 2017-11-02 | 2 | -8/+10 |
|\ \ \ \ | |||||
| * | | | | karma spec updatesvue-update | Phil Hughes | 2017-11-01 | 2 | -8/+10 |
* | | | | | Fix encoding issue with Repository.ls_files | Kim Carlbäcker | 2017-11-02 | 6 | -0/+7 |
* | | | | | Merge branch 'jej/lfs-change-detection' into 'master' | Douwe Maan | 2017-11-01 | 4 | -29/+179 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | |||||
| * | | | | Detect changes to LFS pointers for pruning and integrity check | James Edwards-Jones | 2017-11-01 | 4 | -29/+179 |
* | | | | | Merge branch '35914-merge-request-update-worker-is-slow' into 'master' | Sean McGivern | 2017-11-01 | 1 | -20/+28 |
|\ \ \ \ \ | |||||
| * | | | | | reword `targets` to `metric tags` | micael.bergeron | 2017-10-31 | 1 | -3/+3 |
| * | | | | | add metrics tagging to the sidekiq middleware | micael.bergeron | 2017-10-31 | 1 | -20/+28 |
* | | | | | | Refactor/group links controller | Francisco Javier López | 2017-11-01 | 2 | -0/+38 |
* | | | | | | Export logo and labels select as ES6 modules | Filipa Lacerda | 2017-11-01 | 1 | -2/+1 |
* | | | | | | Merge branch 'backport-workhorse-show-all-refs' into 'master' | Douwe Maan | 2017-11-01 | 1 | -2/+16 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | |||||
| * | | | | | Support show-all-refs for git over HTTP | Nick Thomas | 2017-10-30 | 1 | -2/+16 |
* | | | | | | Merge branch 'feature/migrate-find-wiki-file-to-gitaly' into 'master' | Sean McGivern | 2017-11-01 | 3 | -28/+92 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Migrate Gitlab::Git::Wiki#file to Gitalyfeature/migrate-find-wiki-file-to-gitaly | Ahmad Sherif | 2017-10-31 | 3 | -28/+92 |
* | | | | | | | Merge branch 'go-get-ssh' into 'master' | Douwe Maan | 2017-11-01 | 1 | -53/+85 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Returns a ssh url for go-get=1 | Guilherme Vieira | 2017-10-31 | 1 | -53/+85 |
* | | | | | | | | Resolve "Convert fuzzaldrin-plus.js library to be a Yarn managed library" | Tim Zallmann | 2017-11-01 | 1 | -1/+0 |
| |/ / / / / / |/| | | | | | | |||||
* | | | | | | | Merge branch 'feature/migrate-find-wiki-page-to-gitaly' into 'master' | Sean McGivern | 2017-10-31 | 1 | -18/+28 |
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | |||||
| * | | | | | | Migrate Gitlab::Git::Wiki#page to Gitalyfeature/migrate-find-wiki-page-to-gitaly | Ahmad Sherif | 2017-10-31 | 1 | -18/+28 |
* | | | | | | | Merge branch 'dm-ldap-identity-normalize-dn' into 'master' | Sean McGivern | 2017-10-31 | 5 | -8/+22 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Normalize LDAP DN when looking up identity | Douwe Maan | 2017-10-31 | 5 | -8/+22 |
* | | | | | | | | Merge branch 'multi-file-editor-vuex' into 'master' | Filipa Lacerda | 2017-10-31 | 21 | -1089/+639 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | fixed up upload feature after master mergemulti-file-editor-vuex | Phil Hughes | 2017-10-31 | 1 | -33/+36 |
| * | | | | | | | | Merge branch 'master' into multi-file-editor-vuex | Phil Hughes | 2017-10-31 | 7 | -9/+174 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge branch 'master' into multi-file-editor-vuex | Phil Hughes | 2017-10-31 | 6 | -76/+105 |
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | |||||
| * | | | | | | | | | spec fixes | Phil Hughes | 2017-10-31 | 2 | -2/+2 |
| * | | | | | | | | | spec fixes | Phil Hughes | 2017-10-30 | 2 | -2/+6 |
| * | | | | | | | | | addressed feedback from review | Phil Hughes | 2017-10-30 | 5 | -17/+25 |
| * | | | | | | | | | Merge branch 'master' into multi-file-editor-vuex | Phil Hughes | 2017-10-30 | 38 | -165/+826 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | updated karma specs | Phil Hughes | 2017-10-27 | 19 | -1008/+581 |
* | | | | | | | | | | | Load participants async | Eric Eastwood | 2017-10-31 | 21 | -125/+502 |
* | | | | | | | | | | | Merge branch 'fix/import-issue-assignees' into 'master' | Sean McGivern | 2017-10-31 | 5 | -1/+21 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | fix spec failure | James Lopez | 2017-10-31 | 1 | -0/+3 |
| * | | | | | | | | | | | fix specsfix/import-issue-assignees | James Lopez | 2017-10-31 | 3 | -7/+10 |
| * | | | | | | | | | | | fix missing issue assignees | James Lopez | 2017-10-31 | 3 | -1/+15 |
| | |_|_|/ / / / / / / | |/| | | | | | | | | | |||||
* | | | | | | | | | | | Allow promoting project milestones to group milestones | Felipe Artur | 2017-10-31 | 3 | -7/+117 |
| |_|_|_|/ / / / / / |/| | | | | | | | | | |||||
* | | | | | | | | | | Merge branch 'feature/migrate-wiki-delete-page-to-gitaly' into 'master' | Sean McGivern | 2017-10-31 | 2 | -15/+25 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Migrate Gitlab::Git::Wiki#delete_page to Gitaly | Ahmad Sherif | 2017-10-31 | 2 | -15/+25 |
* | | | | | | | | | | | Merge branch '39561-seed_fu-fails-to-load-gitlab-test' into 'master' | Sean McGivern | 2017-10-31 | 2 | -2/+103 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Handle large values on `MergeRequestDiffCommit` dates39561-seed_fu-fails-to-load-gitlab-test | Alejandro Rodríguez | 2017-10-30 | 2 | -2/+103 |
| | |_|_|_|/ / / / / / | |/| | | | | | | | | |