delta/gitlab/gitlab-ce.git/spec, branch docs/db-debugging gitlab.com: gitlab-org/gitlab-ce.git Merge branch 'update-emoji-digests-with-latest-from-gemojione' into 'master' 2017-11-15T18:08:25+00:00 Filipa Lacerda filipa@gitlab.com 2017-11-15T18:08:25+00:00 0f5faea404ab514917adf06768f1a0991482b5b5 Update Emoji digests and assets with latest from Gemojione v3.3.0 Closes #32634 See merge request gitlab-org/gitlab-ce!15390 
Update Emoji digests and assets with latest from Gemojione v3.3.0

Closes #32634

See merge request gitlab-org/gitlab-ce!15390
 Merge branch 'tree_item_limit' into 'master' 2017-11-15T17:46:21+00:00 Douwe Maan douwe@gitlab.com 2017-11-15T17:46:21+00:00 69953fae36560773a06bbc426747e3dac6aa1ae1 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

Closes #39746

See merge request gitlab-org/gitlab-ce!15333
 Merge branch '40122-only-one-note-webhook-is-triggered-when-a-comment-with-time-spent-is-added' into 'master' 2017-11-15T17:23:29+00:00 Douwe Maan douwe@gitlab.com 2017-11-15T17:23:29+00:00 f995f8404ddd1f692f9e07be4f5266a062eaa702 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 
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 payloads 2017-11-15T14:42:19+00:00 Rémy Coutable remy@rymai.me 2017-11-14T17:55:00+00:00 05c10c9bf77db2a9e37e61d1953ef0150289322d Signed-off-by: Rémy Coutable <remy@rymai.me> 
Signed-off-by: Rémy Coutable <remy@rymai.me>
Truncate tree to max 1,000 items and display notice to users 2017-11-15T14:28:33+00:00 Drew Blessing drew@gitlab.com 2017-11-10T20:39:00+00:00 03b1bcbb686f8e56fe6c6303adacdc01c5403790 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. 
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.
Fix dumping hashed storage based repository 2017-11-15T14:20:36+00:00 Gabriel Mazetto brodock@gmail.com 2017-11-15T14:20:36+00:00 f4c7fea613ad996d855180c9c25f3d0cdca5121a 






Merge branch 'update-merge-worker-metrics' into 'master'
2017-11-15T09:20:15+00:00

Sean McGivern
sean@mcgivern.me.uk

2017-11-15T09:20:15+00:00

5c600294a26ae8df430f64d73753d6eaadd9e427

Add simple logging to UpdateMergeRequestsWorker#perform

See merge request gitlab-org/gitlab-ce!15360




Add simple logging to UpdateMergeRequestsWorker#perform

See merge request gitlab-org/gitlab-ce!15360






Merge branch 'ce-backport-39009-fix-approvals-showing-up-in-empty-mr-widget' into 'master'
2017-11-15T09:00:27+00:00

Phil Hughes
me@iamphill.com

2017-11-15T09:00:27+00:00

068f9df2bdf8b758360dbb81a449986b2636bc3b

Remove approvals when in empty MR widget state -- CE backport

See merge request gitlab-org/gitlab-ce!15362




Remove approvals when in empty MR widget state -- CE backport

See merge request gitlab-org/gitlab-ce!15362






Add rainbow_flag to emoji support map
2017-11-15T07:54:52+00:00

Eric Eastwood
contact@ericeastwood.com

2017-11-14T21:59:23+00:00

9e5db3e26169dd25ae852e4197ef02ba0a3ef84a

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





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 'gitaly-fix-broken-specs' into 'master'
2017-11-14T22:19:20+00:00

Robert Speicher
robert@gitlab.com

2017-11-14T22:19:20+00:00

475e33c0bb4733f0cae56e47fdb7eef6a64fde7f

skip_gitaly_mock disables Gitaly in specs

See merge request gitlab-org/gitlab-ce!15383




skip_gitaly_mock disables Gitaly in specs

See merge request gitlab-org/gitlab-ce!15383