delta/gitlab/gitlab-ce.git/app, branch fix-trace-encoding gitlab.com: gitlab-org/gitlab-ce.git 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 '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
 Issue Title Vue: convert to .vue - use 'render' with 'createElement' in index 2017-04-15T15:11:04+00:00 Regis Boudinot boudinot.regis@yahoo.com 2017-04-15T15:11:04+00:00 8918433af66b77ab101bd5ba3b4a3c716be0f864 






Merge branch '30810-fix-note-header-info-and-action-overlap' into 'master'

2017-04-14T20:05:28+00:00

Annabel Dunstone Gray
annabel.dunstone@gmail.com

2017-04-14T20:05:28+00:00

1cc2d2ecb6d809fba5c1aa17c5f7b3b55d65414d


Fix note header timeago and action overlap

Closes #30810

See merge request !10644





Fix note header timeago and action overlap

Closes #30810

See merge request !10644






Merge branch 'remove-double-newline-for-single-attachments' into 'master'

2017-04-14T18:18:17+00:00

Phil Hughes
me@iamphill.com

2017-04-14T18:18:17+00:00

344a2619bb0e796862531f6784351472e6a70fd7


Only add newlines for multiple uploads

Closes #29782

See merge request !10545





Only add newlines for multiple uploads

Closes #29782

See merge request !10545






Merge branch 'add-cookie-expirations-to-callouts' into 'master'

2017-04-14T16:14:56+00:00

Phil Hughes
me@iamphill.com

2017-04-14T16:14:56+00:00

ec5ba730e2c904a3e3aaf188a37322adac629998


Add expirations to CA and user callouts

Closes #30267

See merge request !10568





Add expirations to CA and user callouts

Closes #30267

See merge request !10568






Merge branch 'frontend_prevent_authored_awardable_votes' into 'master'

2017-04-14T14:43:20+00:00

Alfredo Sumaran
alfredo@gitlab.com

2017-04-14T14:43:20+00:00

e04aef5ccec442c18f3df90db270af26ec9a79f2


frontend prevent authored votes

Closes #21881

See merge request !6260





frontend prevent authored votes

Closes #21881

See merge request !6260






Add expirations to CA and user callouts
2017-04-14T14:34:23+00:00

Luke "Jared" Bennett
lbennett@gitlab.com

2017-04-08T08:44:03+00:00

0636320ea67849023973a7eb12f566cefcf7e6ff












Only add newlines for multiple uploads
2017-04-14T14:30:43+00:00

Luke "Jared" Bennett
lbennett@gitlab.com

2017-04-07T16:29:08+00:00

115d1afeb386d2b1fef4ca437fafd8227d72c0ad












Merge branch 'patch-17' into 'master'

2017-04-14T08:58:03+00:00

Rémy Coutable
remy@rymai.me

2017-04-14T08:58:03+00:00

ea24904db818f4bfa248ef56b751400a674ed05d


Update show.html.haml to allow guests to see the Files tab as per #30199

See merge request !10640





Update show.html.haml to allow guests to see the Files tab as per #30199

See merge request !10640