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
fbe12f2f
Commit
fbe12f2f
authored
May 04, 2017
by
Nick Thomas
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix conflicts in environment Vue component
parent
429ef655
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
0 additions
and
16 deletions
+0
-16
app/assets/javascripts/environments/components/environment.vue
...ssets/javascripts/environments/components/environment.vue
+0
-3
app/assets/javascripts/environments/components/environment_item.vue
.../javascripts/environments/components/environment_item.vue
+0
-3
app/assets/javascripts/environments/components/environment_rollback.vue
...ascripts/environments/components/environment_rollback.vue
+0
-3
app/assets/javascripts/environments/components/environment_stop.vue
.../javascripts/environments/components/environment_stop.vue
+0
-3
app/assets/javascripts/environments/components/environments_table.vue
...avascripts/environments/components/environments_table.vue
+0
-4
No files found.
app/assets/javascripts/environments/components/environment.vue
View file @
fbe12f2f
...
...
@@ -247,12 +247,9 @@ export default {
:environments=
"state.environments"
:can-create-deployment=
"canCreateDeploymentParsed"
:can-read-environment=
"canReadEnvironmentParsed"
<<<<<<<
HEAD
:toggleDeployBoard=
"toggleDeployBoard"
:store=
"store"
:service=
"service"
=======
>
>>>>>> ce/master
:is-loading-folder-content=
"isLoadingFolderContent"
/>
</div>
...
...
app/assets/javascripts/environments/components/environment_item.vue
View file @
fbe12f2f
...
...
@@ -41,7 +41,6 @@ export default {
required
:
false
,
default
:
false
,
},
<<<<<<<
HEAD
toggleDeployBoard
:
{
type
:
Function
,
...
...
@@ -53,8 +52,6 @@ export default {
required
:
true
,
default
:
()
=>
({}),
},
=======
>>>>>>>
ce
/
master
},
computed
:
{
...
...
app/assets/javascripts/environments/components/environment_rollback.vue
View file @
fbe12f2f
...
...
@@ -18,15 +18,12 @@ export default {
type
:
Boolean
,
default
:
true
,
},
<<<<<<<
HEAD
service
:
{
type
:
Object
,
required
:
true
,
default
:
()
=>
({}),
},
=======
>>>>>>>
ce
/
master
},
data
()
{
...
...
app/assets/javascripts/environments/components/environment_stop.vue
View file @
fbe12f2f
...
...
@@ -11,15 +11,12 @@ export default {
type
:
String
,
default
:
''
,
},
<<<<<<<
HEAD
service
:
{
type
:
Object
,
required
:
true
,
default
:
()
=>
({}),
},
=======
>>>>>>>
ce
/
master
},
data
()
{
...
...
app/assets/javascripts/environments/components/environments_table.vue
View file @
fbe12f2f
...
...
@@ -87,7 +87,6 @@ export default {
:model=
"model"
:can-create-deployment=
"canCreateDeployment"
:can-read-environment=
"canReadEnvironment"
<<<<<<<
HEAD
:service=
"service"
:toggleDeployBoard=
"toggleDeployBoard"
/>
...
...
@@ -103,9 +102,6 @@ export default {
/>
</td>
</tr>
=======
/>
>>>>>>> ce/master
<template
v-if=
"model.isFolder && model.isOpen && model.children && model.children.length > 0"
>
<tr
v-if=
"isLoadingFolderContent"
>
...
...
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