delta/gitlab/gitlab-ce.git - gitlab.com: gitlab-org/gitlab-ce.git

	Commit message (Collapse)	Author	Age	Files	Lines
*	Use arrays in Pipeline#latest_builds_with_artifactsreduce-queries-for-artifacts-button	Yorick Peterse	2017-11-21	3	-1/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This changes Ci::Pipeline#latest_builds_with_artifacts so it returns an Array instead of a relation. Whenever we use this data we do so in two steps: 1. Count the number of rows 2. If this number is greater than 0, iterate over the rows By returning an Array instead we only execute 1 query of which the total time/work is less than running either just a COUNT(*) or both queries (in the worst case). On GitLab.com this change should save us a few milliseconds per request to ProjectsController#show.
*	Merge branch '40367-tagspage-tags' into 'master'	Douwe Maan	2017-11-21	1	-1/+1
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "TagsPage\|Tags" Closes #40367 See merge request gitlab-org/gitlab-ce!15512
\| *	Use the correct i18n helper for namespaced string40367-tagspage-tags	Rémy Coutable	2017-11-21	1	-1/+1
\| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \|	Merge branch 'zj-commit-show-n-1' into 'master'	Sean McGivern	2017-11-21	18	-56/+86
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Batch load blobs for diff generation Closes #37599 See merge request gitlab-org/gitlab-ce!15370
\| * \|	Batchload blobs for diff generation	Zeger-Jan van de Weg	2017-11-21	18	-56/+86
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	After installing a new gem, batch-loader, a construct can be used to queue data to be fetched in bulk. The gem was also introduced in both gitlab-org/gitlab-ce!14680 and gitlab-org/gitlab-ce!14846, but those mrs are not merged yet. For the generation of diffs, both the old blob and the new blob need to be loaded. This for every file in the diff, too. Now we collect all these so we do 1 fetch. Three `.allow_n_plus_1_calls` have been removed, which I expect to be valid, but this needs to be confirmed by a full CI run. Possibly closes: - https://gitlab.com/gitlab-org/gitlab-ce/issues/37445 - https://gitlab.com/gitlab-org/gitlab-ce/issues/37599 - https://gitlab.com/gitlab-org/gitlab-ce/issues/37431
* \| \|	Merge branch 'issue_40337' into 'master'	Sean McGivern	2017-11-21	3	-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_40337	Felipe Artur	2017-11-21	3	-9/+55
\| \| \|
* \| \|	Merge branch 'gitaly-test-no-deployment' into 'master'	Sean McGivern	2017-11-21	2	-5/+3
\|\ \ \ \| \|_\|/ \|/\| \| \| \| \| \| \| \|	Fix slow gitaly dev test bundle See merge request gitlab-org/gitlab-ce!15508
\| * \|	Fix slow gitaly dev test bundle	Jacob Vosmaer (GitLab)	2017-11-21	2	-5/+3
\|/ /
* \|	Merge branch '38869-milestone' into 'master'	Phil Hughes	2017-11-21	10	-209/+176
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Export code as ES6 modules See merge request gitlab-org/gitlab-ce!15503
\| * \|	Export code as ES6 modules38869-milestone	Filipa Lacerda	2017-11-20	10	-209/+176
\| \| \|
* \| \|	Merge branch 'backport-3434' into 'master'	Filipa Lacerda	2017-11-21	6	-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 form	Clement Ho	2017-11-21	6	-3/+72
\|/ / /
* \| \|	Merge branch 'sh-memoize-gitlab-shell' into 'master'	Douwe Maan	2017-11-21	1	-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 testing	Stan Hu	2017-11-20	1	-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 Hughes	2017-11-21	3	-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-editor	Eric Eastwood	2017-11-20	3	-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 Bizon	2017-11-21	1	-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-failure	Rémy Coutable	2017-11-20	1	-2/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \|	Merge branch 'grpc-update' into 'master'	Robert Speicher	2017-11-21	1	-2/+2
\|\ \ \ \ \ \| \|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update gRPC to v1.7.2 Closes gitaly#742 See merge request gitlab-org/gitlab-ce!15439
\| * \| \| \|	Update gRPC to v1.7.2	Alejandro Rodríguez	2017-11-20	1	-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 Thomas	2017-11-20	2	-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-receive	digitalMoksha	2017-11-20	1	-0/+5
\| \| \| \| \| \|
\| * \| \| \| \|	remove the rake task `gitlab:sidekiq:drop_post_receive`	digitalMoksha	2017-11-20	1	-47/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This task is no longer being used and is not documented.
* \| \| \| \| \|	Merge branch 'fix-mr-cleanup' into 'master'	Sean McGivern	2017-11-20	1	-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-cleanup	Yorick Peterse	2017-11-20	1	-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 McGivern	2017-11-20	4	-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-ce	Douwe Maan	2017-11-20	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \| \| \| \| \|	Impersonation no longer gets stuck on password change.	Tiago Botelho	2017-11-20	4	-4/+34
\| \|/ / / / / /
* \| \| \| \| \| \|	Merge branch '39497-inline-edit-issue-on-mobile' into 'master'	Annabel Dunstone Gray	2017-11-20	7	-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 mobile	Eric Eastwood	2017-11-18	7	-79/+105
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/39497
* \| \| \| \| \| \| \|	Merge branch '4080-align-retry-btn' into 'master'	Annabel Dunstone Gray	2017-11-20	3	-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 size	Filipa Lacerda	2017-11-20	3	-1/+7
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge branch '40292-bitbucket-import-hashed-storage' into 'master'	Douwe Maan	2017-11-20	3	-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 enabled	Nick Thomas	2017-11-20	3	-5/+37
\| \| \|_\|/ / / / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'req-docs' into 'master'	Rémy Coutable	2017-11-20	1	-3/+3
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	improve requirements details See merge request gitlab-org/gitlab-ce!15265
\| * \| \| \| \| \| \| \|	formatting cleanup, swamp details, unicorn defaults	Ben Bodenmiller	2017-11-07	1	-3/+3
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'fix-protected-branches-descriptions' into 'master'	Douwe Maan	2017-11-20	3	-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 branch	Sean McGivern	2017-11-20	3	-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 McGivern	2017-11-20	20	-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 boards	Eric Eastwood	2017-11-20	17	-99/+165
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Add issue sidebar and toggle_subscription endpoint in board issues data	Oswaldo Ferreira	2017-11-20	3	-1/+9
\| \| \|_\|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'qa/gb/tmp-fix-mattermost-failures' into 'master'	Rémy Coutable	2017-11-20	1	-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-failures	Grzegorz Bizon	2017-11-20	1	-0/+11
\| \|/ / / / / / / /
* \| \| \| \| \| \| \| \|	Merge branch 'remove-pretty-time' into 'master'	Phil Hughes	2017-11-20	1	-1/+0
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove pretty time from main.js See merge request gitlab-org/gitlab-ce!15459
\| * \| \| \| \| \| \| \|	Remove pretty time from main.js	Filipa Lacerda	2017-11-20	1	-1/+0
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge branch 'qa/gb/add-docker-to-qa-image' into 'master'	Rémy Coutable	2017-11-20	1	-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 QA	Grzegorz Bizon	2017-11-20	1	-0/+7
\| \|/ / / / / /
* \| \| \| \| \| \|	Merge branch 'gitaly-delete-refs' into 'master'	Douwe Maan	2017-11-20	7	-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-refs	Alejandro Rodríguez	2017-11-17	7	-5/+59
\| \| \| \| \| \| \|