Douwe Maan 095fcfc447 Merge branch 'mc-ui' ... # Conflicts: # app/controllers/projects/merge_requests_controller.rb		2016-08-17 12:21:30 -05:00
..
open	Show tooltip when conflicts cannot be resolved through GitLab	2016-08-12 23:24:50 +03:00
_closed.html.haml	Merge branch 'mr-widget-text' into 'master'	2015-08-11 19:24:50 +02:00
_heading.html.haml	Use a regular flash message after resolution is complete	2016-08-12 23:24:51 +03:00
_locked.html.haml	Merge branch 'mr-widget-text' into 'master'	2015-08-11 19:24:50 +02:00
_merged.html.haml	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
_merged_buttons.haml	Fixed issue with MR buttons being in a group	2016-06-13 11:46:53 +01:00
_open.html.haml	Fix bug where merge widget wouldn't show up after resolving conflicts	2016-08-12 23:24:51 +03:00
_show.html.haml	Add route, controller action, and views for MR pipelines	2016-07-25 16:19:20 -05:00