Merge branch 'master' into droplab-templating-xss-fix

.gitlab-ci.yml

Gemfile

Gemfile.lock

app/assets/javascripts/awards_handler.js

...ets/javascripts/cycle_analytics/cycle_analytics_bundle.js

app/assets/javascripts/dropzone_input.js

app/assets/javascripts/lib/utils/common_utils.js

app/assets/javascripts/user_callout.js

app/assets/stylesheets/framework/awards.scss

app/assets/stylesheets/pages/notes.scss

app/helpers/issues_helper.rb

app/views/award_emoji/_awards_block.html.haml

app/views/projects/notes/_note.html.haml

...elogs/unreleased/6260-frontend-prevent-authored-votes.yml

...released/remove-double-newline-for-single-attachments.yml

changelogs/unreleased/use-hashie-forbidden_attributes.yml

config/environments/test.rb

spec/features/issues_spec.rb

spec/javascripts/awards_handler_spec.js