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
1f4c2fcc
Commit
1f4c2fcc
authored
Apr 06, 2018
by
Stan Hu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resolve conflicts in spec/models/environment_spec.rb
parent
b7e3f3c3
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
6 deletions
+0
-6
spec/models/environment_spec.rb
spec/models/environment_spec.rb
+0
-6
No files found.
spec/models/environment_spec.rb
View file @
1f4c2fcc
...
...
@@ -369,20 +369,14 @@ describe Environment do
end
describe
'#deployment_platform'
do
<<<<<<<
HEAD
before
do
stub_licensed_features
(
multiple_clusters:
true
)
end
context
'when there is a deployment platform for environment'
do
let!
(
:cluster
)
do
create
(
:cluster
,
:provided_by_gcp
,
projects:
[
project
])
=======
context
'when there is a deployment platform for environment'
do
let!
(
:cluster
)
do
create
(
:cluster
,
:provided_by_gcp
,
environment_scope:
'*'
,
projects:
[
project
])
>>>>>>>
upstream
/
master
end
it
'finds a deployment platform'
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