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
1906a32b
Commit
1906a32b
authored
Oct 25, 2016
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix SCSS lint errors
Fixes some tests
parent
cd476336
Changes
5
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
252 additions
and
255 deletions
+252
-255
app/assets/javascripts/environments/environments_bundle.js.es6
...ssets/javascripts/environments/environments_bundle.js.es6
+0
-3
app/assets/javascripts/environments/stores/environmnets_store.js.es6
...javascripts/environments/stores/environmnets_store.js.es6
+10
-11
app/assets/stylesheets/pages/environments.scss
app/assets/stylesheets/pages/environments.scss
+4
-4
app/views/projects/environments/index.html.haml
app/views/projects/environments/index.html.haml
+1
-1
spec/features/environments_spec.rb
spec/features/environments_spec.rb
+237
-236
No files found.
app/assets/javascripts/environments/environments_bundle.js.es6
View file @
1906a32b
...
@@ -73,9 +73,6 @@ $(() => {
...
@@ -73,9 +73,6 @@ $(() => {
ready() {
ready() {
gl.environmentsService.all().then((resp) => {
gl.environmentsService.all().then((resp) => {
Store.storeEnvironments(resp.json());
Store.storeEnvironments(resp.json());
console.log("HELLLLOOOOOOOOOOOOOO", resp.json())
this.loading = false;
this.loading = false;
});
});
},
},
...
...
app/assets/javascripts/environments/stores/environmnets_store.js.es6
View file @
1906a32b
...
@@ -43,17 +43,16 @@
...
@@ -43,17 +43,16 @@
*/
*/
storeEnvironments(environments = []) {
storeEnvironments(environments = []) {
const environmentsTree = environments.reduce((acc, environment) => {
const environmentsTree = environments.reduce((acc, environment) => {
const data = Object.assign({}, environment);
if (environment.last_deployment) {
if (data.last_deployment) {
//humanizes actions names if there are any actions
//humanizes actions names if there are any actions
if (
data
.last_deployment.manual_actions) {
if (
environment
.last_deployment.manual_actions) {
data.last_deployment.manual_actions = data
.last_deployment.manual_actions.map((action) => Object.assign({}, action, {name: gl.text.humanize(action.name)}));
environment.last_deployment.manual_actions = environment
.last_deployment.manual_actions.map((action) => Object.assign({}, action, {name: gl.text.humanize(action.name)}));
}
}
//transforms created date for deployment in a human readable format
//transforms created date for deployment in a human readable format
if (
data
.last_deployment.created_at) {
if (
environment
.last_deployment.created_at) {
// TODO - how to do this without jquery
// TODO - how to do this without jquery
}
}
}
}
...
@@ -64,21 +63,21 @@
...
@@ -64,21 +63,21 @@
});
});
data
["vue-isChildren"] = true;
environment
["vue-isChildren"] = true;
if (occurs !== undefined) {
if (occurs !== undefined) {
acc[acc.indexOf(occurs)].children.push(
data
);
acc[acc.indexOf(occurs)].children.push(
environment
);
acc[acc.indexOf(occurs)].children.push(
data
).sort(this.sortByName)
acc[acc.indexOf(occurs)].children.push(
environment
).sort(this.sortByName)
} else {
} else {
acc.push({
acc.push({
name: environment.environment_type,
name: environment.environment_type,
children: [
children: [
Object.assign(
data
)
Object.assign(
environment
)
]
]
});
});
}
}
} else {
} else {
acc.push(
data
);
acc.push(
environment
);
}
}
return acc;
return acc;
...
...
app/assets/stylesheets/pages/environments.scss
View file @
1906a32b
...
@@ -63,19 +63,19 @@
...
@@ -63,19 +63,19 @@
}
}
}
}
}
}
.children-row
.environment-name
{
.children-row
.environment-name
{
margin-left
:
17px
;
margin-left
:
17px
;
margin-right
:
-17px
;
margin-right
:
-17px
;
}
}
.folder-icon
{
.folder-icon
{
padding
:
0
5px
0
0
;
padding
:
0
5px
0
0
;
}
}
.folder-name
{
.folder-name
{
cursor
:
pointer
;
cursor
:
pointer
;
.badge
{
.badge
{
font-weight
:
normal
;
font-weight
:
normal
;
background-color
:
$gray-darker
;
background-color
:
$gray-darker
;
...
...
app/views/projects/environments/index.html.haml
View file @
1906a32b
...
@@ -41,7 +41,7 @@
...
@@ -41,7 +41,7 @@
=
link_to
new_namespace_project_environment_path
(
@project
.
namespace
,
@project
),
class:
'btn btn-create'
do
=
link_to
new_namespace_project_environment_path
(
@project
.
namespace
,
@project
),
class:
'btn btn-create'
do
New environment
New environment
.table-holder
{
"v-if"
=>
"!loading && state.environments"
}
.table-holder
{
"v-if"
=>
"!loading && state.environments
.length
"
}
%table
.table.ci-table.environments
%table
.table.ci-table.environments
%thead
%thead
%th
Environment
%th
Environment
...
...
spec/features/environments_spec.rb
View file @
1906a32b
This diff is collapsed.
Click to expand it.
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