Skip to content

GitLab

Why GitLab
Pricing
Contact Sales
Explore

Sign in
Get free trial

Primary navigation

Project

GitLab Community Edition
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Jira
- Environments
- Incidents

Snippets Groups Projects

Admin message

Do not update/delete: Banner broadcast message test data

Admin message

Do not update/delete: Notification broadcast message test data

cea3cf17

Commit cea3cf17 authored 8 years ago by Jacob Schatz

Downloads
- Plain Diff

Merge branch 'award-emoji-fixes' into 'master'

Award emoji fixes

Fixes #18357 #18325 and #18424

See merge request !4550

parents e328eab0 94826d9a

No related branches found

No related tags found

Loading

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

app/assets/javascripts/application.js.coffee 1 addition, 0 deletions

app/assets/javascripts/application.js.coffee
app/assets/javascripts/awards_handler.coffee 9 additions, 7 deletions

app/assets/javascripts/awards_handler.coffee
app/assets/javascripts/dispatcher.js.coffee 0 additions, 2 deletions

app/assets/javascripts/dispatcher.js.coffee
app/views/award_emoji/_awards_block.html.haml 0 additions, 3 deletions

app/views/award_emoji/_awards_block.html.haml
lib/gitlab/gon_helper.rb 1 addition, 0 deletions

lib/gitlab/gon_helper.rb
spec/javascripts/awards_handler_spec.js.coffee 6 additions, 7 deletions

spec/javascripts/awards_handler_spec.js.coffee

with 17 additions and 19 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment