Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
9b598fa6
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,发现更多精彩内容 >>
未验证
提交
9b598fa6
编写于
4月 03, 2014
作者:
D
Dmitriy Zaporozhets
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix MR fork validation and services load
Signed-off-by:
N
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
上级
9ee697dd
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
11 addition
and
7 deletion
+11
-7
app/models/merge_request.rb
app/models/merge_request.rb
+3
-1
app/services/merge_requests/create_service.rb
app/services/merge_requests/create_service.rb
+1
-1
app/services/merge_requests/update_service.rb
app/services/merge_requests/update_service.rb
+4
-0
features/steps/dashboard/merge_requests.rb
features/steps/dashboard/merge_requests.rb
+3
-3
features/support/env.rb
features/support/env.rb
+0
-2
未找到文件。
app/models/merge_request.rb
浏览文件 @
9b598fa6
...
...
@@ -127,7 +127,9 @@ class MergeRequest < ActiveRecord::Base
end
def
validate_fork
if
target_projet
==
source_project
return
true
unless
target_project
&&
source_project
if
target_project
==
source_project
true
else
# If source and target projects are different
...
...
app/services/merge_requests/create_service.rb
浏览文件 @
9b598fa6
module
MergeReques
module
MergeReques
ts
class
CreateService
<
MergeRequests
::
BaseService
def
execute
merge_request
=
MergeRequest
.
new
(
params
)
...
...
app/services/merge_requests/update_service.rb
浏览文件 @
9b598fa6
require_relative
'base_service'
require_relative
'reopen_service'
require_relative
'close_service'
module
MergeRequests
class
UpdateService
<
MergeRequests
::
BaseService
def
execute
(
merge_request
)
...
...
features/steps/dashboard/merge_requests.rb
浏览文件 @
9b598fa6
...
...
@@ -53,15 +53,15 @@ class DashboardMergeRequests < Spinach::FeatureSteps
end
def
assigned_merge_request
@assigned_merge_request
||=
create
:merge_request
,
assignee:
current_user
,
target_project:
project
@assigned_merge_request
||=
create
:merge_request
,
assignee:
current_user
,
target_project:
project
,
source_project:
project
end
def
authored_merge_request
@authored_merge_request
||=
create
:merge_request
,
author:
current_user
,
target
_project:
project
@authored_merge_request
||=
create
:merge_request
,
source_branch:
'simple_merge_request'
,
author:
current_user
,
target_project:
project
,
source
_project:
project
end
def
other_merge_request
@other_merge_request
||=
create
:merge_request
,
target
_project:
project
@other_merge_request
||=
create
:merge_request
,
source_branch:
'2_3_notes_fix'
,
target_project:
project
,
source
_project:
project
end
def
project
...
...
features/support/env.rb
浏览文件 @
9b598fa6
...
...
@@ -52,6 +52,4 @@ Spinach.hooks.before_run do
RSpec
::
Mocks
::
setup
self
include
FactoryGirl
::
Syntax
::
Methods
MergeRequestObserver
.
any_instance
.
stub
(
current_user:
create
(
:user
))
end
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录