Commit de3ff2d4 authored by Mike Greiling's avatar Mike Greiling

Merge branch 'prettify-all-remaining-things' into prettify-all-remaining-things-ee

* prettify-all-remaining-things:
  Add prettier to static-analysis job
  Fix eslint violations
  Prettify remaining files with differences in CE and EE
parents f930c674 31f26a93
...@@ -135,12 +135,12 @@ export default class EnvironmentsStore { ...@@ -135,12 +135,12 @@ export default class EnvironmentsStore {
return count; return count;
} }
/* /**
* Toggles folder open property for the given folder. * Toggles folder open property for the given folder.
* *
* @param {Object} folder * @param {Object} folder
* @return {Array} * @return {Array}
*/ */
toggleFolder(folder) { toggleFolder(folder) {
return this.updateEnvironmentProp(folder, 'isOpen', !folder.isOpen); return this.updateEnvironmentProp(folder, 'isOpen', !folder.isOpen);
} }
......
...@@ -97,6 +97,7 @@ export default class Members { ...@@ -97,6 +97,7 @@ export default class Members {
$ldapPermissionsElement.toggle(); $ldapPermissionsElement.toggle();
} }
// eslint-disable-next-line class-methods-use-this // eslint-disable-next-line class-methods-use-this
getMemberListItems($el) { getMemberListItems($el) {
const $memberListItem = $el.is('.member') ? $el : $(`#${$el.data('elId')}`); const $memberListItem = $el.is('.member') ? $el : $(`#${$el.data('elId')}`);
...@@ -134,6 +135,7 @@ export default class Members { ...@@ -134,6 +135,7 @@ export default class Members {
} }
}); });
} }
// eslint-disable-next-line class-methods-use-this // eslint-disable-next-line class-methods-use-this
overrideLdap($memberListitem, endpoint, override) { overrideLdap($memberListitem, endpoint, override) {
return axios return axios
......
...@@ -51,7 +51,6 @@ export default { ...@@ -51,7 +51,6 @@ export default {
* We need to emit this event on both component & eventHub * We need to emit this event on both component & eventHub
* for 2 dependencies; * for 2 dependencies;
* *
* Make Epic sidebar auto-expand when participants & label icon is clicked
* 1. eventHub: This component is used in Issue Boards sidebar * 1. eventHub: This component is used in Issue Boards sidebar
* where component template is part of HAML * where component template is part of HAML
* and event listeners are tied to app's eventHub. * and event listeners are tied to app's eventHub.
......
...@@ -30,6 +30,7 @@ tasks = [ ...@@ -30,6 +30,7 @@ tasks = [
%w[bin/rake lint:all], %w[bin/rake lint:all],
%w[bundle exec license_finder], %w[bundle exec license_finder],
%w[yarn run eslint], %w[yarn run eslint],
%w[yarn run prettier-all],
%w[bundle exec rubocop --parallel], %w[bundle exec rubocop --parallel],
%w[scripts/lint-conflicts.sh], %w[scripts/lint-conflicts.sh],
%w[scripts/lint-rugged] %w[scripts/lint-rugged]
......
...@@ -90,7 +90,7 @@ describe('Environments Folder View', () => { ...@@ -90,7 +90,7 @@ describe('Environments Folder View', () => {
it('should render parent folder name', done => { it('should render parent folder name', done => {
setTimeout(() => { setTimeout(() => {
expect(component.$el.querySelector('.js-folder-name').textContent).toContain( expect(component.$el.querySelector('.js-folder-name').textContent.trim()).toContain(
'Environments / review', 'Environments / review',
); );
done(); done();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment