• Filipa Lacerda's avatar
    Merge branch 'master' into gl-remove-window-scope · 3e11cbeb
    Filipa Lacerda authored
    * master:
      Add documentation: Overview of Frontend Testing
      Resolve "Add `/confidential` quick action for issues"
      i18n: externalize strings from 'app/views/award_emoji'
      Fix broken tests due to bad conflict resolution
      Updates eslint rules
      Documentation does not need an exception to be picked
      Fix conflicts caused by vue_shared/components/user_avatar/user_avatar_image.vue
      [Rails5] Fix `storage_counter` helper
      Adjust SQL and transaction Prometheus buckets
      Updates eslint vue plugin version
    3e11cbeb
parallel_conflict_lines.js 1.3 KB