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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge remote-tracking branch 'upstream/master' into no-ivar-in-modules	Lin Jen-Shin	2017-11-17	332	-3047/+15389
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* upstream/master: (507 commits) Add dropdowns documentation Convert migration to populate latest merge request ID into a background migration Set 0.69.0 instead of latest for codeclimate image De-duplicate background migration matchers defined in spec/support/migrations_helpers.rb Update database_debugging.md Update database_debugging.md Move installation of apps higher Change to Google Kubernetes Cluster and add internal links Add Ingress description from official docs Add info on creating your own k8s cluster from the cluster page Add info about the installed apps in the Cluster docs Resolve "lock/confidential issuable sidebar custom svg icons iteration" Update HA README.md to clarify GitLab support does not troubleshoot DRBD. Update license_finder to 3.1.1 Make sure NotesActions#noteable returns a Noteable in the update action Cache the number of user SSH keys Adjust openid_connect_spec to use `raise_error` Resolve "Clicking on GPG verification badge jumps to top of the page" Add changelog for container repository path update Update container repository path reference ...
\| *	Merge branch 'sh-background-migration-move-mr-diff-id' into 'master'	Sean McGivern	2017-11-17	2	-6/+71
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \|	Convert migration to populate latest merge request ID into a background migration See merge request gitlab-org/gitlab-ce!15440
\| \| *	Convert migration to populate latest merge request ID into a background ↵	Stan Hu	2017-11-17	2	-6/+71
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	migration This is to smear updates over a few hours to avoid causing excessive replication lag as seen in https://gitlab.com/gitlab-com/infrastructure/issues/3235.
\| * \|	Merge branch 'rc/use-existing-url-helper' into 'master'	Grzegorz Bizon	2017-11-17	2	-13/+10
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replace ci_status_path with pipeline_path See merge request gitlab-org/gitlab-ce!15369
\| \| * \|	Replace ci_status_path with pipeline_pathrc/use-existing-url-helper	Rémy Coutable	2017-11-14	2	-13/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \|	De-duplicate background migration matchers defined in ↵sh-deduplicate-background-migration-specs	Stan Hu	2017-11-16	2	-32/+6
\| \| \|/ \| \|/\| \| \| \| \| \| \|	spec/support/migrations_helpers.rb
\| * \|	Resolve "lock/confidential issuable sidebar custom svg icons iteration"	Luke "Jared" Bennett	2017-11-16	1	-3/+3
\| \| \|
\| * \|	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	4	-1/+176
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	4	-1/+176
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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 'dm-notes-actions-noteable-for-update' into 'master'	Sean McGivern	2017-11-16	1	-0/+23
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-0/+23
\| \| \|/ / /
\| * \| \| \|	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	3	-14/+63
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	3	-14/+63
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'fix/git-env-repo-paths' into 'master'	Douwe Maan	2017-11-16	1	-10/+36
\| \|\ \ \ \ \ \ \| \| \|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-10/+36
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Update container repository path reference	Grzegorz Bizon	2017-11-16	1	-0/+18
\| \| \|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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 ↵	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 'update-emoji-digests-with-latest-from-gemojione' into 'master'	Filipa Lacerda	2017-11-15	2	-7/+31
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update Emoji digests and assets with latest from Gemojione v3.3.0 Closes #32634 See merge request gitlab-org/gitlab-ce!15390
\| \| * \| \| \| \| \|	Add rainbow_flag to emoji support map	Eric Eastwood	2017-11-15	2	-7/+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
\| * \| \| \| \| \| \|	Merge branch 'tree_item_limit' into 'master'	Douwe Maan	2017-11-15	1	-3/+29
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	1	-3/+29
\| \| \| \|_\|_\|/ / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	3	-13/+33
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'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	3	-13/+33
\| \| \|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Rémy Coutable <remy@rymai.me>
\| * \| \| \| \| \| \|	Fix dumping hashed storage based repository	Gabriel Mazetto	2017-11-15	1	-0/+4
\| \|/ / / / / /
\| * \| \| \| \| \|	Merge branch 'update-merge-worker-metrics' into 'master'	Sean McGivern	2017-11-15	1	-0/+12
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add simple logging to UpdateMergeRequestsWorker#perform See merge request gitlab-org/gitlab-ce!15360
\| \| * \| \| \| \| \|	rework the logging to be simpler and add a threshold	micael.bergeron	2017-11-14	1	-3/+9
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	add simple logging to UpdateMergeRequestsWorker#perform	micael.bergeron	2017-11-13	1	-0/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	-9/+10
\| \|\ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	-9/+10
\| \| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	See https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/3376
\| * \| \| \| \| \|	Merge branch 'gitaly-fix-broken-specs' into 'master'	Robert Speicher	2017-11-14	1	-2/+6
\| \|\ \ \ \ \ \ \| \| \|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	skip_gitaly_mock disables Gitaly in specs See merge request gitlab-org/gitlab-ce!15383
\| \| * \| \| \| \|	we need to disable gitaly for some tests	Kim "BKC" Carlbäcker	2017-11-14	1	-2/+6
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'bvl-subgroup-in-dropdowns' into 'master'	Sean McGivern	2017-11-14	5	-8/+141
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Include child projects a user can manage in namespace dropdowns Closes #39987 See merge request gitlab-org/gitlab-ce!15294
\| \| * \| \| \| \| \|	Include child projects a user can manage in namespace dropdowns	Bob Van Landuyt	2017-11-14	5	-8/+141
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	These dropdown options are used for creating and transfering projects.
\| * \| \| \| \| \| \|	Stops page reload when changing tabs or pages - uses API requests instead	Filipa Lacerda	2017-11-14	6	-132/+199
\| \| \|_\|_\|_\|/ / \| \|/\| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'bvl-fork-network-memberships-for-deleted-source' into 'master'	Yorick Peterse	2017-11-14	1	-1/+8
\| \|\ \ \ \ \ \ \| \| \|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't try to create fork network memberships for forks of forks Closes #40072 See merge request gitlab-org/gitlab-ce!15366
\| \| * \| \| \| \|	Don't try to create fork network memberships for forks of forksbvl-fork-network-memberships-for-deleted-source	Bob Van Landuyt	2017-11-14	1	-1/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In case the root project of a Fork-of-fork is deleted, the ForkNetwork and the membership for that fork network is never created. In this case we shouldn't try to create the membership, since the parent membership will never be created. This means that these fork networks will be lost.
\| * \| \| \| \| \|	Merge branch 'issue_40058' into 'master'	Sean McGivern	2017-11-14	1	-0/+6
\| \|\ \ \ \ \ \ \| \| \|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	-0/+6
\| \| \| \|_\|/ / \| \| \|/\| \| \|
\| * \| \| \| \|	Merge branch 'fix-filter-by-my-reaction' into 'master'	Sean McGivern	2017-11-14	1	-1/+54
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	-1/+54
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'fix/sm/31771-do-not-allow-jobs-to-be-erased-new' into 'master'	Kamil Trzciński	2017-11-14	5	-1/+141
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Do not allow jobs to be erased Closes #31771 See merge request gitlab-org/gitlab-ce!15216
\| \| * \| \| \| \| \|	Reduce changesfix/sm/31771-do-not-allow-jobs-to-be-erased-new	Shinya Maeda	2017-11-07	2	-30/+25
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Improve spec	Shinya Maeda	2017-11-07	3	-29/+71
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Merge branch 'master' into fix/sm/31771-do-not-allow-jobs-to-be-erased-new	Shinya Maeda	2017-11-07	116	-1550/+3090
\| \| \|\ \ \ \ \ \
\| \| * \| \| \| \| \| \|	Add doc. Fix spec. Add erase_build in protected_ref rule	Shinya Maeda	2017-11-07	5	-14/+59
\| \| \| \| \| \| \| \| \|