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
42b85f05
Commit
42b85f05
authored
Aug 10, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
No satellites anymore
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
0fd7d3eb
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
3 deletions
+0
-3
features/steps/project/merge_requests.rb
features/steps/project/merge_requests.rb
+0
-3
No files found.
features/steps/project/merge_requests.rb
View file @
42b85f05
...
...
@@ -377,7 +377,6 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
merge_request
=
MergeRequest
.
find_by!
(
title:
"Bug NS-04"
)
project
=
merge_request
.
target_project
project
.
approvals_before_merge
=
1
project
.
ensure_satellite_exists
project
.
save!
end
...
...
@@ -386,7 +385,6 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
project
=
merge_request
.
target_project
project
.
approvals_before_merge
=
1
merge_request
.
approvers
.
create
(
user_id:
current_user
.
id
)
project
.
ensure_satellite_exists
project
.
save!
end
...
...
@@ -395,7 +393,6 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
project
=
merge_request
.
target_project
project
.
approvals_before_merge
=
1
merge_request
.
approvers
.
create
(
user_id:
create
(
:user
).
id
)
project
.
ensure_satellite_exists
project
.
save!
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