1. 22 Nov, 2015 2 commits
    • Robert Speicher's avatar
      Merge branch 'award_fix' into 'master' · 7b70a03e
      Robert Speicher authored
      Emoji bug: Invalid url to image
      
      Closes #3591
      
      See merge request !1868
      7b70a03e
    • Robert Speicher's avatar
      Merge branch 'fix-award-emoji-api' into 'master' · b166ee6b
      Robert Speicher authored
      Add upvote/downvote fields to merge request and note API to preserve compatibility
      
      As discussed in !1825 we should not break the API compatibility.
      
      * This MR adds the fields `upvotes`/`downvotes` to the merge request API again, which always return `0`.
      * Add the fields `upvote`/`downvote` to the notes API, which always return `false`
      
      This behavior is documented in the API docs.
      
      See merge request !1867
      b166ee6b
  2. 21 Nov, 2015 21 commits
  3. 20 Nov, 2015 17 commits