4 Commits

Author	SHA1	Message	Date
Douwe Maan	095fcfc447	Merge branch 'mc-ui' ... # Conflicts: # app/controllers/projects/merge_requests_controller.rb	2016-08-17 12:21:30 -05:00
Douwe Maan	1711a384e4	Prevent “This merge request contains merge conflicts” from being shown after resolution because of slow background workers	2016-08-12 23:24:50 +03:00
Annabel Dunstone	d71d3b8c2b	Convert to javascript	2016-07-25 16:19:20 -05:00
Fatih Acet	aaa9509d12	ES6ify all the things!	2016-07-24 23:45:11 +03:00