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
Léo-Paul Géneau
gitlab-ce
Commits
164d4744
Commit
164d4744
authored
May 09, 2015
by
Douwe Maan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add Merge Request button to branches page.
parent
722e3935
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
5 deletions
+8
-5
CHANGELOG
CHANGELOG
+1
-1
app/views/projects/branches/_branch.html.haml
app/views/projects/branches/_branch.html.haml
+7
-4
No files found.
CHANGELOG
View file @
164d4744
...
@@ -49,7 +49,7 @@ v 7.11.0 (unreleased)
...
@@ -49,7 +49,7 @@ v 7.11.0 (unreleased)
- Add footnotes support to Markdown (Guillaume Delbergue)
- Add footnotes support to Markdown (Guillaume Delbergue)
- Add current_sign_in_at to UserFull REST api.
- Add current_sign_in_at to UserFull REST api.
- Make Sidekiq MemoryKiller shutdown signal configurable
- Make Sidekiq MemoryKiller shutdown signal configurable
- Add "Create Merge Request" buttons to commits
page
and push event.
- Add "Create Merge Request" buttons to commits
and branches pages
and push event.
v 7.10.2
v 7.10.2
- Fix CI links on MR page
- Fix CI links on MR page
...
...
app/views/projects/branches/_branch.html.haml
View file @
164d4744
...
@@ -10,16 +10,19 @@
...
@@ -10,16 +10,19 @@
%i
.fa.fa-lock
%i
.fa.fa-lock
protected
protected
.pull-right
.pull-right
-
if
can?
(
current_user
,
:download_code
,
@project
)
-
if
create_mr_button?
(
@repository
.
root_ref
,
branch
.
name
)
=
render
'projects/repositories/download_archive'
,
ref:
branch
.
name
,
btn_class:
'btn-grouped btn-group-xs'
=
link_to
create_mr_path
(
@repository
.
root_ref
,
branch
.
name
),
class:
'btn btn-grouped btn-xs'
do
=
icon
(
'plus'
)
Merge Request
-
if
branch
.
name
!=
@repository
.
root_ref
-
if
branch
.
name
!=
@repository
.
root_ref
=
link_to
namespace_project_compare_index_path
(
@project
.
namespace
,
@project
,
from:
@repository
.
root_ref
,
to:
branch
.
name
),
class:
'btn btn-grouped btn-xs'
,
method: :post
,
title:
"Compare"
do
=
link_to
namespace_project_compare_index_path
(
@project
.
namespace
,
@project
,
from:
@repository
.
root_ref
,
to:
branch
.
name
),
class:
'btn btn-grouped btn-xs'
,
method: :post
,
title:
"Compare"
do
%i
.fa.fa-files-o
=
icon
(
"exchange"
)
Compare
Compare
-
if
can_remove_branch?
(
@project
,
branch
.
name
)
-
if
can_remove_branch?
(
@project
,
branch
.
name
)
=
link_to
namespace_project_branch_path
(
@project
.
namespace
,
@project
,
branch
.
name
),
class:
'btn btn-grouped btn-xs btn-remove remove-row'
,
method: :delete
,
data:
{
confirm:
'Removed branch cannot be restored. Are you sure?'
},
remote:
true
do
=
link_to
namespace_project_branch_path
(
@project
.
namespace
,
@project
,
branch
.
name
),
class:
'btn btn-grouped btn-xs btn-remove remove-row'
,
method: :delete
,
data:
{
confirm:
'Removed branch cannot be restored. Are you sure?'
},
remote:
true
do
%i
.fa.fa-trash-o
=
icon
(
"trash-o"
)
-
if
commit
-
if
commit
%ul
.list-unstyled
%ul
.list-unstyled
...
...
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