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
5960aed3
Commit
5960aed3
authored
Nov 21, 2016
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix after review
parent
903c8132
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
12 deletions
+6
-12
app/assets/javascripts/environments/components/environment.js.es6
...ts/javascripts/environments/components/environment.js.es6
+4
-8
app/assets/javascripts/environments/components/environment_actions.js.es6
...cripts/environments/components/environment_actions.js.es6
+1
-2
app/assets/javascripts/environments/components/environment_stop.js.es6
...vascripts/environments/components/environment_stop.js.es6
+1
-2
No files found.
app/assets/javascripts/environments/components/environment.js.es6
View file @
5960aed3
...
@@ -157,8 +157,7 @@
...
@@ -157,8 +157,7 @@
<li v-bind:class="{ 'active': scope === undefined }">
<li v-bind:class="{ 'active': scope === undefined }">
<a :href="projectEnvironmentsPath">
<a :href="projectEnvironmentsPath">
Available
Available
<span
<span class="badge js-available-environments-count">
class="badge js-available-environments-count">
{{state.availableCounter}}
{{state.availableCounter}}
</span>
</span>
</a>
</a>
...
@@ -166,8 +165,7 @@
...
@@ -166,8 +165,7 @@
<li v-bind:class="{ 'active' : scope === 'stopped' }">
<li v-bind:class="{ 'active' : scope === 'stopped' }">
<a :href="projectStoppedEnvironmentsPath">
<a :href="projectStoppedEnvironmentsPath">
Stopped
Stopped
<span
<span class="badge js-stopped-environments-count">
class="badge js-stopped-environments-count">
{{state.stoppedCounter}}
{{state.stoppedCounter}}
</span>
</span>
</a>
</a>
...
@@ -185,8 +183,7 @@
...
@@ -185,8 +183,7 @@
<i class="fa fa-spinner spin"></i>
<i class="fa fa-spinner spin"></i>
</div>
</div>
<div
<div class="blank-state blank-state-no-icon"
class="blank-state blank-state-no-icon"
v-if="!isLoading && state.environments.length === 0">
v-if="!isLoading && state.environments.length === 0">
<h2 class="blank-state-title">
<h2 class="blank-state-title">
You don't have any environments right now.
You don't have any environments right now.
...
@@ -207,8 +204,7 @@
...
@@ -207,8 +204,7 @@
</a>
</a>
</div>
</div>
<div
<div class="table-holder"
class="table-holder"
v-if="!isLoading && state.environments.length > 0">
v-if="!isLoading && state.environments.length > 0">
<table class="table ci-table environments">
<table class="table ci-table environments">
<thead>
<thead>
...
...
app/assets/javascripts/environments/components/environment_actions.js.es6
View file @
5960aed3
...
@@ -53,8 +53,7 @@
...
@@ -53,8 +53,7 @@
data-method="post"
data-method="post"
rel="nofollow"
rel="nofollow"
class="js-manual-action-link">
class="js-manual-action-link">
<span class="action-play-icon-container">
<span class="action-play-icon-container"></span>
</span>
<span>
<span>
{{action.name}}
{{action.name}}
</span>
</span>
...
...
app/assets/javascripts/environments/components/environment_stop.js.es6
View file @
5960aed3
...
@@ -14,8 +14,7 @@
...
@@ -14,8 +14,7 @@
},
},
template: `
template: `
<a
<a class="btn stop-env-link"
class="btn stop-env-link"
:href="stop_url"
:href="stop_url"
data-confirm="Are you sure you want to stop this environment?"
data-confirm="Are you sure you want to stop this environment?"
data-method="post"
data-method="post"
...
...
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