delta/gitlab/gitlab-ce.git/app/assets/javascripts/merge_conflicts, branch parallel-db-migrations gitlab.com: gitlab-org/gitlab-ce.git 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












Updates eslint vue plugin version
2018-06-11T14:36:54+00:00

Filipa Lacerda
filipa@gitlab.com

2018-06-11T09:49:47+00:00

647a4d6a3bac6eb8380dc0fcba03f0524f6de27d












Make it explicit that merge conflict feature commits to source branch
2018-05-21T18:36:54+00:00

Annabel Dunstone Gray
annabel.dunstone@gmail.com

2018-05-11T19:41:46+00:00

06a2e3854e383fd8ae042af182c54f5d607f2302












require jQuery to be explicitly imported
2018-03-09T21:18:09+00:00

Mike Greiling
mike@pixelcog.com

2018-03-09T20:18:59+00:00

f248be7257e82d15fa6441c551e4314bd36343d4












refactor merge conflicts bundle to reduce side effects
2018-02-27T22:53:49+00:00

Mike Greiling
mike@pixelcog.com

2018-02-27T22:53:49+00:00

c62fe6a293f62d37d9290074b917cc67a78b6cfd












Merge branch 'axios-diff-file-editor' into 'master'
2018-02-07T21:03:13+00:00

Fatih Acet
acetfatih@gmail.com

2018-02-07T21:03:13+00:00

625eea7e076420079136ba8b913de5a277c34207

Replace $.get in diff file editor with axios

See merge request gitlab-org/gitlab-ce!16896




Replace $.get in diff file editor with axios

See merge request gitlab-org/gitlab-ce!16896