diff options
| author | Bob Van Landuyt <bob@gitlab.com> | 2017-03-10 09:19:12 +0100 |
|---|---|---|
| committer | Bob Van Landuyt <bob@gitlab.com> | 2017-03-13 08:27:52 +0100 |
| commit | ea70a0d674539d53e40c63a0a3cebef33d7e13b7 (patch) | |
| tree | 8d4e9f1801c33ab87b7a266528f81de0a812bef1 /app/views/discussions | |
| parent | a07e89b2751f1855e2fe4bdf05a5967fd7421778 (diff) | |
| download | gitlab-ce-ea70a0d674539d53e40c63a0a3cebef33d7e13b7.tar.gz | |
Rename variable
merge_request_for_resolving_discussions ->
merge_request_to_resolve_discussions_of
Diffstat (limited to 'app/views/discussions')
| -rw-r--r-- | app/views/discussions/_new_issue_for_all_discussions.html.haml | 2 | ||||
| -rw-r--r-- | app/views/discussions/_new_issue_for_discussion.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/discussions/_new_issue_for_all_discussions.html.haml b/app/views/discussions/_new_issue_for_all_discussions.html.haml index 01c5a7b4e54..ca9e0e8728a 100644 --- a/app/views/discussions/_new_issue_for_all_discussions.html.haml +++ b/app/views/discussions/_new_issue_for_all_discussions.html.haml @@ -3,4 +3,4 @@ .btn.btn-default.discussion-create-issue-btn.has-tooltip{ title: "Resolve all discussions in new issue", "aria-label" => "Resolve all discussions in a new issue", "data-container" => "body" } - = link_to custom_icon('icon_mr_issue'), new_namespace_project_issue_path(@project.namespace, @project, merge_request_for_resolving_discussions: merge_request.iid), title: "Resolve all discussions in new issue", class: 'new-issue-for-discussion' + = link_to custom_icon('icon_mr_issue'), new_namespace_project_issue_path(@project.namespace, @project, merge_request_to_resolve_discussions_of: merge_request.iid), title: "Resolve all discussions in new issue", class: 'new-issue-for-discussion' diff --git a/app/views/discussions/_new_issue_for_discussion.html.haml b/app/views/discussions/_new_issue_for_discussion.html.haml index c21ec0ecc3d..df5546a1e32 100644 --- a/app/views/discussions/_new_issue_for_discussion.html.haml +++ b/app/views/discussions/_new_issue_for_discussion.html.haml @@ -5,4 +5,4 @@ .btn.btn-default.discussion-create-issue-btn.has-tooltip{ title: "Resolve this discussion in a new issue", "aria-label" => "Resolve this discussion in a new issue", "data-container" => "body" } - = link_to custom_icon('icon_mr_issue'), new_namespace_project_issue_path(@project.namespace, @project, merge_request_for_resolving_discussions: merge_request.iid, discussion_to_resolve: discussion.id), title: "Resolve this discussion in a new issue", class: 'new-issue-for-discussion' + = link_to custom_icon('icon_mr_issue'), new_namespace_project_issue_path(@project.namespace, @project, merge_request_to_resolve_discussions_of: merge_request.iid, discussion_to_resolve: discussion.id), title: "Resolve this discussion in a new issue", class: 'new-issue-for-discussion' |