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
Jérome Perrin
gitlab-ce
Commits
ee993dfc
Commit
ee993dfc
authored
Feb 15, 2014
by
Timm Drevensek
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix branches/compare butten to directly diff to default branch
parent
5cf5c177
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
3 deletions
+4
-3
app/views/projects/branches/_branch.html.haml
app/views/projects/branches/_branch.html.haml
+4
-3
No files found.
app/views/projects/branches/_branch.html.haml
View file @
ee993dfc
...
@@ -11,9 +11,10 @@
...
@@ -11,9 +11,10 @@
.pull-right
.pull-right
-
if
can?
(
current_user
,
:download_code
,
@project
)
-
if
can?
(
current_user
,
:download_code
,
@project
)
=
render
'projects/repositories/download_archive'
,
ref:
branch
.
name
,
btn_class:
'grouped btn-group-small'
=
render
'projects/repositories/download_archive'
,
ref:
branch
.
name
,
btn_class:
'grouped btn-group-small'
=
link_to
project_compare_index_path
(
@project
,
from:
branch
.
name
,
to:
branch
.
name
),
class:
'btn grouped btn-small'
,
title:
"Compare"
do
-
if
branch
.
name
!=
@repository
.
root_ref
%i
.icon-copy
=
link_to
project_compare_index_path
(
@project
,
from:
@repository
.
root_ref
,
to:
branch
.
name
),
class:
'btn grouped btn-small'
,
method: :post
,
title:
"Compare"
do
Compare
%i
.icon-copy
Compare
-
if
can?
(
current_user
,
:admin_project
,
@project
)
&&
branch
.
name
!=
@repository
.
root_ref
-
if
can?
(
current_user
,
:admin_project
,
@project
)
&&
branch
.
name
!=
@repository
.
root_ref
=
link_to
project_branch_path
(
@project
,
branch
.
name
),
class:
'btn grouped btn-small remove-row'
,
method: :delete
,
data:
{
confirm:
'Removed branch cannot be restored. Are you sure?'
},
remote:
true
do
=
link_to
project_branch_path
(
@project
,
branch
.
name
),
class:
'btn grouped btn-small remove-row'
,
method: :delete
,
data:
{
confirm:
'Removed branch cannot be restored. Are you sure?'
},
remote:
true
do
...
...
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