Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
d19d094b
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,体验更适合开发者的 AI 搜索 >>
提交
d19d094b
编写于
7月 30, 2013
作者:
D
Dmitriy Zaporozhets
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Remove ugly button and truncate too long project names. Remove unecessary newlines
上级
0d715bcd
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
10 addition
and
13 deletion
+10
-13
app/views/events/_event_last_push.html.haml
app/views/events/_event_last_push.html.haml
+1
-4
app/views/projects/merge_requests/show/_mr_title.html.haml
app/views/projects/merge_requests/show/_mr_title.html.haml
+2
-2
db/migrate/20130419190306_allow_merges_for_forks.rb
db/migrate/20130419190306_allow_merges_for_forks.rb
+0
-2
db/schema.rb
db/schema.rb
+2
-2
lib/gitlab/satellite/merge_action.rb
lib/gitlab/satellite/merge_action.rb
+5
-3
未找到文件。
app/views/events/_event_last_push.html.haml
浏览文件 @
d19d094b
...
...
@@ -9,9 +9,6 @@
=
time_ago_in_words
(
event
.
created_at
)
ago.
.pull-right
=
link_to
new_mr_path_from_push_event
(
event
),
title:
"New Merge Request"
,
class:
"btn btn-
new-mr
"
do
=
link_to
new_mr_path_from_push_event
(
event
),
title:
"New Merge Request"
,
class:
"btn btn-
create btn-small
"
do
Create Merge Request
-
if
!
event
.
project
.
nil?
&&
event
.
project
.
forked?
=
link_to
new_mr_path_for_fork_from_push_event
(
event
),
title:
"New Merge Request"
,
class:
"btn btn-create btn-small"
do
Create Merge Request on fork
%hr
app/views/projects/merge_requests/show/_mr_title.html.haml
浏览文件 @
d19d094b
...
...
@@ -2,10 +2,10 @@
=
"Merge Request #
#{
@merge_request
.
id
}
:"
-
if
@merge_request
.
for_fork?
%span
.label-project
=
@merge_request
.
source_project
.
path_with_namespace
%span
.label-project
=
truncate
(
@merge_request
.
source_project
.
path_with_namespace
,
length:
25
)
%span
.label-branch
=
@merge_request
.
source_branch
→
%span
.label-project
=
@merge_request
.
target_project
.
path_with_namespace
%span
.label-project
=
truncate
(
@merge_request
.
target_project
.
path_with_namespace
,
length:
25
)
%span
.label-branch
=
@merge_request
.
target_branch
-
else
%span
.label-branch
=
@merge_request
.
source_branch
...
...
db/migrate/20130419190306_allow_merges_for_forks.rb
浏览文件 @
d19d094b
class
AllowMergesForForks
<
ActiveRecord
::
Migration
def
self
.
up
add_column
:merge_requests
,
:target_project_id
,
:integer
,
:null
=>
false
MergeRequest
.
update_all
(
"target_project_id = project_id"
)
...
...
@@ -10,5 +9,4 @@ class AllowMergesForForks < ActiveRecord::Migration
remove_column
:merge_requests
,
:target_project_id
rename_column
:merge_requests
,
:source_project_id
,
:project_id
end
end
db/schema.rb
浏览文件 @
d19d094b
...
...
@@ -92,8 +92,8 @@ ActiveRecord::Schema.define(:version => 20130624162710) do
t
.
string
"title"
t
.
datetime
"created_at"
t
.
datetime
"updated_at"
t
.
text
"st_commits"
,
:limit
=>
2147483647
t
.
text
"st_diffs"
,
:limit
=>
2147483647
t
.
text
"st_commits"
,
:limit
=>
2147483647
t
.
text
"st_diffs"
,
:limit
=>
2147483647
t
.
integer
"milestone_id"
t
.
string
"state"
t
.
string
"merge_status"
...
...
lib/gitlab/satellite/merge_action.rb
浏览文件 @
d19d094b
...
...
@@ -48,14 +48,14 @@ module Gitlab
def
diff_in_satellite
in_locked_and_timed_satellite
do
|
merge_repo
|
prepare_satellite!
(
merge_repo
)
update_satellite_source_and_target!
(
merge_repo
)
if
merge_request
.
for_fork?
diff
=
merge_repo
.
git
.
native
(
:diff
,
default_options
,
"origin/
#{
merge_request
.
target_branch
}
"
,
"source/
#{
merge_request
.
source_branch
}
"
)
else
diff
=
merge_repo
.
git
.
native
(
:diff
,
default_options
,
"
#{
merge_request
.
target_branch
}
"
,
"
#{
merge_request
.
source_branch
}
"
)
end
return
diff
end
rescue
Grit
::
Git
::
CommandFailed
=>
ex
...
...
@@ -88,11 +88,13 @@ module Gitlab
in_locked_and_timed_satellite
do
|
merge_repo
|
prepare_satellite!
(
merge_repo
)
update_satellite_source_and_target!
(
merge_repo
)
if
(
merge_request
.
for_fork?
)
patch
=
merge_repo
.
git
.
format_patch
(
default_options
({
stdout:
true
}),
"origin/
#{
merge_request
.
target_branch
}
...source/
#{
merge_request
.
source_branch
}
"
)
else
patch
=
merge_repo
.
git
.
format_patch
(
default_options
({
stdout:
true
}),
"
#{
merge_request
.
target_branch
}
...
#{
merge_request
.
source_branch
}
"
)
end
return
patch
end
rescue
Grit
::
Git
::
CommandFailed
=>
ex
...
...
@@ -139,7 +141,7 @@ module Gitlab
# Assumes a satellite exists that is a fresh clone of the projects repo, prepares satellite for merges, diffs etc
def
update_satellite_source_and_target!
(
repo
)
if
merge_request
.
for_fork?
if
merge_request
.
for_fork?
repo
.
remote_add
(
'source'
,
merge_request
.
source_project
.
repository
.
path_to_repo
)
repo
.
remote_fetch
(
'source'
)
repo
.
git
.
checkout
(
default_options
({
b:
true
}),
merge_request
.
target_branch
,
"origin/
#{
merge_request
.
target_branch
}
"
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录