Skip to content
GitLab
Next
Menu
Why GitLab
Pricing
Contact Sales
Explore
Why GitLab
Pricing
Contact Sales
Explore
Sign in
Get free trial
Primary navigation
Search or go to…
Project
GitLab FOSS
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Privacy statement
Keyboard shortcuts
?
What's new
4
Snippets
Groups
Projects
Show more breadcrumbs
GitLab.org
GitLab FOSS
Commits
51fbb9bf
Commit
51fbb9bf
authored
8 years ago
by
Nick Thomas
Committed by
blackst0ne
8 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Rename forked_source_project_missing? to source_project_missing?
parent
f118d2fc
No related branches found
No related tags found
1 merge request
!9252
Add merge request count to each issue on issues list
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
app/models/merge_request.rb
+3
-3
3 additions, 3 deletions
app/models/merge_request.rb
spec/models/merge_request_spec.rb
+4
-4
4 additions, 4 deletions
spec/models/merge_request_spec.rb
with
7 additions
and
7 deletions
app/models/merge_request.rb
+
3
−
3
View file @
51fbb9bf
...
...
@@ -326,17 +326,17 @@ def validate_branches
def
validate_fork
return
true
unless
target_project
&&
source_project
return
true
if
target_project
==
source_project
return
true
unless
forked_
source_project_missing?
return
true
unless
source_project_missing?
errors
.
add
:validate_fork
,
'Source project is not a fork of the target project'
end
def
closed_without_fork?
closed?
&&
forked_
source_project_missing?
closed?
&&
source_project_missing?
end
def
forked_
source_project_missing?
def
source_project_missing?
return
false
unless
for_fork?
return
true
unless
source_project
...
...
This diff is collapsed.
Click to expand it.
spec/models/merge_request_spec.rb
+
4
−
4
View file @
51fbb9bf
...
...
@@ -1198,7 +1198,7 @@ def create_merge_request(source_branch)
end
end
describe
"#
forked_
source_project_missing?"
do
describe
"#source_project_missing?"
do
let
(
:project
)
{
create
(
:project
)
}
let
(
:fork_project
)
{
create
(
:project
,
forked_from_project:
project
)
}
let
(
:user
)
{
create
(
:user
)
}
...
...
@@ -1211,13 +1211,13 @@ def create_merge_request(source_branch)
target_project:
project
)
end
it
{
expect
(
merge_request
.
forked_
source_project_missing?
).
to
be_falsey
}
it
{
expect
(
merge_request
.
source_project_missing?
).
to
be_falsey
}
end
context
"when the source project is the same as the target project"
do
let
(
:merge_request
)
{
create
(
:merge_request
,
source_project:
project
)
}
it
{
expect
(
merge_request
.
forked_
source_project_missing?
).
to
be_falsey
}
it
{
expect
(
merge_request
.
source_project_missing?
).
to
be_falsey
}
end
context
"when the fork does not exist"
do
...
...
@@ -1231,7 +1231,7 @@ def create_merge_request(source_branch)
unlink_project
.
execute
merge_request
.
reload
expect
(
merge_request
.
forked_
source_project_missing?
).
to
be_truthy
expect
(
merge_request
.
source_project_missing?
).
to
be_truthy
end
end
end
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment