summaryrefslogtreecommitdiff
path: root/app/views/projects/merge_requests/widget/open/_conflicts.html.haml
Commit message (Expand)AuthorAgeFilesLines
* Show tooltip when conflicts cannot be resolved through GitLabDouwe Maan2016-08-121-1/+7
* Verify user is signed in and can actually resolve conflictsDouwe Maan2016-08-121-3/+5
* Rename `can_resolve_conflicts_in_ui?` to `conflicts_can_be_resolved_in_ui?`Douwe Maan2016-08-121-1/+1
* Don't allow resolving invalid conflictsSean McGivern2016-08-121-3/+3
* Make resolve these conflicts text a link to conflicts tab.Fatih Acet2016-08-121-1/+4
* Revert "Revert "Merge branch '18193-developers-can-merge' into 'master' ""Rémy Coutable2016-07-181-1/+1
* Revert "Merge branch '18193-developers-can-merge' into 'master' "Robert Speicher2016-07-131-1/+1
* Don't ask the user to "merge this request manually".Timothy Andrew2016-07-131-1/+1
* Use warning color merge conflicts icon in MR status widget.merge-conflicts-icon-colorFatih Acet2016-06-061-2/+2
* Merge branch 'mr-widget-text' into 'master' Dmitriy Zaporozhets2015-08-111-9/+8
* Refactor merge request widgetDmitriy Zaporozhets2015-08-111-4/+5
* Revert "Merge branch 'improve-merge-requests' into 'master' "Dmitriy Zaporozhets2015-08-111-5/+4
* Revert "Merge branch 'mr-widget-text' into 'master' "Dmitriy Zaporozhets2015-08-111-8/+9
* Improve MR merge widget text and UI consistency.Douwe Maan2015-08-081-9/+8
* Refactor merge request widgetDmitriy Zaporozhets2015-08-071-4/+5
* Split merge conflict messages on 2 linesnicer-merge-conflicts-widgetDmitriy Zaporozhets2015-08-061-1/+2
* Improve variables in mr widgetDmitriy Zaporozhets2015-06-111-1/+1
* Refactor merge request widget step 2Dmitriy Zaporozhets2015-06-111-0/+9