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
Tatuya Kamada
gitlab-ce
Commits
a72d4491
Commit
a72d4491
authored
Jul 25, 2016
by
Timothy Andrew
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove duplicate specs from `git_access_spec`
- Likely introduced during an improper conflict resolution.
parent
7b2ad2d5
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
9 deletions
+7
-9
spec/lib/gitlab/git_access_spec.rb
spec/lib/gitlab/git_access_spec.rb
+7
-9
No files found.
spec/lib/gitlab/git_access_spec.rb
View file @
a72d4491
...
@@ -250,6 +250,9 @@ describe Gitlab::GitAccess, lib: true do
...
@@ -250,6 +250,9 @@ describe Gitlab::GitAccess, lib: true do
state:
'locked'
,
in_progress_merge_commit_sha:
merge_into_protected_branch
)
state:
'locked'
,
in_progress_merge_commit_sha:
merge_into_protected_branch
)
end
end
run_permission_checks
(
permissions_matrix
.
deep_merge
(
developer:
{
merge_into_protected_branch:
true
}))
end
context
"when the merge request is not in progress"
do
context
"when the merge request is not in progress"
do
before
do
before
do
create
(
:merge_request
,
source_project:
project
,
source_branch:
unprotected_branch
,
target_branch:
'feature'
,
in_progress_merge_commit_sha:
nil
)
create
(
:merge_request
,
source_project:
project
,
source_branch:
unprotected_branch
,
target_branch:
'feature'
,
in_progress_merge_commit_sha:
nil
)
...
@@ -257,16 +260,11 @@ describe Gitlab::GitAccess, lib: true do
...
@@ -257,16 +260,11 @@ describe Gitlab::GitAccess, lib: true do
run_permission_checks
(
permissions_matrix
.
deep_merge
(
developer:
{
merge_into_protected_branch:
false
}))
run_permission_checks
(
permissions_matrix
.
deep_merge
(
developer:
{
merge_into_protected_branch:
false
}))
end
end
end
context
"when a merge request does not exist for the given source/target branch"
do
context
"when a merge request does not exist for the given source/target branch"
do
run_permission_checks
(
permissions_matrix
.
deep_merge
(
developer:
{
merge_into_protected_branch:
false
}))
run_permission_checks
(
permissions_matrix
.
deep_merge
(
developer:
{
merge_into_protected_branch:
false
}))
end
end
end
end
context
"when a merge request does not exist for the given source/target branch"
do
run_permission_checks
(
permissions_matrix
.
deep_merge
(
developer:
{
merge_into_protected_branch:
false
}))
end
end
end
context
"when developers are allowed to push and merge into the
#{
protected_branch_type
}
protected branch"
do
context
"when developers are allowed to push and merge into the
#{
protected_branch_type
}
protected branch"
do
...
...
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