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
bc132812
Commit
bc132812
authored
May 04, 2017
by
Nick Thomas
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'nt/ce-to-ee-thursday' of gitlab.com:gitlab-org/gitlab-ee into nt/ce-to-ee-thursday
parents
7a40365d
f85b426e
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
2 additions
and
23 deletions
+2
-23
app/assets/javascripts/environments/components/environment_actions.vue
...vascripts/environments/components/environment_actions.vue
+0
-1
app/assets/javascripts/environments/components/environment_item.vue
.../javascripts/environments/components/environment_item.vue
+0
-5
app/assets/javascripts/environments/components/environment_rollback.vue
...ascripts/environments/components/environment_rollback.vue
+0
-6
app/assets/javascripts/environments/components/environment_stop.vue
.../javascripts/environments/components/environment_stop.vue
+0
-6
app/assets/javascripts/environments/components/environments_table.vue
...avascripts/environments/components/environments_table.vue
+1
-1
app/assets/javascripts/environments/folder/environments_folder_view.vue
...ascripts/environments/folder/environments_folder_view.vue
+1
-4
No files found.
app/assets/javascripts/environments/components/environment_actions.vue
View file @
bc132812
...
...
@@ -29,7 +29,6 @@ export default {
this
.
isLoading
=
true
;
$
(
this
.
$refs
.
tooltip
).
tooltip
(
'
destroy
'
);
eventHub
.
$emit
(
'
postAction
'
,
endpoint
);
},
...
...
app/assets/javascripts/environments/components/environment_item.vue
View file @
bc132812
...
...
@@ -47,11 +47,6 @@ export default {
required
:
false
,
},
service
:
{
type
:
Object
,
required
:
true
,
default
:
()
=>
({}),
},
},
computed
:
{
...
...
app/assets/javascripts/environments/components/environment_rollback.vue
View file @
bc132812
...
...
@@ -18,12 +18,6 @@ export default {
type
:
Boolean
,
default
:
true
,
},
service
:
{
type
:
Object
,
required
:
true
,
default
:
()
=>
({}),
},
},
data
()
{
...
...
app/assets/javascripts/environments/components/environment_stop.vue
View file @
bc132812
...
...
@@ -11,12 +11,6 @@ export default {
type
:
String
,
default
:
''
,
},
service
:
{
type
:
Object
,
required
:
true
,
default
:
()
=>
({}),
},
},
data
()
{
...
...
app/assets/javascripts/environments/components/environments_table.vue
View file @
bc132812
...
...
@@ -87,7 +87,6 @@ export default {
:model=
"model"
:can-create-deployment=
"canCreateDeployment"
:can-read-environment=
"canReadEnvironment"
:service=
"service"
:toggleDeployBoard=
"toggleDeployBoard"
/>
...
...
@@ -121,6 +120,7 @@ export default {
:can-read-environment=
"canReadEnvironment"
/>
<tr>
<td
colspan=
"6"
...
...
app/assets/javascripts/environments/folder/environments_folder_view.vue
View file @
bc132812
...
...
@@ -181,13 +181,10 @@ export default {
:environments=
"state.environments"
:can-create-deployment=
"canCreateDeploymentParsed"
:can-read-environment=
"canReadEnvironmentParsed"
<<<<<<<
HEAD
:toggleDeployBoard=
"toggleDeployBoard"
:store=
"store"
:service=
"service"
/>
=======
:service=
"service"
/>
>>>>>>> ce/master
<table-pagination
v-if=
"state.paginationInformation && state.paginationInformation.totalPages > 1"
...
...
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