Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
7c721e7b
Commit
7c721e7b
authored
Jan 03, 2018
by
James Ramsay
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Replace use of capture_haml with capture
parent
592e8150
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
app/views/projects/compare/index.html.haml
app/views/projects/compare/index.html.haml
+2
-2
app/views/projects/compare/show.html.haml
app/views/projects/compare/show.html.haml
+2
-2
No files found.
app/views/projects/compare/index.html.haml
View file @
7c721e7b
...
...
@@ -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
...
...
app/views/projects/compare/show.html.haml
View file @
7c721e7b
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment