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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
93dc3499
Commit
93dc3499
authored
Feb 05, 2019
by
Stan Hu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resolve conflicts in spec/services/members/destroy_service_spec.rb
parent
6b47a29a
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
4 deletions
+0
-4
spec/services/members/destroy_service_spec.rb
spec/services/members/destroy_service_spec.rb
+0
-4
No files found.
spec/services/members/destroy_service_spec.rb
View file @
93dc3499
...
@@ -168,11 +168,7 @@ describe Members::DestroyService do
...
@@ -168,11 +168,7 @@ describe Members::DestroyService do
end
end
it_behaves_like
'a service destroying a member'
do
it_behaves_like
'a service destroying a member'
do
<<<<<<<
HEAD
let
(
:opts
)
{
{
skip_authorization:
true
,
skip_subresources:
true
}
}
let
(
:opts
)
{
{
skip_authorization:
true
,
skip_subresources:
true
}
}
=======
let
(
:opts
)
{
{
skip_authorization:
true
,
skip_subresources:
true
}
}
>>>>>>>
dev
/
master
let
(
:member
)
{
group
.
requesters
.
find_by
(
user_id:
member_user
.
id
)
}
let
(
:member
)
{
group
.
requesters
.
find_by
(
user_id:
member_user
.
id
)
}
end
end
end
end
...
...
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