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
da2645fd
Commit
da2645fd
authored
7 years ago
by
Bob Van Landuyt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix conflicts in spec/services/merge_requests
parent
93f60bad
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
0 additions
and
12 deletions
+0
-12
spec/services/merge_requests/conflicts/resolve_service_spec.rb
...services/merge_requests/conflicts/resolve_service_spec.rb
+0
-8
spec/services/merge_requests/refresh_service_spec.rb
spec/services/merge_requests/refresh_service_spec.rb
+0
-4
No files found.
spec/services/merge_requests/conflicts/resolve_service_spec.rb
View file @
da2645fd
...
...
@@ -6,15 +6,7 @@ describe MergeRequests::Conflicts::ResolveService do
let
(
:project
)
{
create
(
:project
,
:public
,
:repository
)
}
let
(
:forked_project
)
do
<<<<<<<
HEAD
fork_project_with_submodules
(
project
,
user
)
=======
forked_project
=
fork_project
(
project
,
user
)
TestEnv
.
copy_repo
(
forked_project
,
bare_repo:
TestEnv
.
forked_repo_path_bare
,
refs:
TestEnv
::
FORKED_BRANCH_SHA
)
forked_project
>>>>>>>
ce
-
com
/
master
end
let
(
:merge_request
)
do
...
...
This diff is collapsed.
Click to expand it.
spec/services/merge_requests/refresh_service_spec.rb
View file @
da2645fd
...
...
@@ -13,11 +13,7 @@ describe MergeRequests::RefreshService do
group
=
create
(
:group
)
group
.
add_owner
(
@user
)
<<<<<<<
HEAD
@project
=
create
(
:project
,
:repository
,
namespace:
group
,
approvals_before_merge:
1
,
reset_approvals_on_push:
true
)
=======
@project
=
create
(
:project
,
:repository
,
namespace:
group
)
>>>>>>>
ce
-
com
/
master
@fork_project
=
fork_project
(
@project
,
@user
,
repository:
true
)
@merge_request
=
create
(
:merge_request
,
...
...
This diff is collapsed.
Click to expand it.
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