Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/app/views
diff options
context:
space:
mode:
authorJames Ramsay <james@jramsay.com.au>2018-01-03 19:43:01 +0300
committerJames Ramsay <james@jramsay.com.au>2018-01-03 19:43:01 +0300
commit7c721e7bba4359b60f20090d850c672d06023072 (patch)
tree8638a9458f2bafbf8bfda587af4b06007b134886 /app/views
parent592e81503abee7087dca0c4994a9dbeff5bf6945 (diff)
Replace use of capture_haml with capture
Diffstat (limited to 'app/views')
-rw-r--r--app/views/projects/compare/index.html.haml4
-rw-r--r--app/views/projects/compare/show.html.haml4
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