delta/gitlab/gitlab-ce.git/app/assets/javascripts/merge_conflicts, branch docs/api-single-codebase gitlab.com: gitlab-org/gitlab-ce.git Internationalisation of merge_conflicts directory 2019-05-02T13:07:34+00:00 Brandon Labuschagne blabuschagne@gitlab.com 2019-05-02T13:07:34+00:00 7f75ac0ce8a71dcb583e70c739d01975959038f8 This is one of many MRs opened in order to improve the overall internationalisation of the GitLab codebase. i18n documentation https://docs.gitlab.com/ee/development/i18n/externalization.html 
This is one of many MRs opened in order to improve the overall
internationalisation of the GitLab codebase.

i18n documentation
https://docs.gitlab.com/ee/development/i18n/externalization.html
Add .code to all tables holding diffs 2019-03-26T13:35:43+00:00 Douwe Maan douwe@selenight.nl 2019-03-23T13:22:16+00:00 0c902da1537a0326faf36227967c68cb6b3037e6 We need this to be able to distinguish between Markdown tables and diff tables. 
We need this to be able to distinguish between Markdown tables and diff
tables.
Remove dependencies on Linguist 2018-10-13T00:17:30+00:00 Zeger-Jan van de Weg git@zjvandeweg.nl 2018-08-03T13:24:26+00:00 399056ed783e12337a9c47b06b4aae021198f1cd This saves about 128 MB of baseline RAM usage per Unicorn and Sidekiq process (!). Linguist wasn't detecting languages anymore from CE/EE since 9ae8b57467ac8b38f1fa9020a466d94a93cbb9dd. However, Linguist::BlobHelper was still being depended on by BlobLike and others. This removes the Linguist gem, given it isn't required anymore. EscapeUtils were pulled in as dependency, but given Banzai depends on it, it is now added explicitly. Previously, Linguist was used to detect the best ACE mode. Instead, we rely on ACE to guess the best mode based on the file extension. 
This saves about 128 MB of baseline RAM usage per Unicorn and
Sidekiq process (!).

Linguist wasn't detecting languages anymore from CE/EE since
9ae8b57467ac8b38f1fa9020a466d94a93cbb9dd. However, Linguist::BlobHelper
was still being depended on by BlobLike and others.

This removes the Linguist gem, given it isn't required anymore.
EscapeUtils were pulled in as dependency, but given Banzai depends on
it, it is now added explicitly.

Previously, Linguist was used to detect the best ACE mode. Instead,
we rely on ACE to guess the best mode based on the file extension.
Prettify merge_conflicts monitoring and notebook modules 2018-10-10T07:30:25+00:00 Mike Greiling mike@pixelcog.com 2018-10-10T06:27:42+00:00 56914c1ac94c02ee336db5014649777d9d729711 






Resolve "Harmonize prettier and eslint configs"
2018-10-09T15:25:53+00:00

Mike Greiling
mike@pixelcog.com

2018-10-09T15:25:53+00:00

d76190371c1ab3ab08f11604aa06196c2acd7138












Enable "prefer-destructuring" in JS files
2018-06-25T18:53:57+00:00

gfyoung
gfyoung17@gmail.com

2018-06-16T21:50:13+00:00

23cdae8eee4fb2017399f54ee0373367fd915e63

Partially addresses #47006.





Partially addresses #47006.







remove all unused eslint-disable rules
2018-06-20T12:28:28+00:00

Lukas Eipert
leipert@gitlab.com

2018-06-16T13:20:30+00:00

0e6441164f74a76b4b3decd3c0b0d8d31e15c815












Removes unused imports and prettifies code
2018-06-15T09:30:07+00:00

Filipa Lacerda
filipa@gitlab.com

2018-06-15T09:30:07+00:00

4d61850c8d714c36eab8216145168e7e38398350












Merge branch 'master' into gl-remove-window-scope
2018-06-13T13:36:40+00:00

Filipa Lacerda
filipa@gitlab.com

2018-06-13T13:36:40+00:00

3e11cbebb7bd45678dc8f9a2c5e8c4b9018e8bcb

* 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





* 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







Removes merge conflicts vue code from globalnamespace
2018-06-13T11:35:32+00:00

Filipa Lacerda
filipa@gitlab.com

2018-06-13T11:35:32+00:00

75f692748d853d38494ba93ff15f98475b6c2da7