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
cd5813ee
Commit
cd5813ee
authored
Nov 30, 2016
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix comma-dangle in function's arguments errors
parent
54e62874
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
app/assets/javascripts/environments/components/environment_item.js.es6
...vascripts/environments/components/environment_item.js.es6
+1
-1
spec/javascripts/environments/environment_item_spec.js.es6
spec/javascripts/environments/environment_item_spec.js.es6
+2
-2
No files found.
app/assets/javascripts/environments/components/environment_item.js.es6
View file @
cd5813ee
...
@@ -166,7 +166,7 @@
...
@@ -166,7 +166,7 @@
*/
*/
createdDate() {
createdDate() {
return window.gl.environmentsList.timeagoInstance.format(
return window.gl.environmentsList.timeagoInstance.format(
this.model.last_deployment.deployable.created_at
this.model.last_deployment.deployable.created_at
,
);
);
},
},
...
...
spec/javascripts/environments/environment_item_spec.js.es6
View file @
cd5813ee
...
@@ -155,11 +155,11 @@ describe('Environment item', () => {
...
@@ -155,11 +155,11 @@ describe('Environment item', () => {
it('should render last deployment date', () => {
it('should render last deployment date', () => {
const timeagoInstance = new timeago(); // eslint-disable-line
const timeagoInstance = new timeago(); // eslint-disable-line
const formatedDate = timeagoInstance.format(
const formatedDate = timeagoInstance.format(
environment.last_deployment.deployable.created_at
environment.last_deployment.deployable.created_at
,
);
);
expect(
expect(
component.$el.querySelector('.environment-created-date-timeago').textContent
component.$el.querySelector('.environment-created-date-timeago').textContent
,
).toContain(formatedDate);
).toContain(formatedDate);
});
});
...
...
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