summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'issue_40337' into 'master'Sean McGivern2017-11-213-9/+55
|\ | | | | | | | | | | | | Fix promoting milestone updating all issuables without milestone Closes #40337 See merge request gitlab-org/gitlab-ce!15487
| * Fix promoting milestone updating all issuables without milestoneissue_40337Felipe Artur2017-11-213-9/+55
| |
* | Merge branch 'gitaly-test-no-deployment' into 'master'Sean McGivern2017-11-212-5/+3
|\ \ | | | | | | | | | | | | Fix slow gitaly dev test bundle See merge request gitlab-org/gitlab-ce!15508
| * | Fix slow gitaly dev test bundleJacob Vosmaer (GitLab)2017-11-212-5/+3
|/ /
* | Merge branch '38869-milestone' into 'master'Phil Hughes2017-11-2110-209/+176
|\ \ | | | | | | | | | | | | Export code as ES6 modules See merge request gitlab-org/gitlab-ce!15503
| * | Export code as ES6 modules38869-milestoneFilipa Lacerda2017-11-2010-209/+176
| | |
* | | Merge branch 'backport-3434' into 'master'Filipa Lacerda2017-11-216-3/+72
|\ \ \ | | | | | | | | | | | | | | | | Backport ability to enable/disable file attachments in issuable form See merge request gitlab-org/gitlab-ce!15433
| * | | 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 testing See merge request gitlab-org/gitlab-ce!15507
| * | | Memoize GitlabShellAdapter for performance and ease of testingStan Hu2017-11-201-1/+1
| | | | | | | | | | | | | | | | Port of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/3463#note_47990536
* | | | 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 cookie Closes #39821 See merge request gitlab-org/gitlab-ce!15502
| * | | | Fix commits list 500 with multi-file editor new_repo cookie39821-fix-commits-list-with-multi-file-editorEric Eastwood2017-11-203-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/39821 /<namespace>/<project>/commmits/master
* | | | | 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` See merge request gitlab-org/gitlab-ce!15491
| * | | | Remove a useless `allow_failure: no` and use `true` instead of `yes`rc/remove-useless-allow-failureRémy Coutable2017-11-201-2/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* | | | | Merge branch 'grpc-update' into 'master'Robert Speicher2017-11-211-2/+2
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | Update gRPC to v1.7.2 Closes gitaly#742 See merge request gitlab-org/gitlab-ce!15439
| * | | | Update gRPC to v1.7.2Alejandro Rodríguez2017-11-201-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This solves a problem where Gitaly connections through Unix sockets would not work when a proxy was configures, even if a no_proxy setting was specified
* | | | | Merge branch '40290-remove-rake-gitlab-sidekiq-drop-post-receive' into 'master'Nick Thomas2017-11-202-47/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | remove the rake task `gitlab:sidekiq:drop_post_receive` Closes #40290 See merge request gitlab-org/gitlab-ce!15493
| * | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | This task is no longer being used and is not documented.
* | | | | | Merge branch 'fix-mr-cleanup' into 'master'Sean McGivern2017-11-201-4/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix merge_requests.source_project_id migration See merge request gitlab-org/gitlab-ce!15496
| * | | | | | Fix merge_requests.source_project_id migrationfix-mr-cleanupYorick Peterse2017-11-201-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need to make sure merge_requests.source_project_id allows NULL values _before_ updating rows as otherwise this will lead to a NOT NULL constraint failing.
* | | | | | | Merge branch '1870-impersonation-stuck-on-password-change-ce' into 'master'Sean McGivern2017-11-204-4/+34
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [CE] Impersonation no longer gets stuck on password change. Closes #13888 See merge request gitlab-org/gitlab-ce!15497
| * | | | | | | Fix MR IID in changelog item1870-impersonation-stuck-on-password-change-ceDouwe Maan2017-11-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | | | 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 mobile Closes #39497 See merge request gitlab-org/gitlab-ce!15438
| * | | | | | | Add inline editing to issues on mobileEric Eastwood2017-11-187-79/+105
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/39497
* | | | | | | | Merge branch '4080-align-retry-btn' into 'master'Annabel Dunstone Gray2017-11-203-1/+7
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Align retry button with job title with new grid size Closes #40342 See merge request gitlab-org/gitlab-ce!15462
| * | | | | | | | 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 enabled Closes #40292 See merge request gitlab-org/gitlab-ce!15490
| * | | | | | | | 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
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | improve requirements details See merge request gitlab-org/gitlab-ce!15265
| * | | | | | | | 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 branch See merge request gitlab-org/gitlab-ce!15492
| * | | | | | | | Clarify wording of protected branch settings for the default branchSean McGivern2017-11-203-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | No-one is allowed to force push to a protected branch, or delete it. That's correct in the documentation, but was wrong in the drop-down.
* | | | | | | | | Merge branch '39167-async-boards-sidebar' into 'master'Sean McGivern2017-11-2020-100/+174
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make Issue Boards sidebar subscriptions async Closes #39167 and #40094 See merge request gitlab-org/gitlab-ce!15364
| * | | | | | | | | 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 failures Closes gitlab-qa#102 See merge request gitlab-org/gitlab-ce!15486
| * | | | | | | | | 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.js See merge request gitlab-org/gitlab-ce!15459
| * | | | | | | | 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 QA See merge request gitlab-org/gitlab-ce!15489
| * | | | | | | 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 RPC Closes gitaly#740 See merge request gitlab-org/gitlab-ce!15460
| * | | | | | 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
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update Icons Documentation about Icon Vue Component Closes #38451 See merge request gitlab-org/gitlab-ce!15171
| * | | | | | | 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 logs for monitoring the merge process See merge request gitlab-org/gitlab-ce!15425
| * | | | | | | Add MR reference to logsOswaldo Ferreira2017-11-201-5/+5
| | | | | | | |