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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Add basic docs for troubleshooting database problemsdocs/db-debugging	Eric Eastwood	2017-11-15	2	-0/+50
\|
*	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>
* \| \|	Merge branch 'fix-typo' into 'master'	Sean McGivern	2017-11-15	1	-1/+1
\|\ \ \ \| \|/ / \|/\| \| \| \| \| \| \| \|	fix typo See merge request gitlab-org/gitlab-ce!15374
\| * \|	Update getting_started_part_one.md	Chế Tiệp Chân Khoa	2017-11-14	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	4	-15/+19
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	4	-15/+19
\| \| \| \|
* \| \| \|	Merge branch 'workhorse-3-3-1' into 'master'	Rémy Coutable	2017-11-15	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update gitlab-workhorse to v3.3.1 See merge request gitlab-org/gitlab-ce!15371
\| * \| \| \|	Update gitlab-workhorse to v3.3.1	Nick Thomas	2017-11-14	1	-1/+1
\| \| \| \| \|
* \| \| \| \|	Merge branch 'rs-qa-default-timeout' into 'master'	Grzegorz Bizon	2017-11-15	1	-1/+1
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Raise the QA Capybara's default wait time from 4 to 10 Closes gitlab-qa#103 See merge request gitlab-org/gitlab-ce!15382
\| * \| \| \| \|	Raise the QA Capybara's default wait time from 4 to 10rs-qa-default-timeout	Robert Speicher	2017-11-14	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We were seeing intermittent failures on CI due to slow responses from certain endpoints.
* \| \| \| \| \|	Merge branch 'update-merge-worker-metrics' into 'master'	Sean McGivern	2017-11-15	3	-1/+34
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	2	-9/+21
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	[ci-skip] add changelog	GitLab Development	2017-11-13	1	-0/+5
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	add simple logging to UpdateMergeRequestsWorker#perform	micael.bergeron	2017-11-13	2	-1/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	2	-10/+11
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	2	-10/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	See https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/3376
* \| \| \| \| \| \| \|	Merge branch ↵	Phil Hughes	2017-11-15	3	-18/+20
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	'33338-internationalization-support-for-prometheus-service-configuration' into 'master' Resolve "Internationalization support for Prometheus Service Configuration" Closes #33338 See merge request gitlab-org/gitlab-ce!15336
\| * \| \| \| \| \| \| \|	Resolve "Internationalization support for Prometheus Service Configuration"	Jose Ivan Vargas Lopez	2017-11-15	3	-18/+20
\|/ / / / / / / /
* \| \| \| \| \| \| \|	Merge branch 'patch-2' into 'master'	Achilleas Pipinellis	2017-11-15	1	-1/+1
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Replace 'charts' with 'chart' See merge request gitlab-org/gitlab-ce!15385
\| * \| \| \| \| \| \| \|	Replace 'charts' with 'chart'	Nestor Pestelos	2017-11-15	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Auto DevOps' gitlab-ci.yml expects a directory named 'chart'. See also: https://gitlab.com/gitlab-org/gitlab-ci-yml/merge_requests/114
* \| \| \| \| \| \| \| \|	Merge branch '38007-update-licensing-docs' into 'master'	Achilleas Pipinellis	2017-11-15	1	-3/+3
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update licensing docs to clarify process for node modules Closes #38007 See merge request gitlab-org/gitlab-ce!14575
\| * \| \| \| \| \| \| \| \|	update licensing docs to mention that we check node_modules for license ↵38007-update-licensing-docs	Mike Greiling	2017-09-29	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	information as well
* \| \| \| \| \| \| \| \| \|	Merge branch '40161-extra-margin-on-svg-logo-in-header' into 'master'	Annabel Dunstone Gray	2017-11-15	2	-1/+6
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	40161 Remove extra margin from wordmark in header Closes #40161 See merge request gitlab-org/gitlab-ce!15389
\| * \| \| \| \| \| \| \| \| \|	40161 Remove extra margin from wordmark in header40161-extra-margin-on-svg-logo-in-header	tauriedavis	2017-11-14	2	-1/+6
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	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
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Update CHANGELOG.md for 10.1.4	Felipe Artur	2017-11-14	5	-21/+10
\| \|_\|_\|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \| \| \| \| \|	Merge branch 'master' of github.com:gitlabhq/gitlabhq	Felipe Artur	2017-11-14	0	-0/+0
\|\ \ \ \ \ \ \ \ \ \ \| \| \|_\|/ / / / / / / \| \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch dev/master into master	Felipe Artur	2017-11-14	0	-0/+0
\|\ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Prevent error when authorizing an admin-created OAauth application without a ↵	Douwe Maan	2017-11-13	2	-5/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	set owner
\| * \| \| \| \| \| \| \| \|	Move update_project_counter_caches? out of issue and merge request	George Andrinopoulos	2017-11-13	7	-39/+14
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Add externalized strings	George Andrinopoulos	2017-11-13	2	-4/+4
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Add feature test to milestone	George Andrinopoulos	2017-11-13	2	-0/+35
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Move total time spend calculation to milestoneish	George Andrinopoulos	2017-11-13	7	-77/+24
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Fix static code analysis offence	George Andrinopoulos	2017-11-13	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Fix collapsed sidebar messages and icon	George Andrinopoulos	2017-11-13	5	-6/+18
\| \| \| \| \| \| \| \| \| \|