Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
722e3935
G
gitlab-foss
项目概览
李少辉-开发者
/
gitlab-foss
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
gitlab-foss
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
722e3935
编写于
5月 09, 2015
作者:
D
Douwe Maan
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Add Create Merge Request buttons to commits page and push event.
上级
8f75ab21
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
41 addition
and
21 deletion
+41
-21
CHANGELOG
CHANGELOG
+1
-0
app/helpers/compare_helper.rb
app/helpers/compare_helper.rb
+12
-12
app/views/events/event/_push.html.haml
app/views/events/event/_push.html.haml
+13
-1
app/views/projects/commits/show.html.haml
app/views/projects/commits/show.html.haml
+11
-5
app/views/projects/compare/_form.html.haml
app/views/projects/compare/_form.html.haml
+4
-3
未找到文件。
CHANGELOG
浏览文件 @
722e3935
...
...
@@ -49,6 +49,7 @@ v 7.11.0 (unreleased)
- Add footnotes support to Markdown (Guillaume Delbergue)
- Add current_sign_in_at to UserFull REST api.
- Make Sidekiq MemoryKiller shutdown signal configurable
- Add "Create Merge Request" buttons to commits page and push event.
v 7.10.2
- Fix CI links on MR page
...
...
app/helpers/compare_helper.rb
浏览文件 @
722e3935
module
CompareHelper
def
c
ompare_to_mr_button?
@
project
.
merge_requests_enabled
&&
params
[
:from
]
.
present?
&&
params
[
:to
]
.
present?
&&
@repository
.
branch_names
.
include?
(
params
[
:from
]
)
&&
@repository
.
branch_names
.
include?
(
params
[
:to
]
)
&&
params
[
:from
]
!=
params
[
:to
]
&&
def
c
reate_mr_button?
(
from
=
params
[
:from
],
to
=
params
[
:to
],
project
=
@project
)
project
.
merge_requests_enabled
&&
from
.
present?
&&
to
.
present?
&&
project
.
repository
.
branch_names
.
include?
(
from
)
&&
project
.
repository
.
branch_names
.
include?
(
to
)
&&
from
!=
to
&&
!
@refs_are_same
end
def
c
ompare_mr_path
def
c
reate_mr_path
(
from
=
params
[
:from
],
to
=
params
[
:to
],
project
=
@project
)
new_namespace_project_merge_request_path
(
@
project
.
namespace
,
@
project
,
project
.
namespace
,
project
,
merge_request:
{
source_branch:
params
[
:to
]
,
target_branch:
params
[
:from
]
source_branch:
to
,
target_branch:
from
}
)
end
...
...
app/views/events/event/_push.html.haml
浏览文件 @
722e3935
...
...
@@ -17,15 +17,27 @@
-
few_commits
.
each
do
|
commit
|
=
render
"events/commit"
,
commit:
commit
,
project:
project
-
create_mr
=
current_user
==
event
.
author
&&
event
.
new_ref?
&&
create_mr_button?
(
event
.
project
.
default_branch
,
event
.
ref_name
,
event
.
project
)
-
if
event
.
commits_count
>
1
%li
.commits-stat
-
if
event
.
commits_count
>
2
%span
... and
#{
event
.
commits_count
-
2
}
more commits.
-
if
event
.
md_ref?
-
from
=
event
.
commit_from
-
from_label
=
truncate_sha
(
from
)
-
else
-
from
=
event
.
project
.
default_branch
-
from_label
=
from
=
link_to
namespace_project_compare_path
(
event
.
project
.
namespace
,
event
.
project
,
from:
from
,
to:
event
.
commit_to
)
do
%strong
Compare
→
#{
from_label
}
...
#{
truncate_sha
(
event
.
commit_to
)
}
Compare
#{
from_label
}
...
#{
truncate_sha
(
event
.
commit_to
)
}
-
if
create_mr
or
=
link_to
create_mr_path
(
event
.
project
.
default_branch
,
event
.
ref_name
,
event
.
project
)
do
create a merge request
-
elsif
create_mr
%li
.commits-stat
=
link_to
create_mr_path
(
event
.
project
.
default_branch
,
event
.
ref_name
,
event
.
project
)
do
Create Merge Request
app/views/projects/commits/show.html.haml
浏览文件 @
722e3935
...
...
@@ -8,11 +8,17 @@
.tree-ref-holder
=
render
'shared/ref_switcher'
,
destination:
'commits'
-
if
current_user
&&
current_user
.
private_token
.commits-feed-holder.hidden-xs.hidden-sm
=
link_to
namespace_project_commits_path
(
@project
.
namespace
,
@project
,
@ref
,
{
format: :atom
,
private_token:
current_user
.
private_token
}),
title:
"Feed"
,
class:
'btn'
do
%i
.fa.fa-rss
Commits feed
.commits-feed-holder.hidden-xs.hidden-sm
-
if
create_mr_button?
(
@repository
.
root_ref
,
@ref
)
=
link_to
create_mr_path
(
@repository
.
root_ref
,
@ref
),
class:
'btn btn-success'
do
=
icon
(
'plus'
)
Create Merge Request
-
if
current_user
&&
current_user
.
private_token
=
link_to
namespace_project_commits_path
(
@project
.
namespace
,
@project
,
@ref
,
{
format: :atom
,
private_token:
current_user
.
private_token
}),
title:
"Feed"
,
class:
'prepend-left-10 btn'
do
=
icon
(
"rss"
)
Commits Feed
%ul
.breadcrumb.repo-breadcrumb
=
commits_breadcrumbs
...
...
app/views/projects/compare/_form.html.haml
浏览文件 @
722e3935
...
...
@@ -13,9 +13,10 @@
=
text_field_tag
:to
,
params
[
:to
],
class:
"form-control"
=
button_tag
"Compare"
,
class:
"btn btn-create commits-compare-btn"
-
if
compare_to_mr_button?
=
link_to
compare_mr_path
,
class:
'prepend-left-10 btn'
do
%strong
Make a merge request
-
if
create_mr_button?
=
link_to
create_mr_path
,
class:
'prepend-left-10 btn'
do
=
icon
(
"plus"
)
Create Merge Request
:javascript
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录