And Snippets get awards
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
Activity
Added 358 commits:
- bbfc1f6b...d9f1fb16 - 357 commits from branch
master
- 890d2ded - Snippets get award emoji!
- bbfc1f6b...d9f1fb16 - 357 commits from branch
@fatihacet Any update on this?
@zj Don't forget the docs
Milestone changed to %8.11
@fatihacet I've merged master in the branch so the branch is up to date. :)
Added 1765 commits:
-
04576b01...c675bdad - 1762 commits from branch
master
-
b481c0a4 - Snippets get award emoji!
- cf4a22ec - API support for Award Emoji on Snippets
- 6be5c7d0 - Merge branch 'master' into and-you-get-awards
Toggle commit list-
04576b01...c675bdad - 1762 commits from branch
Added 1 commit:
- a8f3c827 - API docs for award emoji on Snippets
I've skipped the docs pipeline, best be looking at 6be5c7d0
Milestone changed to %8.12
Added 2061 commits:
-
a8f3c827...2778dec1 - 2058 commits from branch
master
-
f2179417 - Snippets get award emoji!
- 42c0c12e - API support for Award Emoji on Snippets
- 05add706 - API docs for award emoji on Snippets
Toggle commit list-
a8f3c827...2778dec1 - 2058 commits from branch
Added 370 commits:
-
05add706...faac7121 - 367 commits from branch
master
-
7d22fc10 - Snippets get award emoji!
- fde49c8d - API support for Award Emoji on Snippets
- e7528b51 - API docs for award emoji on Snippets
Toggle commit list-
05add706...faac7121 - 367 commits from branch
Added 1 commit:
- 33ef2f3a - Start Frontend work, fix routing problem
Added 1 commit:
- 8fd475eb - Start Frontend work, fix routing problem
Added 149 commits:
-
8fd475eb...57c4036d - 144 commits from branch
master
-
736a7250 - Snippets get award emoji!
- 8adfb408 - API support for Award Emoji on Snippets
- 30168dca - API docs for award emoji on Snippets
- 257ebd1c - Start Frontend work, fix routing problem
- 50791bf1 - Fix some styling issues for awards block on snippets.
Toggle commit list-
8fd475eb...57c4036d - 144 commits from branch
@zj I am done with this on Frontend side. Can you test it and assign a MR endboss for code review?
Reassigned to @zj
Reassigned to @rymai
Added 1 commit:
- 14dd83b6 - Fix tests for Snippets toggling awards
- Resolved by username-removed-128633
- Resolved by Zeger-Jan van de Weg
- Resolved by Zeger-Jan van de Weg
- Resolved by Zeger-Jan van de Weg
- Resolved by Zeger-Jan van de Weg
- Resolved by Zeger-Jan van de Weg
- Resolved by Zeger-Jan van de Weg
- Resolved by Zeger-Jan van de Weg
- Resolved by Zeger-Jan van de Weg
@zj Great job, I had a few remarks! Also please remove
routes.txt
. ;)Reassigned to @zj
- Resolved by Zeger-Jan van de Weg
Added 1 commit:
- 388b0cb3 - Fix tests for Snippets toggling awards
Added 1 commit:
- c3144afb - Fix tests for Snippets toggling awards
Reassigned to @rymai
- Resolved by Zeger-Jan van de Weg
Added 1 commit:
- d6974d5c - Use routing concerns to DRY the routes
@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 :)
Reassigned to @fatihacet
@zj I resolved conflicts. Those conflicts were because of the upstream design changes. Here is how they look on project and personal snippets.
Reassigned to @rymai
Added 595 commits:
-
d6974d5c...b94de5fd - 588 commits from branch
master
-
25004cbc - Snippets get award emoji!
- 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.
Toggle commit list-
d6974d5c...b94de5fd - 588 commits from branch
@zj One last change and we're good!
Added 1 commit:
- e41a3912 - Remove duplicate route
Enabled an automatic merge when the build for e41a3912 succeeds
Mentioned in commit 24fed567
Mentioned in commit 2f54abc5