From 7c721e7bba4359b60f20090d850c672d06023072 Mon Sep 17 00:00:00 2001 From: James Ramsay Date: Wed, 3 Jan 2018 11:43:01 -0500 Subject: [PATCH] Replace use of capture_haml with capture --- app/views/projects/compare/index.html.haml | 4 ++-- app/views/projects/compare/show.html.haml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/views/projects/compare/index.html.haml b/app/views/projects/compare/index.html.haml index 9b0095f5f0f..14c64b3534a 100644 --- a/app/views/projects/compare/index.html.haml +++ b/app/views/projects/compare/index.html.haml @@ -6,9 +6,9 @@ %h3.page-title = _("Compare Git revisions") .sub-header-block - - example_master = capture_haml do + - example_master = capture do %code.ref-name master - - example_sha = capture_haml do + - example_sha = capture do %code.ref-name 4eedf23 = (_("Choose a branch/tag (e.g. %{master}) or enter a commit (e.g. %{sha}) to see what's changed or to create a merge request.") % { master: example_master, sha: example_sha }).html_safe %br diff --git a/app/views/projects/compare/show.html.haml b/app/views/projects/compare/show.html.haml index 0d59d800d1e..8da55664878 100644 --- a/app/views/projects/compare/show.html.haml +++ b/app/views/projects/compare/show.html.haml @@ -16,9 +16,9 @@ = s_("CompareBranches|There isn't anything to compare.") %p.slead - if params[:to] == params[:from] - - source_branch = capture_haml do + - source_branch = capture do %span.ref-name= params[:from] - - target_branch = capture_haml do + - target_branch = capture do %span.ref-name= params[:to] = (s_("CompareBranches|%{source_branch} and %{target_branch} are the same.") % { source_branch: source_branch, target_branch: target_branch }).html_safe - else