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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'remove-soft-removals' into 'master'	Douwe Maan	2018-01-11	17	-59/+78
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Remove soft removals related code Closes #37447 See merge request gitlab-org/gitlab-ce!15789
\| *	Added tests for removing soft removed objectsremove-soft-removals	Yorick Peterse	2018-01-10	1	-0/+77
\| \|
\| *	Remove soft removals related code	Yorick Peterse	2018-01-08	16	-59/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This removes all usage of soft removals except for the "pending delete" system implemented for projects. This in turn simplifies all the query plans of the models that used soft removals. Since we don't really use soft removals for anything useful there's no point in keeping it around. This _does_ mean that hard removals of issues (which only admins can do if I'm not mistaken) can influence the "iid" values, but that code is broken to begin with. More on this (and how to fix it) can be found in https://gitlab.com/gitlab-org/gitlab-ce/issues/31114. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/37447
* \|	Merge branch 'feature/migrate-merged-branch-names-to-gitaly' into 'master'	Rémy Coutable	2018-01-11	1	-28/+38
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Migrate merged_branch_names to Gitaly Closes gitaly#851 See merge request gitlab-org/gitlab-ce!16157
\| * \|	Migrate merged_branch_names to Gitaly	Ahmad Sherif	2018-01-11	1	-28/+38
\| \| \| \| \| \| \| \| \| \| \| \|	Closes gitaly#851
* \| \|	Merge branch 'option-disable-archive-cache' into 'master'	Sean McGivern	2018-01-11	1	-0/+14
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add option to disable git archive caching in workhorse See merge request gitlab-org/gitlab-ce!16325
\| * \| \|	Add option to disable git archive caching in workhorseoption-disable-archive-cache	Jacob Vosmaer	2018-01-09	1	-0/+14
\| \| \| \|
* \| \| \|	Merge branch '41608-clipboard-vue-button' into 'master'	Phil Hughes	2018-01-11	1	-0/+31
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "clipboard-button tooltip is broken" Closes #41608 See merge request gitlab-org/gitlab-ce!16352
\| * \| \| \|	Adds props to allow tooltip config. Breaks tests into specific cases41608-clipboard-vue-button	Filipa Lacerda	2018-01-11	1	-1/+7
\| \| \| \| \|
\| * \| \| \|	Add tooltip missing to clipboard component	Filipa Lacerda	2018-01-10	1	-0/+25
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds tests
* \| \| \| \|	Merge branch '39988-hide-new-branch-tag-empty-repo' into 'master'	Rémy Coutable	2018-01-11	1	-0/+39
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve ""New branch" and "New tag" actions are pointless on an empty repository" Closes #39988 See merge request gitlab-org/gitlab-ce!16332
\| * \| \| \| \|	Hide new branch and tag links for projects with an empty repo	Mark Fletcher	2018-01-09	1	-0/+39
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'fix-use-of-append-in-mr-api-spec' into 'master'	Grzegorz Bizon	2018-01-11	1	-1/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove call to ProjectTeam#<< in MR API spec See merge request gitlab-org/gitlab-ce!16388
\| * \| \| \| \| \|	Remove call to ProjectTeam#<< in MR API spec	Sean McGivern	2018-01-11	1	-1/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch '38068-commits-count' into 'master'	Yorick Peterse	2018-01-11	5	-0/+68
\|\ \ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Store the number of merge request commits in merge_request_diffs.commits_count" Closes #38068 See merge request gitlab-org/gitlab-ce!16164
\| * \| \| \| \| \|	Denormalize commits count for merge request diffs38068-commits-count	Jan Provaznik	2018-01-10	5	-0/+68
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	For each MR diff an extra 'SELECT COUNT()' is executed to get number of commits for the diff. Overall time to get counts for all MR diffs may be quite expensive. To speed up loading of MR info, information about number of commits is stored in a MR diff's extra column. Closes #38068
* \| \| \| \| \| \|	Merge branch '41613-fix-redundant-modal' into 'master'	Filipa Lacerda	2018-01-11	2	-45/+61
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make modal dialog common for Groups tree app Closes #41613 See merge request gitlab-org/gitlab-ce!16311
\| * \| \| \| \| \| \|	Update tests to cover modal dialog	Kushal Pandya	2018-01-11	1	-12/+54
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Update tests for modal changes	Kushal Pandya	2018-01-11	1	-33/+7
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'Ben305/gitlab-ce-36669-default-mr-title-with-external-issues' ↵	Grzegorz Bizon	2018-01-11	1	-2/+24
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Resolve "Incorrect default merge request title when Jira activated" Closes #36669 See merge request gitlab-org/gitlab-ce!16356
\| * \| \| \| \| \| \| \|	Never set special MR titles for external issues	Sean McGivern	2018-01-10	1	-0/+22
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Fix incorrect default merge request title when external issue tracker is ↵	Benedikt Huss	2018-01-09	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	activated
* \| \| \| \| \| \| \| \|	Merge branch '4020-rebase-message' into 'master'	Sean McGivern	2018-01-11	1	-7/+7
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve 'Rebase fails with "something went wrong" and huge ugly conflict error.' Closes #41820 See merge request gitlab-org/gitlab-ce!16326
\| * \| \| \| \| \| \| \| \|	Store only generic message if rebase fails4020-rebase-message	Jan Provaznik	2018-01-09	1	-7/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Instead of storing detailed rebase error, only a generic message is stored with MR. The reason is that this message is exposed and displayed to end user and there is no reason to expose detailed backend information. Error message is still logged so detailed information can be found in logfile by admin if needed. Related #41820
* \| \| \| \| \| \| \| \| \|	Merge branch '39214__pipeline_api' into 'master'	Sean McGivern	2018-01-11	2	-0/+47
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add `pipelines` endpoint to merge requests API Closes #39214 See merge request gitlab-org/gitlab-ce!15454
\| * \| \| \| \| \| \| \| \| \|	Fix style	Tony Rom	2018-01-10	1	-0/+6
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Add `pipelines` endpoint to merge requests API	Tony Rom	2017-12-15	2	-0/+41
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'gcp-fix' into 'master'	Kamil Trzciński	2018-01-11	5	-21/+92
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix GCP redirect Closes #41867 See merge request gitlab-org/gitlab-ce!16355
\| * \| \| \| \| \| \| \| \| \| \|	Change failed GCP billing check wording	Matija Čupić	2018-01-11	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Refactor GCP redirect test suite	Matija Čupić	2018-01-11	4	-23/+90
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Fix GCP Controller spec	Matija Čupić	2018-01-11	1	-1/+5
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Fix CheckGcpProjectBillingWorker spec	Matija Čupić	2018-01-11	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Fix CheckGcpProjectBillingService spec	Matija Čupić	2018-01-11	1	-2/+2
\| \| \|_\|_\|_\|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	fixed abuse_reports spec	Phil Hughes	2018-01-11	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'dispatcher-sessions' into 'master'	Phil Hughes	2018-01-11	2	-2/+2
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor dispatcher sessions path See merge request gitlab-org/gitlab-ce!16362
\| * \| \| \| \| \| \| \| \| \| \|	Fix specsdispatcher-sessions	Clement Ho	2018-01-10	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Fix up Web IDE user preference copy and buttons	Jose Ivan Vargas	2018-01-11	3	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'sh-fix-award-emoji-move-issues' into 'master'	Grzegorz Bizon	2018-01-11	1	-3/+9
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix bug where award emojis would be lost when moving issues between projects Closes #33423 See merge request gitlab-org/gitlab-ce!16377
\| * \| \| \| \| \| \| \| \| \| \|	Fix bug where award emojis would be lost when moving issues between projectssh-fix-award-emoji-move-issues	Stan Hu	2018-01-10	1	-3/+9
\| \| \|_\|_\|_\|_\|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #33423
* \| \| \| \| \| \| \| \| \| \|	Merge branch '41491-fix-nil-blob-name-error' into 'master'	Annabel Dunstone Gray	2018-01-10	1	-1/+14
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix 500 error when visiting a commit where the blobs do not exist (nil blobs) Closes #41491 See merge request gitlab-org/gitlab-ce!16237
\| * \| \| \| \| \| \| \| \| \| \|	Fix 500 when visiting a commit where blobs do not exist (nil blobs)41491-fix-nil-blob-name-error	Eric Eastwood	2018-01-09	1	-1/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix https://gitlab.com/gitlab-org/gitlab-ce/issues/41491
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'git-write-ref-prep' into 'master'	Robert Speicher	2018-01-10	1	-3/+2
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Gitlab::Git::Repository#write_ref client-prep take 2 Closes gitaly#793 See merge request gitlab-org/gitlab-ce!16287
\| * \| \| \| \| \| \| \| \| \| \|	Client-prep Gitlab::Git::Repository#write_refgit-write-ref-prep	Kim "BKC" Carlbäcker	2018-01-09	1	-3/+2
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'da-verify-integrity-of-uploaded-files' into 'master'	Robert Speicher	2018-01-10	1	-0/+27
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|_\|_\|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Verify integrity of uploaded files" Closes #39949 See merge request gitlab-org/gitlab-ce!16297
\| * \| \| \| \| \| \| \| \| \| \|	Refactoring spec for the gitlab:uploads:check rake task	Douglas Barbosa Alexandre	2018-01-08	1	-6/+5
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Make Rubocop happy	Douglas Barbosa Alexandre	2018-01-08	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Add spec for gitlab:uploads rake tasks	Douglas Barbosa Alexandre	2018-01-08	1	-0/+28
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch '34312-eslint-vue-plugin' into 'master'	Phil Hughes	2018-01-10	7	-14/+14
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Add eslint-vue-plugin to our stack" Closes #34312 See merge request gitlab-org/gitlab-ce!16210
\| * \| \| \| \| \| \| \| \| \| \|	Fix broken specs	Filipa Lacerda	2018-01-09	4	-7/+8
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	[ci skip] Fix pagination specs	Filipa Lacerda	2018-01-09	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \|