delta/gitlab/gitlab-ce.git, branch 11-5-stable-patch-4 gitlab.com: gitlab-org/gitlab-ce.git Fix broken karma test 2018-12-18T07:32:05+00:00 Martin Wortschack mwortschack@gitlab.com 2018-12-15T09:50:39+00:00 7b507e87b1d5f487ce51e9f3f1b5aa62e457d32e 






Resolve conflict in lib/api/files.rb
2018-12-17T13:41:53+00:00

Steve Azzopardi
steveazz@outlook.com

2018-12-17T13:41:53+00:00

3271fb360e0c9b6035bfe5c232a3b844749bf8b5

Resolve conflict for https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/23636





Resolve conflict for https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/23636







Merge branch '54826-use-read_repository-scope-on-read-only-files-endpoints' into 'master'
2018-12-17T13:41:02+00:00

Grzegorz Bizon
grzegorz@gitlab.com

2018-12-05T11:34:06+00:00

8e907ede9d772195dedec7348ce8a43610038845

Resolve "Use read_repository scope on read-only files endpoints"

Closes #54826

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





Resolve "Use read_repository scope on read-only files endpoints"

Closes #54826

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







Merge branch '54626-able-to-download-a-single-archive-file-with-api-by-ref-name' into 'master'
2018-12-17T13:30:50+00:00

Grzegorz Bizon
grzegorz@gitlab.com

2018-12-10T10:52:30+00:00

5f28a0bca9f72f9ebd2e0759a786f61a99cc7982

Add endpoint to download single artifact by ref

Closes #54626

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





Add endpoint to download single artifact by ref

Closes #54626

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







Fix conflict in spec/javascripts/notes/components/noteable_discussion_spec.js
2018-12-17T13:19:56+00:00

Winnie Hellmann
winnie@gitlab.com

2018-12-07T10:39:31+00:00

47ec2b9dd0d457a6ada9b4a86131f35b5d9d2944












Fix conflict in app/assets/javascripts/notes/components/noteable_discussion.vue
2018-12-17T13:19:56+00:00

Winnie Hellmann
winnie@gitlab.com

2018-12-07T10:37:29+00:00

d7d868020dbf76d78b4a6c39dd739ea082c2019a












Merge branch 'winh-collapse-discussions' into 'master'
2018-12-17T13:19:55+00:00

Fatih Acet
acetfatih@gmail.com

2018-12-04T10:09:51+00:00

00c44fefb7e89702e5ba68dc4d14ca71e7c9becf

Fix collapsing discussion replies

Closes #54646

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





Fix collapsing discussion replies

Closes #54646

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







Merge branch '54975-fix-web-hooks-rake-task' into 'master'
2018-12-17T13:19:55+00:00

Stan Hu
stanhu@gmail.com

2018-12-06T19:21:29+00:00

a84ee684ad65e9633def8e2dfeeca7588a80d845

Fix gitlab:web_hook tasks

Closes #54975

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

(cherry picked from commit 966e242e836243c29d8097bb272bb4812a0cee15)

73294804 Fix gitlab:web_hook tasks




Fix gitlab:web_hook tasks

Closes #54975

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

(cherry picked from commit 966e242e836243c29d8097bb272bb4812a0cee15)

73294804 Fix gitlab:web_hook tasks






Merge branch 'osw-fix-grouping-by-file-path' into 'master'
2018-12-17T13:19:55+00:00

Nick Thomas
nick@gitlab.com

2018-12-05T13:40:24+00:00

17016e833f837256a0b4b36b0b6d953bbcd2cb4e

Avoid 500's when serializing legacy diff notes

Closes #54793

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

(cherry picked from commit 61bc233ef0df1395ad82ec8d48ee4dfd8c67e0be)

89a67601 Avoid 500's when serializing legacy diff notes




Avoid 500's when serializing legacy diff notes

Closes #54793

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

(cherry picked from commit 61bc233ef0df1395ad82ec8d48ee4dfd8c67e0be)

89a67601 Avoid 500's when serializing legacy diff notes






Merge branch 'fix-multiple-comments-shade-overlap' into 'master'
2018-12-17T13:19:33+00:00

Fatih Acet
acetfatih@gmail.com

2018-12-04T14:05:58+00:00

1f6e8bcf91a57cb4617c76b94bc6d4968e73b55c

Fix multiple commits shade overlapping vertical discussion line

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

(cherry picked from commit ce00a9c8411702353ef1577c79f0ad42ef7e3201)

e0000b85 Fix multiple commits shade overlapping vertical discussion line
495a0b36 Add CHANGELOG entry.




Fix multiple commits shade overlapping vertical discussion line

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

(cherry picked from commit ce00a9c8411702353ef1577c79f0ad42ef7e3201)

e0000b85 Fix multiple commits shade overlapping vertical discussion line
495a0b36 Add CHANGELOG entry.