delta/gitlab/gitlab-ce.git, branch fix-trace-encoding gitlab.com: gitlab-org/gitlab-ce.git Set the encoding in c'tor and explain why it's fine 2017-04-17T09:52:15+00:00 Lin Jen-Shin godfat@godfat.org 2017-04-17T09:52:15+00:00 9350b9064cb9c5048f9eab8041e953a5dab5b154 






Add changelog entry
2017-04-17T09:25:36+00:00

Lin Jen-Shin
godfat@godfat.org

2017-04-17T09:25:36+00:00

bb10b23194a3f3332096168fa0e0fd297f846307












Restore nil for stream
2017-04-17T09:12:43+00:00

Lin Jen-Shin
godfat@godfat.org

2017-04-17T09:12:43+00:00

f05ab97e1ef1c1e70b6b8e1286b1d626e70f5286












Only set the encoding before passing to Ansi2html
2017-04-17T09:10:41+00:00

Lin Jen-Shin
godfat@godfat.org

2017-04-17T09:10:41+00:00

e7d3fe44f64d1efbbc0b9611cb3382feff4a2f00












Don't try to read if there's no trace
2017-04-17T08:29:47+00:00

Lin Jen-Shin
godfat@godfat.org

2017-04-17T08:29:47+00:00

dac23fa233f98b521065fd3f21f6183f84b562d3












Make sure @stream.each_line would tag Encoding.default_external
2017-04-17T07:53:09+00:00

Lin Jen-Shin
godfat@godfat.org

2017-04-17T07:53:09+00:00

c26b126502d4025230aa80e7d26736e1398c5022












Make sure we're giving Encoding.default_external
2017-04-17T06:30:42+00:00

Lin Jen-Shin
godfat@godfat.org

2017-04-17T06:30:42+00:00

ee3b0c3a9ad0823f86b5c798c47c343a812228d0












Merge branch '27655-clear-emoji-search-after-selection' into 'master'

2017-04-17T05:35:34+00:00

Alfredo Sumaran
alfredo@gitlab.com

2017-04-17T05:35:34+00:00

eeaeb2752a589c9046659d58d4a3f6be8030b699


Clear emoji search in awards menu after picking emoji

Closes #27655

See merge request !10524





Clear emoji search in awards menu after picking emoji

Closes #27655

See merge request !10524






Merge branch 'sh-fix-base-parser' into 'master'

2017-04-16T16:15:50+00:00

Robert Speicher
robert@gitlab.com

2017-04-16T16:15:50+00:00

f78ecda55d5431f9a74ab2892b516ecb45f24d80


Fix regression in rendering Markdown references that do not exist

Closes #30972

See merge request !10716





Fix regression in rendering Markdown references that do not exist

Closes #30972

See merge request !10716






Merge branch '30492-using-icon-to-mark-discussion-as-resolved-does-not-resolve-discussion' into 'master'
2017-04-15T15:13:53+00:00

Phil Hughes
me@iamphill.com

2017-04-15T15:13:53+00:00

ae52d1a4b82cd86130c92795390fc3d9664d180b

Resolve "Using icon to mark discussion as resolved does not resolve discussion"

Closes #30492

See merge request !10652




Resolve "Using icon to mark discussion as resolved does not resolve discussion"

Closes #30492

See merge request !10652