delta/gitlab/gitlab-ce.git/app/assets/javascripts/merge_conflicts, branch normalize_frontend_headersgitlab.com: gitlab-org/gitlab-ce.git
resolve all prefer-const eslint violations2017-01-19T02:33:02+00:00Mike Greilingmike@pixelcog.com2017-01-12T05:52:42+00:0083ecc02daa880e73010ac871f821c01c2c8c116c
resolve all no-dupe-keys eslint violations2017-01-18T23:18:40+00:00Mike Greilingmike@pixelcog.com2017-01-12T05:45:54+00:000b3f00492bc84a84d7a9867d3d02454d61672660
resolve all x-spacing and no-spaced-x eslint violations2017-01-18T23:18:40+00:00Mike Greilingmike@pixelcog.com2017-01-12T04:27:41+00:0004eff5fdb07a78a1980722bd9d5a63360a423e8a
resolve all padded-blocks eslint violations2017-01-18T23:16:41+00:00Mike Greilingmike@pixelcog.com2017-01-10T23:02:20+00:00ccada28f30326262b61638edf77b7ab163ff59a0
resolve all semi and no-extra-semi eslint violations2017-01-18T23:15:27+00:00Mike Greilingmike@pixelcog.com2017-01-10T22:54:56+00:00e7b5945c591bcd55911f495635f2f852946bd228
resolve all no-plusplus eslint violations2017-01-18T23:15:27+00:00Mike Greilingmike@pixelcog.com2017-01-10T22:35:09+00:009e4d04913ab9267d4a59df4d7feafd97b8117fe7
expand remaining non-explicit eslint-disable blocks and factor out globals when no-undef encountered2016-12-14T03:07:31+00:00Mike Greilingmike@pixelcog.com2016-12-14T03:01:05+00:0023f5865e184c1738df86893d31392faf4bc2bad7
Fix Merge Conflicts app to make it work with Vue 22016-11-10T14:53:34+00:00Alfredo Sumaranalfredo@gitlab.com2016-11-09T20:17:49+00:006dbca36490bff0f2c1af4a323f0e76b8d971a4ab