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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Don't add a trailing slash in group redirects40230-groups-gitlab-org-labels-json-redirects-to-groups-gitlab-org-labels-json	Sean McGivern	2017-11-16	2	-14/+20
\| \| \| \| \| \| \| \|	Because we ignored the format, a request to `/groups/foo/labels.json` would redirect to `/groups/foo/-/labels/.json`. But really, it's worse than that, because unless the request contained a trailing slash, we shouldn't add one. Now, we only _keep_ a trailing slash, but don't _add_ one.
*	Merge branch 'bvl-isolate-fork-network-background-migrations' into 'master'	Rémy Coutable	2017-11-16	1	-11/+11
\|\ \| \| \| \| \| \| \| \|	Isolate the fork network background migrations See merge request gitlab-org/gitlab-ce!15393
\| *	Isolate the fork network background migrationsbvl-isolate-fork-network-background-migrations	Bob Van Landuyt	2017-11-15	1	-11/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Before the `PopulateForkNetworksRange` spec would also call the `CreateForkNetworkMemberships` which we would count on in the spec. With this, I'm isolating that, and counting only records created in this particular migration instead.
* \|	Merge branch 'cache-user-keys-count' into 'master'	Douwe Maan	2017-11-16	13	-29/+262
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \|	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	13	-29/+262
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	4	-2/+14
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	4	-2/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	4	-3/+36
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	4	-3/+36
\| \|/ / /
* \| \| \|	Merge branch 'winh-update-license_finder' into 'master'	Rémy Coutable	2017-11-16	3	-3/+43
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update license_finder to 3.1.1 Closes #34955 et #40020 See merge request gitlab-org/gitlab-ce!15319
\| * \| \| \|	Update license_finder to 3.1.1	Winnie Hellmann	2017-11-16	3	-3/+43
\|/ / / /
* \| \| \|	Merge branch 'bvl-adjust-openid_connect_spec' into 'master'	Sean McGivern	2017-11-16	1	-2/+11
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adjust openid_connect_spec to use `raise_error` Closes #40093 See merge request gitlab-org/gitlab-ce!15420
\| * \| \| \|	Adjust openid_connect_spec to use `raise_error`	Bob Van Landuyt	2017-11-16	1	-2/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Using the `raise_error`-matcher instead of `throw_symbol` makes sure our after blocks get called in the test suite.
* \| \| \| \|	Merge branch 'backport-delete-epic' into 'master'	Filipa Lacerda	2017-11-16	8	-20/+103
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	8	-20/+103
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'simplify-docs-review-script' into 'master'	Rémy Coutable	2017-11-16	1	-11/+24
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Change logic of repo name and slugs in docs review script See merge request gitlab-org/gitlab-ce!15395
\| * \| \| \| \| \|	Change logic of repo name and slugs in docs review scriptsimplify-docs-review-script	Achilleas Pipinellis	2017-11-16	1	-11/+24
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We need to make room for Runner and Omnibus docs. This change makes sure the correct values are defined based on CI_PROJECT_NAME.
* \| \| \| \| \| \|	Merge branch 'fix/git-env-repo-paths' into 'master'	Douwe Maan	2017-11-16	3	-11/+51
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use relative git object paths to construct absolute ones before setting Env See merge request gitlab-org/gitlab-ce!15376
\| * \| \| \| \| \| \|	Use relative git object paths to construct absolute ones before setting Envfix/git-env-repo-paths	Ahmad Sherif	2017-11-14	3	-11/+51
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'docs/db-debugging' into 'master'	Yorick Peterse	2017-11-16	2	-0/+50
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add basic docs for troubleshooting database problems See merge request gitlab-org/gitlab-ce!15416
\| * \| \| \| \| \| \|	Add basic docs for troubleshooting database problemsdocs/db-debugging	Eric Eastwood	2017-11-15	2	-0/+50
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'jramsay-30140-update-docs' into 'master'	Douwe Maan	2017-11-16	1	-1/+2
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add readme only default project view preference See merge request gitlab-org/gitlab-ce!15415
\| * \| \| \| \| \| \| \|	Add readme only default project view preferencejramsay-30140-update-docs	James Ramsay	2017-11-15	1	-1/+2
\| \| \|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The option to choose readme only as a users default project view was restored in !14900
* \| \| \| \| \| \| \|	Merge branch 'fix/add-attributes-bag-class-to-gitaly-client' into 'master'	Sean McGivern	2017-11-16	5	-32/+39
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add an attributes bag class as a GitalyClient helper See merge request gitlab-org/gitlab-ce!15346
\| * \| \| \| \| \| \| \|	Add an attributes bag class as a GitalyClient helperfix/add-attributes-bag-class-to-gitaly-client	Ahmad Sherif	2017-11-15	5	-32/+39
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'fix/gb/update-registry-path-reference-regexp' into 'master'	Kamil Trzciński	2017-11-16	3	-1/+24
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update container repository path reference Closes #40199 See merge request gitlab-org/gitlab-ce!15417
\| * \| \| \| \| \| \| \| \|	Add changelog for container repository path update	Grzegorz Bizon	2017-11-16	1	-0/+5
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Update container repository path reference	Grzegorz Bizon	2017-11-16	2	-1/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We should allow to use double underscore in the path, and it seems that our container repository path regexp was outdated. See https://github.com/docker/distribution/blob/master/reference/regexp.go
* \| \| \| \| \| \| \| \| \|	Merge branch '40198-fix-gpg-badge-links' into 'master'	Phil Hughes	2017-11-16	3	-2/+8
\|\ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolve "Clicking on GPG verification badge jumps to top of the page" Closes #40198 See merge request gitlab-org/gitlab-ce!15407
\| * \| \| \| \| \| \| \| \|	Resolve "Clicking on GPG verification badge jumps to top of the page"	Mike Greiling	2017-11-16	3	-2/+8
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge branch 'patch-28' into 'master'	Achilleas Pipinellis	2017-11-16	1	-1/+1
\|\ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix Typo in environment create definition See merge request gitlab-org/gitlab-ce!15413
\| * \| \| \| \| \| \| \|	Fix Typo in environment create definition	Lee Matos	2017-11-15	1	-1/+1
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge branch ↵	Mike Greiling	2017-11-15	1	-0/+17
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'39861-follow-up-from-enable-multiple-queries-per-prometheus-graph' into 'master' Resolve "Follow-up from "Enable multiple queries per Prometheus graph"" Closes #39861 See merge request gitlab-org/gitlab-ce!15363
\| * \| \| \| \| \| \| \|	Add missing spec for computed prop strokeDashArray39861-follow-up-from-enable-multiple-queries-per-prometheus-graph	Jose Ivan Vargas	2017-11-13	1	-0/+17
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch '40020-npm-list-errors-for-gitlab-svgs-and-node-pre-gyp' into ↵	Annabel Dunstone Gray	2017-11-15	4	-8/+8
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'master' Resolve "npm list errors for gitlab-svgs and node-pre-gyp" Closes #40020 See merge request gitlab-org/gitlab-ce!15340
\| * \| \| \| \| \| \| \|	Resolve "npm list errors for gitlab-svgs and node-pre-gyp"	Tim Zallmann	2017-11-15	4	-8/+8
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge branch 'update-emoji-digests-with-latest-from-gemojione' into 'master'	Filipa Lacerda	2017-11-15	19	-1064/+1211
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	4	-4/+7
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Add basic emoji development docs	Eric Eastwood	2017-11-15	3	-0/+34
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Add rainbow_flag to emoji support map	Eric Eastwood	2017-11-15	4	-13/+62
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	14	-1050/+1111
\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge branch 'tree_item_limit' into 'master'	Douwe Maan	2017-11-15	5	-7/+59
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	5	-7/+59
\| \| \|_\|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	10	-23/+60
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'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	10	-23/+60
\| \|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
* \| \| \| \| \| \| \| \|	Merge branch '39573-hashed-storage-backup' into 'master'	Stan Hu	2017-11-15	4	-9/+26
\|\ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix gitlab:backup rake for hashed storage based repositories Closes #39573 See merge request gitlab-org/gitlab-ce!15400
\| * \| \| \| \| \| \| \|	Changelog39573-hashed-storage-backup	Gabriel Mazetto	2017-11-15	1	-0/+5
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Fix dumping hashed storage based repository	Gabriel Mazetto	2017-11-15	3	-9/+21
\| \|/ / / / / / /
* \| \| \| \| \| \| \|	Merge branch ↵	Sean McGivern	2017-11-15	1	-3/+3
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'40186-the-ee_compat_check-job-sometimes-fail-on-the-git-apply-3way-step-for-forks' into 'master' Always fetch master from the canonical remote Closes #40186 See merge request gitlab-org/gitlab-ce!15399
\| * \| \| \| \| \| \| \|	Always fetch master from the canonical remote	Rémy Coutable	2017-11-15	1	-3/+3
\| \|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This way, if a fork's master branch is far behind the canonical's master, it won't use the tip of the fork's master branch as merge base and thus won't create a huge and wrong patch file. Signed-off-by: Rémy Coutable <remy@rymai.me>