diff options
| author | Douwe Maan <douwe@selenight.nl> | 2016-08-10 22:36:13 -0500 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2016-08-12 23:24:50 +0300 |
| commit | cf4cbb018e229b80e8fd0ca427e63f337ef6bdff (patch) | |
| tree | 4b58a284e763494bbd4eeeb370ba28de0cecf000 /app/views/projects/merge_requests/widget/open | |
| parent | 7927484435a9dc814d3ffa6d9182beac4f672cbd (diff) | |
| download | gitlab-ce-cf4cbb018e229b80e8fd0ca427e63f337ef6bdff.tar.gz | |
Rename `can_resolve_conflicts_in_ui?` to `conflicts_can_be_resolved_in_ui?`
Diffstat (limited to 'app/views/projects/merge_requests/widget/open')
| -rw-r--r-- | app/views/projects/merge_requests/widget/open/_conflicts.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/projects/merge_requests/widget/open/_conflicts.html.haml b/app/views/projects/merge_requests/widget/open/_conflicts.html.haml index 582a82c7a71..bedf45fb89d 100644 --- a/app/views/projects/merge_requests/widget/open/_conflicts.html.haml +++ b/app/views/projects/merge_requests/widget/open/_conflicts.html.haml @@ -4,7 +4,7 @@ %p Please - - if @merge_request.can_resolve_conflicts_in_ui? + - if @merge_request.conflicts_can_be_resolved_in_ui? = link_to "resolve these conflicts", conflicts_namespace_project_merge_request_path(@project.namespace, @project, @merge_request) or - if @merge_request.can_be_merged_via_command_line_by?(current_user) |