Sean McGivern
cbcf00e1b9
Keep committing ... spinner when conflict resolved
...
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.
2016-08-19 12:12:50 +01:00
Sean McGivern
b37c7a3a8e
Use bundled Vue lib
2016-08-17 17:15:03 +01:00
Fatih Acet
a1d0b0398b
Remove commit button loader and update title while committing.
2016-08-12 23:24:52 +03:00
Fatih Acet
1eaad45e71
Remove unnecessary window exports.
2016-08-12 23:24:52 +03:00
Douwe Maan
4d7c201414
Don’t hardcode paths
2016-08-12 23:24:50 +03:00
Fatih Acet
f9e0a6dade
Dynamically highlight code blocks in merge conflicts widgets.
2016-08-12 23:24:49 +03:00
Fatih Acet
1def35100d
Update container fludity class if diff view mode is parallel.
2016-08-12 23:24:49 +03:00
Fatih Acet
41f7cee991
Show loading button while Ajax request is in progress.
2016-08-12 23:24:49 +03:00
Sean McGivern
f322c30274
Set flash message after conflict is resolved
2016-08-12 23:24:48 +03:00
Fatih Acet
8b6a075e6f
Implement commit in merge conflicts UI.
2016-08-12 23:24:46 +03:00
Fatih Acet
c2295fbdf8
Render right sidebar and handle request error.
2016-08-12 23:24:46 +03:00
Fatih Acet
5625e8281a
Check line lengths and fill missing lines with empty lines.
2016-08-12 23:24:45 +03:00
Fatih Acet
5c7a7093b7
Added ES6 MergeConflictResolver classes.
2016-08-12 23:24:44 +03:00
