summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix slow gitaly dev test bundlegitaly-test-no-deploymentJacob Vosmaer2017-11-211-3/+1
* Merge branch 'backport-3434' into 'master'Filipa Lacerda2017-11-216-3/+72
|\
| * Backport ability to enable/disable file attachments in issuable formClement Ho2017-11-216-3/+72
|/
* Merge branch 'sh-memoize-gitlab-shell' into 'master'Douwe Maan2017-11-211-1/+1
|\
| * Memoize GitlabShellAdapter for performance and ease of testingStan Hu2017-11-201-1/+1
* | Merge branch '39821-fix-commits-list-with-multi-file-editor' into 'master'Phil Hughes2017-11-213-0/+14
|\ \
| * | Fix commits list 500 with multi-file editor new_repo cookie39821-fix-commits-list-with-multi-file-editorEric Eastwood2017-11-203-0/+14
* | | Merge branch 'rc/remove-useless-allow-failure' into 'master'Grzegorz Bizon2017-11-211-2/+1
|\ \ \ | |_|/ |/| |
| * | Remove a useless `allow_failure: no` and use `true` instead of `yes`rc/remove-useless-allow-failureRémy Coutable2017-11-201-2/+1
* | | Merge branch 'grpc-update' into 'master'Robert Speicher2017-11-211-2/+2
|\ \ \
| * | | Update gRPC to v1.7.2Alejandro Rodríguez2017-11-201-2/+2
* | | | Merge branch '40290-remove-rake-gitlab-sidekiq-drop-post-receive' into 'master'Nick Thomas2017-11-202-47/+5
|\ \ \ \
| * | | | added changelog entry40290-remove-rake-gitlab-sidekiq-drop-post-receivedigitalMoksha2017-11-201-0/+5
| * | | | remove the rake task `gitlab:sidekiq:drop_post_receive`digitalMoksha2017-11-201-47/+0
* | | | | Merge branch 'fix-mr-cleanup' into 'master'Sean McGivern2017-11-201-4/+4
|\ \ \ \ \
| * | | | | Fix merge_requests.source_project_id migrationfix-mr-cleanupYorick Peterse2017-11-201-4/+4
* | | | | | Merge branch '1870-impersonation-stuck-on-password-change-ce' into 'master'Sean McGivern2017-11-204-4/+34
|\ \ \ \ \ \
| * | | | | | Fix MR IID in changelog item1870-impersonation-stuck-on-password-change-ceDouwe Maan2017-11-201-1/+1
| * | | | | | Impersonation no longer gets stuck on password change.Tiago Botelho2017-11-204-4/+34
| |/ / / / /
* | | | | | Merge branch '39497-inline-edit-issue-on-mobile' into 'master'Annabel Dunstone Gray2017-11-207-79/+105
|\ \ \ \ \ \
| * | | | | | Add inline editing to issues on mobileEric Eastwood2017-11-187-79/+105
* | | | | | | Merge branch '4080-align-retry-btn' into 'master'Annabel Dunstone Gray2017-11-203-1/+7
|\ \ \ \ \ \ \
| * | | | | | | Align retry button with job title with new grid sizeFilipa Lacerda2017-11-203-1/+7
|/ / / / / / /
* | | | | | | Merge branch '40292-bitbucket-import-hashed-storage' into 'master'Douwe Maan2017-11-203-5/+37
|\ \ \ \ \ \ \
| * | | | | | | Fix bitbucket wiki import with hashed storage enabledNick Thomas2017-11-203-5/+37
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'req-docs' into 'master'Rémy Coutable2017-11-201-3/+3
|\ \ \ \ \ \ \
| * | | | | | | formatting cleanup, swamp details, unicorn defaultsBen Bodenmiller2017-11-071-3/+3
* | | | | | | | Merge branch 'fix-protected-branches-descriptions' into 'master'Douwe Maan2017-11-203-4/+9
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Clarify wording of protected branch settings for the default branchSean McGivern2017-11-203-4/+9
* | | | | | | | Merge branch '39167-async-boards-sidebar' into 'master'Sean McGivern2017-11-2020-100/+174
|\ \ \ \ \ \ \ \
| * | | | | | | | Async notification subscriptions in issue boardsEric Eastwood2017-11-2017-99/+165
| * | | | | | | | Add issue sidebar and toggle_subscription endpoint in board issues dataOswaldo Ferreira2017-11-203-1/+9
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch 'qa/gb/tmp-fix-mattermost-failures' into 'master'Rémy Coutable2017-11-201-0/+11
|\ \ \ \ \ \ \ \
| * | | | | | | | Implement a workaround for QA mattermost failuresqa/gb/tmp-fix-mattermost-failuresGrzegorz Bizon2017-11-201-0/+11
| |/ / / / / / /
* | | | | | | | Merge branch 'remove-pretty-time' into 'master'Phil Hughes2017-11-201-1/+0
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | Remove pretty time from main.jsFilipa Lacerda2017-11-201-1/+0
|/ / / / / / /
* | | | | | | Merge branch 'qa/gb/add-docker-to-qa-image' into 'master'Rémy Coutable2017-11-201-0/+7
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Add Docker binaries to instance image of GitLab QAGrzegorz Bizon2017-11-201-0/+7
| |/ / / / /
* | | | | | Merge branch 'gitaly-delete-refs' into 'master'Douwe Maan2017-11-207-5/+59
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Incorporate Gitaly's RefService.DeleteRefs RPCgitaly-delete-refsAlejandro Rodríguez2017-11-177-5/+59
* | | | | | Merge branch '38451-fe-sprite-icons-vue-component' into 'master'Annabel Dunstone Gray2017-11-202-9/+28
|\ \ \ \ \ \
| * | | | | | Added info about tracking38451-fe-sprite-icons-vue-componentTim Zallmann2017-11-161-1/+1
| * | | | | | Added + Updated Document for Vue ComponentTim Zallmann2017-11-162-8/+27
* | | | | | | Merge branch 'osw-merge-process-logs' into 'master'Sean McGivern2017-11-202-0/+17
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Add MR reference to logsOswaldo Ferreira2017-11-201-5/+5
| * | | | | | Add logs for monitoring the merge processosw-merge-process-logsOswaldo Ferreira2017-11-162-0/+17
* | | | | | | Merge branch 'bvl-dont-move-projects-using-hashed-storage' into 'master'Douwe Maan2017-11-204-3/+38
|\ \ \ \ \ \ \
| * | | | | | | Don't move project repository/attachments when using hashed storageBob Van Landuyt2017-11-204-3/+38
* | | | | | | | Merge branch 'merge-requests-schema-cleanup' into 'master'Sean McGivern2017-11-2011-5/+276
|\ \ \ \ \ \ \ \
| * | | | | | | | Clean up schema of the "merge_requests" tableYorick Peterse2017-11-2011-5/+276