Skip to content
Snippets Groups Projects

And Snippets get awards

Merged Zeger-Jan van de Weg requested to merge and-you-get-awards into master
All threads resolved!

What does this MR do?

Makes snippets more awesome, by making them awardables

Why was this MR needed?

Because Snippets were left behind.

What are the relevant issue numbers?

Closes #17878 (closed)

Screenshots (if relevant)

Tasks

  • CHANGELOG
  • Rebase, 2k commits behind
  • API support
  • Frontend pickers
  • Docs (API)

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • username-removed-128633
  • @zj Great job, I had a few remarks! Also please remove routes.txt. ;)

  • Reassigned to @zj

  • username-removed-128633
  • Added 1 commit:

    • 388b0cb3 - Fix tests for Snippets toggling awards
  • Added 1 commit:

    • c3144afb - Fix tests for Snippets toggling awards
  • Zeger-Jan van de Weg Resolved all discussions

    Resolved all discussions

  • Reassigned to @rymai

  • Added 1 commit:

    • d6974d5c - Use routing concerns to DRY the routes
  • Author Developer

    @fatihacet I tried to rebase and hit a couple of conflicts I'm not comfortable to merge. Could you take a look? After that we should be able to merge this :)

  • @zj I resolved conflicts. Those conflicts were because of the upstream design changes. Here is how they look on project and personal snippets.

    Screen_Shot_2016-09-19_at_20.12.29 Screen_Shot_2016-09-19_at_20.12.55

  • Reassigned to @rymai

  • @zj Assigned this to @rymai again for a final review, ready to merge I believe :checkered_flag:

  • Added 595 commits:

    • d6974d5c...b94de5fd - 588 commits from branch master
    • 25004cbc - Snippets get award emoji! :thumbsup:
    • 7475f9d1 - API support for Award Emoji on Snippets
    • fe043398 - API docs for award emoji on Snippets
    • 412ff80b - Start Frontend work, fix routing problem
    • e8dd0d54 - Fix tests for Snippets toggling awards
    • 86e7ae82 - Use routing concerns to DRY the routes
    • a6e91b16 - Fix styling of award emoji block for snippets after upstream design changes.
  • Added ~149423 label

  • @zj One last change and we're good!

  • Added 1 commit:

  • Zeger-Jan van de Weg Resolved all discussions

    Resolved all discussions

  • Author Developer

    This is done now :)

  • username-removed-128633 Enabled an automatic merge when the build for e41a3912 succeeds

    Enabled an automatic merge when the build for e41a3912 succeeds

  • username-removed-128633 Status changed to merged

    Status changed to merged

  • Mentioned in commit 24fed567

  • Picked into 8-12-stable, will go into RC7.

  • Rubén Dávila Removed ~149423 label

    Removed ~149423 label

  • Mentioned in commit 2f54abc5

  • Please register or sign in to reply
    Loading