delta/gitlab/gitlab-ce.git/app/assets/javascripts/merge_conflict_resolver.js.es6, branch ci-https gitlab.com: gitlab-org/gitlab-ce.git ensure the 'fixed layout' preference is honored whenever possible 2016-09-20T05:51:00+00:00 Mike Greiling mike@pixelcog.com 2016-09-19T23:02:52+00:00 76ae5af8ce9d88cb1da4f8b9836fe78b7c2ad30e see #22343 for issue description 
see #22343 for issue description
Keep committing ... spinner when conflict resolved 2016-08-19T11:12:50+00:00 Sean McGivern sean@gitlab.com 2016-08-19T11:12:50+00:00 cbcf00e1b972265713bb68cc679216398a44c993 When a conflict is resolved, we don't want to change the spinner back to the normal button before the new page load happens, so only do this on failure. 
When a conflict is resolved, we don't want to change the spinner back to
the normal button before the new page load happens, so only do this on
failure.
Use bundled Vue lib 2016-08-17T16:15:03+00:00 Sean McGivern sean@gitlab.com 2016-08-17T16:15:03+00:00 b37c7a3a8e15e8dde2362041816cea186c8a7cfb 






Remove commit button loader and update title while committing.
2016-08-12T20:24:52+00:00

Fatih Acet
acetfatih@gmail.com

2016-08-12T18:48:02+00:00

a1d0b0398b84f872bdaee6220b76ca0de6e90f66












Remove unnecessary window exports.
2016-08-12T20:24:52+00:00

Fatih Acet
acetfatih@gmail.com

2016-08-12T18:36:55+00:00

1eaad45e71fd706a69c06b59fba0d82628c53232












Don’t hardcode paths
2016-08-12T20:24:50+00:00

Douwe Maan
douwe@selenight.nl

2016-08-11T03:40:00+00:00

4d7c201414b8db1206e37a476d4f39457c2be1bf












Dynamically highlight code blocks in merge conflicts widgets.
2016-08-12T20:24:49+00:00

Fatih Acet
acetfatih@gmail.com

2016-08-08T14:24:52+00:00

f9e0a6dade443429116b32517c8b39daff2ba157












Update container fludity class if diff view mode is parallel.
2016-08-12T20:24:49+00:00

Fatih Acet
acetfatih@gmail.com

2016-08-08T14:24:13+00:00

1def35100dc80e4c4a66db264ff10aa0df20be7c












Show loading button while Ajax request is in progress.
2016-08-12T20:24:49+00:00

Fatih Acet
acetfatih@gmail.com

2016-08-08T10:26:09+00:00

41f7cee99149f98f82afbe54587a4d2853f1ddc6












Set flash message after conflict is resolved
2016-08-12T20:24:48+00:00

Sean McGivern
sean@gitlab.com

2016-08-04T13:56:54+00:00

f322c3027442b8f8c4800c19056bcd967be4018b