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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fix broken worktree testgitaly-version-v1.49.0	Zeger-Jan van de Weg	2019-06-25	2	-14/+9
\| \| \| \| \|	The setup was wrong, and due to Gitaly being a bit more strict it had to match up. The test is now accurate and passing again.
*	Update correct worktree path	Paul Okstad	2019-06-24	1	-1/+1
\|
*	Add changelog entry	GitalyBot	2019-06-24	1	-0/+5
\|
*	Update Gitaly version to v1.49.0	GitalyBot	2019-06-24	1	-1/+1
\|
*	Merge branch '63559-remove-avatar-from-sign-in' into 'master'62356-document-and-promote-serviceresponse	Annabel Dunstone Gray	2019-06-24	2	-1/+6
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Avatar in "Please sign in" pattern too large" Closes #63559 See merge request gitlab-org/gitlab-ce!29944
\| *	Resolve "Avatar in "Please sign in" pattern too large"	Marcel van Remmerden	2019-06-24	2	-1/+6
\|/
*	Merge branch 'divergence-graph-fe-rendering' into 'master'	Filipa Lacerda	2019-06-24	10	-54/+366
\|\ \| \| \| \| \| \| \| \|	Render branch divergence graph with Vue See merge request gitlab-org/gitlab-ce!29743
\| *	Render branch divergance graph with Vue	Phil Hughes	2019-06-24	10	-54/+366
\| \|
* \|	Merge branch 'ce-mw-onboarding-mvc-tour' into 'master'	Phil Hughes	2019-06-24	9	-22/+16
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	(CE Port) New user onboarding (Guided Tour) See merge request gitlab-org/gitlab-ce!29927
\| * \|	Add identifiers for onboarding popovers	Martin Wortschack	2019-06-24	9	-22/+16
\|/ / \| \| \| \| \| \| \| \|	- Add button styles for onboarding welcome page - Fix qa selector (due to additional class)
* \|	Merge branch 'sh-remove-token-from-profiling-docs' into 'master'	Kamil Trzciński	2019-06-24	1	-4/+0
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	Remove requirement for personal access token in profiling See merge request gitlab-org/gitlab-ce!29972
\| * \|	Remove requirement for personal access token in profilingsh-remove-token-from-profiling-docs	Stan Hu	2019-06-23	1	-4/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Since https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/23320, personal access tokens are no longer needed for profiling an endpoint since users are stubbed directly.
* \| \|	Merge branch 'search-blob-basenames' into 'master'	Kamil Trzciński	2019-06-24	5	-14/+47
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Build correct basenames for title search results See merge request gitlab-org/gitlab-ce!29898
\| * \| \|	Build correct basenames for title search resultssearch-blob-basenames	Markus Koller	2019-06-20	5	-14/+47
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The "basename" here needs to be the full path without the trailing extension, instead of stripping the leading path as well. This was previously fixed in 2f36efa0871 inside the view, but the problematic code was still present in FoundBlob, and the corresponding spec didn't actually use a child wiki page to properly verify the fix.
* \| \| \|	Merge branch 'patch-65' into 'master'	Kamil Trzciński	2019-06-24	5	-2/+84
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add name & search parameters to project environments API See merge request gitlab-org/gitlab-ce!29385
\| * \| \| \|	Add name & search parameters to project environments API	Lee Tickett	2019-06-24	5	-2/+84
\|/ / / /
* \| \| \|	Merge branch '52366-improved-group-lists-ui' into 'master'	Phil Hughes	2019-06-24	12	-115/+114
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Improved group lists UI" Closes #52366 See merge request gitlab-org/gitlab-ce!26542
\| * \| \| \|	Improve group list UI	Dennis Tang	2019-06-24	12	-115/+114
\| \| \|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This updates the groups list UI to match the style of the project list: - New layout - Improve loading state when loading group children - Larger, responsive text - Icon and text colors changed to secondary - Smaller button sizes - Content list description colors were standardized to body text
* \| \| \|	Merge branch 'ci-pipeline-build-seed-spec-refactor' into 'master'	Kamil Trzciński	2019-06-24	1	-47/+43
\|\ \ \ \ \| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \|	RSpec::Parameterized syntax for CI pipeline build seed specs See merge request gitlab-org/gitlab-ce!29947
\| * \| \|	RSpec::Parameterized syntax for CI pipeline build seed specs	drew cimino	2019-06-21	1	-47/+43
\| \| \| \|
* \| \| \|	Merge branch 'fix-labels-in-hooks' into 'master'	Ash McKenzie	2019-06-24	7	-10/+35
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix label serialisation in issue and note hooks Closes #63473 See merge request gitlab-org/gitlab-ce!29850
\| * \| \| \|	Added labels_hook_attrs methodfix-labels-in-hooks	Jan Provaznik	2019-06-24	4	-2/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Based on review comment fetching labels hook_attrs is now wrapped in an issue's model method.
\| * \| \| \|	Fix label serialisation in issue and note hooks	Sean McGivern	2019-06-20	5	-10/+22
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We were not calling hook_attrs on the labels correctly. Specs were passing because the issues under test did not have any labels!
* \| \| \| \|	Merge branch 'show-confidential-merge-request-button' into 'master'	Bob Van Landuyt	2019-06-24	5	-4/+39
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Show create merge request button on confidential issues See merge request gitlab-org/gitlab-ce!29688
\| * \| \| \| \|	Show create merge request button on confidential issues	Phil Hughes	2019-06-24	5	-4/+39
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://gitlab.com/gitlab-org/gitlab-ce/issues/58583
* \| \| \| \| \|	Merge branch 'update-tar-to-2.2.2' into 'master'	Kushal Pandya	2019-06-24	2	-8/+13
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update tar to 2.2.2 See merge request gitlab-org/gitlab-ce!29949
\| * \| \| \| \|	Update tar to 2.2.2	Takuya Noguchi	2019-06-22	2	-8/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	References: - https://www.npmjs.com/advisories/803 - https://hackerone.com/reports/344595 Signed-off-by: Takuya Noguchi <takninnovationresearch@gmail.com>
* \| \| \| \| \|	Merge branch 'fix-pipeline-schedule-edge-case' into 'master'	Lin Jen-Shin	2019-06-24	3	-38/+42
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	FIX: Scheduled pipelines scheduled to run at the same time as pipeline_schedule_worker gets pushed to the next run Closes #63469 See merge request gitlab-org/gitlab-ce!29848
\| * \| \| \| \| \|	Fix pipeline schedule edge casefix-pipeline-schedule-edge-case	Shinya Maeda	2019-06-24	3	-38/+42
\| \| \|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	If pipeline schedule is to run at the exact same time with when cron worker runs, the pipeline schedule will not be executed at the ideal timing. We fix this bug by comparing the exact matching of ideal and cron worker's next run at.
* \| \| \| \| \|	Merge branch 'sync-merge-ref-upon-mergeability-check' into 'master'	Douwe Maan	2019-06-24	17	-218/+624
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Automatically update MR merge-ref along merge status See merge request gitlab-org/gitlab-ce!29569
\| * \| \| \| \| \|	Avoid touching the MR status if MR is not opened	Oswaldo Ferreira	2019-06-21	3	-5/+34
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Update changelog	Oswaldo Ferreira	2019-06-20	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Only force recheck when merge-ref is outdated	Oswaldo Ferreira	2019-06-20	2	-3/+61
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When recheck flag is true, we make sure the merge-ref is indeed outdated. If it is, we update it along the merge status.
\| * \| \| \| \| \|	Automatically update MR merge-ref along merge status	Oswaldo Ferreira	2019-06-20	18	-219/+538
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This couples the code that transitions the `MergeRequest#merge_status` and refs/merge-requests/:iid/merge ref update. In general, instead of directly telling `MergeToRefService` to update the merge ref, we should rely on `MergeabilityCheckService` to keep both the merge status and merge ref synced. Now, if the merge_status is `can_be_merged` it means the merge-ref is also updated to the latest. We've also updated the logic to be more systematic and less user-based.
* \| \| \| \| \| \|	Merge branch 'gt-remove-tooltip-directive-on-project-avatar-image-component' ↵	Filipa Lacerda	2019-06-24	2	-21/+5
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Remove tooltip directive on project avatar image component Closes #51990 See merge request gitlab-org/gitlab-ce!29631
\| * \| \| \| \| \| \|	Remove tooltip directive on project avatar image component	George Tsiolis	2019-06-21	2	-21/+5
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'services-form-ee-differences' into 'master'	Filipa Lacerda	2019-06-24	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix EE differences in services/_form.html.haml Closes gitlab-ee#11032 See merge request gitlab-org/gitlab-ce!29931
\| * \| \| \| \| \| \| \|	Fix EE differences in services/_form.html.haml	Phil Hughes	2019-06-21	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitlab-ee/issues/11032
* \| \| \| \| \| \| \| \|	Merge branch 'fix-notes-emails-with-group-settings' into 'master'	Douwe Maan	2019-06-24	6	-26/+44
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix notes email with group-level notification email Closes #63355 See merge request gitlab-org/gitlab-ce!29889
\| * \| \| \| \| \| \| \| \|	Fix notes email with group-level notification email	Sean McGivern	2019-06-24	6	-26/+44
\|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	A Noteable doesn't have a group directly, unless it's an epic - we need to look for the project's group to find the right email address.
* \| \| \| \| \| \| \| \|	Merge branch 'remove_create_deployment_from_build_success_worker' into 'master'	Douwe Maan	2019-06-24	2	-56/+0
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove deprecated call in BuildSuccessWorker Closes #63622 See merge request gitlab-org/gitlab-ce!29958
\| * \| \| \| \| \| \| \| \|	Remove deprecated call in BuildSuccessWorkerremove_create_deployment_from_build_success_worker	Thong Kuah	2019-06-24	2	-56/+0
\| \| \|_\|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We now create_deployment on Ci::Build create. No need to call create_deployment again
* \| \| \| \| \| \| \| \|	Merge branch 'zj-bump-gitaly' into 'master'	Douwe Maan	2019-06-24	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Bump GITALY_SERVER_VERSION to v1.48.0 See merge request gitlab-org/gitlab-ce!29974
\| * \| \| \| \| \| \| \| \|	Bump GITALY_SERVER_VERSION to v1.48.0	Zeger-Jan van de Weg	2019-06-24	1	-1/+1
\| \| \|_\|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'docs/add-to-list-of-access-control-functions' into 'master'	Achilleas Pipinellis	2019-06-24	1	-1/+4
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add to list of functionality See merge request gitlab-org/gitlab-ce!29876
\| * \| \| \| \| \| \| \| \|	Add to list of functionality	Evan Read	2019-06-24	1	-1/+4
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge branch ↵	Thong Kuah	2019-06-24	6	-44/+194
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'17690-Protect-TeamCity-builds-for-triggering-when-a-branch-is-deleted-And-add-MR-option' into 'master' Skip TeamCity trigger on branch delete and support MR triggers Closes #13871 and #17690 See merge request gitlab-org/gitlab-ce!29836
\| * \| \| \| \| \| \| \| \|	Adding Raphael Tweitmann as co-author of the fix17690-Protect-TeamCity-builds-for-triggering-when-a-branch-is-deleted-And-add-MR-option	Fabio Pitino	2019-06-21	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Extract common validations from ci services	Raphael Tweitmann	2019-06-21	4	-52/+68
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	DroneCI and TeamCity shared the same validations methods on the data received. These validations were extracted into a concern
\| * \| \| \| \| \| \| \| \|	Skip TeamCity on branch delete and add MR trigger	Nikolay Novikov	2019-06-21	4	-24/+158
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is a take over from a community contribution: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/20990 Skip TeamCity push event when related to branch delete Support merge request events for TeamCity service. Add checkbox for merge request triggers in the TeamCity configuration page.