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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Fix hashed storage with project transfers to another namespacesh-port-hashed-storage-transfer-fix	Stan Hu	2017-11-16	1	-9/+17
\| \| \| \| \| \| \| \|	With hashed storage enabled, we would fail to transfer a project to another namespace because the provided paths were wrong. Instead, we should not attempt to move paths at all. Closes gitlab-org/gitlab-ee#4056
*	Resolve "lock/confidential issuable sidebar custom svg icons iteration"	Luke "Jared" Bennett	2017-11-16	8	-57/+93
\|
*	Merge branch 'cache-user-keys-count' into 'master'	Douwe Maan	2017-11-16	8	-28/+81
\|\ \| \| \| \| \| \| \| \|	Cache the number of user SSH keys See merge request gitlab-org/gitlab-ce!15401
\| *	Cache the number of user SSH keyscache-user-keys-count	Yorick Peterse	2017-11-16	8	-28/+81
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	By caching the number of personal SSH keys we reduce the number of queries necessary on pages such as ProjectsController#show (which can end up querying this data multiple times). The cache is refreshed/flushed whenever an SSH key is added, removed, or when a user is removed.
* \|	Merge branch 'brand_header_change' into 'master'	Annabel Dunstone Gray	2017-11-16	3	-2/+9
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	When a custom header logo is present, don't show GitLab type logo See merge request gitlab-org/gitlab-ce!15410
\| * \|	When a custom header logo is present, don't show GitLab type logo	Drew Blessing	2017-11-15	3	-2/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In the new navigation header, when a user uploads a custom header logo GitLab will still show the 'GitLab' type logo. This is often undesirable as the user may want to upload a logo with their own name present. This change will toggle the GitLab type logo if a custom header logo is present.
* \| \|	Merge branch 'dm-notes-actions-noteable-for-update' into 'master'	Sean McGivern	2017-11-16	2	-3/+8
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make sure NotesActions#noteable returns a Noteable in the update action Closes #40208 See merge request gitlab-org/gitlab-ce!15421
\| * \| \|	Make sure NotesActions#noteable returns a Noteable in the update actiondm-notes-actions-noteable-for-update	Douwe Maan	2017-11-16	2	-3/+8
\| \|/ /
* \| \|	Merge branch 'backport-delete-epic' into 'master'	Filipa Lacerda	2017-11-16	5	-6/+40
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Backport delete epic changes Closes #40162 See merge request gitlab-org/gitlab-ce!15414
\| * \| \|	Backport delete epic changesbackport-delete-epic	Clement Ho	2017-11-15	5	-6/+40
\| \| \| \|
* \| \| \|	Resolve "Clicking on GPG verification badge jumps to top of the page"	Mike Greiling	2017-11-16	2	-2/+2
\|/ / /
* \| \|	Merge branch 'update-emoji-digests-with-latest-from-gemojione' into 'master'	Filipa Lacerda	2017-11-15	8	-1031/+1058
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update Emoji digests and assets with latest from Gemojione v3.3.0 Closes #32634 See merge request gitlab-org/gitlab-ce!15390
\| * \| \|	Move :gay_pride_flag: to flags categoryupdate-emoji-digests-with-latest-from-gemojione	Eric Eastwood	2017-11-15	2	-2/+0
\| \| \| \|
\| * \| \|	Add rainbow_flag to emoji support map	Eric Eastwood	2017-11-15	2	-6/+31
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Tested on the following platforms that split the emoji into separate characters currently. - Windows 10 FCU - Chrome 62.0.3202.89 - Firefox 57.0b14 - MS Edge 41.16299.15.0 - macOS 10.12.6 - Chrome 63.0.3239.40 - Safari 11.0.1 (12604.3.5.1.1) - Firefox 57.0 - Ubuntu 16.04 - Chromium 62.0.3202.75 - Firefox 56.0
\| * \| \|	Regenerate emoji digests with latest gemojione	Eric Eastwood	2017-11-14	8	-1025/+1029
\| \| \| \|
* \| \| \|	Merge branch 'tree_item_limit' into 'master'	Douwe Maan	2017-11-15	3	-4/+25
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Truncate tree to max 1,000 items and display notice to users Closes #39746 See merge request gitlab-org/gitlab-ce!15333
\| * \| \| \|	Truncate tree to max 1,000 items and display notice to users	Drew Blessing	2017-11-15	3	-4/+25
\| \| \|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rendering ten thousands of tree items consumes a lot of server time and can cause timeouts in extreme cases. Realistically, displaying more than 1,000 files is probably not useful so truncate and show the user a notice instead. 'Find files' can be used to locate specific files beyond the 1,000 limit.
* \| \| \|	Merge branch ↵	Douwe Maan	2017-11-15	4	-10/+20
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'40122-only-one-note-webhook-is-triggered-when-a-comment-with-time-spent-is-added' into 'master' Resolve "Only one note webhook is triggered when a comment with time spent is added" Closes #40122 See merge request gitlab-org/gitlab-ce!15381
\| * \| \| \|	Add total_time_spent to the `changes` hash in issuable Webhook payloads40122-only-one-note-webhook-is-triggered-when-a-comment-with-time-spent-is-added	Rémy Coutable	2017-11-15	4	-10/+20
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \|	Fix dumping hashed storage based repository	Gabriel Mazetto	2017-11-15	1	-1/+1
\|/ / /
* \| \|	Merge branch 'dm-import-service-polymorphism' into 'master'40186-the-ee_compat_check-job-sometimes-fail-on-the-git-apply-3way-step-for-forks	Yorick Peterse	2017-11-15	2	-15/+11
\|\ \ \ \| \|_\|/ \|/\| \| \| \| \| \| \| \|	Prefer polymorphism over specific type checks in Import service See merge request gitlab-org/gitlab-ce!15397
\| * \|	Prefer polymorphism over specific type checks in Import servicedm-import-service-polymorphism	Douwe Maan	2017-11-15	2	-15/+11
\| \| \|
* \| \|	Merge branch 'update-merge-worker-metrics' into 'master'	Sean McGivern	2017-11-15	1	-1/+17
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add simple logging to UpdateMergeRequestsWorker#perform See merge request gitlab-org/gitlab-ce!15360
\| * \| \|	[ci-skip] lintingupdate-merge-worker-metrics	Micael Bergeron	2017-11-14	1	-1/+0
\| \| \| \|
\| * \| \|	rework the logging to be simpler and add a threshold	micael.bergeron	2017-11-14	1	-6/+12
\| \| \| \|
\| * \| \|	add simple logging to UpdateMergeRequestsWorker#perform	micael.bergeron	2017-11-13	1	-1/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	this is to try to debug #35914
* \| \| \|	Merge branch 'ce-backport-39009-fix-approvals-showing-up-in-empty-mr-widget' ↵	Phil Hughes	2017-11-15	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 'master' Remove approvals when in empty MR widget state -- CE backport See merge request gitlab-org/gitlab-ce!15362
\| * \| \| \|	Backport spec changes from EE remove approvals in empty statece-backport-39009-fix-approvals-showing-up-in-empty-mr-widget	Eric Eastwood	2017-11-13	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	See https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/3376
* \| \| \| \|	Resolve "Internationalization support for Prometheus Service Configuration"	Jose Ivan Vargas Lopez	2017-11-15	2	-18/+15
\| \| \| \| \|
* \| \| \| \|	40161 Remove extra margin from wordmark in header40161-extra-margin-on-svg-logo-in-header	tauriedavis	2017-11-14	1	-1/+1
\| \|_\|_\|/ \|/\| \| \|
* \| \| \|	Merge branch 'bvl-subgroup-in-dropdowns' into 'master'	Sean McGivern	2017-11-14	2	-3/+15
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Include child projects a user can manage in namespace dropdowns Closes #39987 See merge request gitlab-org/gitlab-ce!15294
\| * \| \| \|	Guarantee the order of groups in the dropdownbvl-subgroup-in-dropdowns	Bob Van Landuyt	2017-11-14	1	-2/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	So the groups with the same parent are listed together. The recursive cte seemed to do it by itself, but it is not guaranteed. By ordering on the `route.path` that includes every parent group, we can assume they're going to be in the right order.
\| * \| \| \|	Include child projects a user can manage in namespace dropdowns	Bob Van Landuyt	2017-11-14	2	-2/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	These dropdown options are used for creating and transfering projects.
* \| \| \| \|	Merge branch 'fix-typo' into 'master'	Annabel Dunstone Gray	2017-11-14	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix typo See merge request gitlab-org/gitlab-ce!15358
\| * \| \| \| \|	Fix typofix-typo	Clement Ho	2017-11-13	1	-1/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Stops page reload when changing tabs or pages - uses API requests instead	Filipa Lacerda	2017-11-14	5	-120/+180
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'enable-scss-lint-unnecessary-mantissa' into 'master'	Clement Ho	2017-11-14	4	-9/+9
\|\ \ \ \ \ \ \| \|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Enable UnnecessaryMantissa in scss-lint See merge request gitlab-org/gitlab-ce!15255
\| * \| \| \| \|	Enable UnnecessaryMantissa in scss-lint	Takuya Noguchi	2017-11-09	4	-9/+9
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'issue_40058' into 'master'	Sean McGivern	2017-11-14	1	-1/+2
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prevent position update for image diff notes Closes #40058 See merge request gitlab-org/gitlab-ce!15357
\| * \| \| \| \| \|	Prevents position update for image diff notesissue_40058	Felipe Artur	2017-11-13	1	-1/+2
\| \| \|_\|_\|/ / \| \|/\| \| \| \|
* \| \| \| \| \|	Merge branch 'fix-filter-by-my-reaction' into 'master'	Sean McGivern	2017-11-14	1	-0/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix filter by my reaction is not working Closes #39930 See merge request gitlab-org/gitlab-ce!15345
\| * \| \| \| \| \|	Fix filter by my reaction is not working	Hiroyuki Sato	2017-11-13	1	-0/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'fix/sm/31771-do-not-allow-jobs-to-be-erased-new' into 'master'	Kamil Trzciński	2017-11-14	5	-4/+22
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Do not allow jobs to be erased Closes #31771 See merge request gitlab-org/gitlab-ce!15216
\| * \ \ \ \ \ \	Merge branch 'master' into fix/sm/31771-do-not-allow-jobs-to-be-erased-new	Shinya Maeda	2017-11-07	154	-1018/+1456
\| \|\ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Add doc. Fix spec. Add erase_build in protected_ref rule	Shinya Maeda	2017-11-07	3	-6/+10
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Do not allow jobs to be erased	Shinya Maeda	2017-11-06	5	-2/+16
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch '39884-fix-pipeline-transition-with-single-manual-action' into ↵	Kamil Trzciński	2017-11-14	1	-2/+2
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Make sure all pipelines would go to pending once Closes #39884 See merge request gitlab-org/gitlab-ce!15251
\| * \| \| \| \| \| \| \| \|	Make sure all pipelines would go to pending once39884-fix-pipeline-transition-with-single-manual-action	Lin Jen-Shin	2017-11-09	1	-2/+2
\| \| \|_\|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Without this fix, pipeline could go from skipped to running directly, bypassing the transition for: [:created, :pending] => :running And this is responsible for setting up started_at. Without this fix, started_at would never be set. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/39884
* \| \| \| \| \| \| \| \|	Merge branch '40092-fix-cluster-size' into 'master'	Tim Zallmann	2017-11-14	2	-1/+34
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Formats bytes to human readable number in registry table See merge request gitlab-org/gitlab-ce!15359
\| * \| \| \| \| \| \| \| \|	Formats bytes to human reabale number in registry table40092-fix-cluster-size	Filipa Lacerda	2017-11-13	2	-1/+34
\| \| \| \| \| \| \| \| \| \|