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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
9238616d
Commit
9238616d
authored
Aug 11, 2014
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #7468 from Razer6/fix_wrong_compare_message
Turn if/else branch for valid compare error message
parents
505203e7
13c17ed4
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+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/show.html.haml
View file @
9238616d
...
@@ -27,9 +27,9 @@
...
@@ -27,9 +27,9 @@
There isn't anything to compare.
There isn't anything to compare.
%p
.slead
%p
.slead
-
if
params
[
:to
]
==
params
[
:from
]
-
if
params
[
:to
]
==
params
[
:from
]
You'll need to use different branch names to get a valid comparison.
-
else
%span
.label-branch
#{
params
[
:from
]
}
%span
.label-branch
#{
params
[
:from
]
}
and
and
%span
.label-branch
#{
params
[
:to
]
}
%span
.label-branch
#{
params
[
:to
]
}
are the same.
are the same.
-
else
You'll need to use different branch names to get a valid comparison.
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