summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorTim Zallmann <tzallmann@gitlab.com>2017-12-05 16:43:36 +0100
committerTim Zallmann <tzallmann@gitlab.com>2017-12-19 12:26:02 +0100
commit4bc348ce5fd9b143622a52e001949eabbc27142f (patch)
treef2af89d2264bc1478e932d06807cbf6f32bdec1c /app
parenteceb81593228b48e695ec5dad0ac97788fc6d8de (diff)
downloadgitlab-ce-4bc348ce5fd9b143622a52e001949eabbc27142f.tar.gz
Fixed Linting
Diffstat (limited to 'app')
-rw-r--r--app/assets/javascripts/ide/components/ide_context_bar.vue2
-rw-r--r--app/assets/javascripts/ide/components/ide_project_branches_tree.vue2
-rw-r--r--app/assets/javascripts/ide/components/ide_side_bar.vue2
-rw-r--r--app/assets/javascripts/ide/components/new_dropdown/index.vue2
-rw-r--r--app/assets/javascripts/ide/components/repo.vue2
-rw-r--r--app/assets/javascripts/ide/components/repo_commit_section.vue10
-rw-r--r--app/assets/javascripts/ide/components/repo_editor.vue7
-rw-r--r--app/assets/javascripts/ide/stores/actions/tree.js5
-rw-r--r--app/controllers/ide_controller.rb3
9 files changed, 16 insertions, 19 deletions
diff --git a/app/assets/javascripts/ide/components/ide_context_bar.vue b/app/assets/javascripts/ide/components/ide_context_bar.vue
index 93ed1691b73..17737622506 100644
--- a/app/assets/javascripts/ide/components/ide_context_bar.vue
+++ b/app/assets/javascripts/ide/components/ide_context_bar.vue
@@ -19,7 +19,7 @@ export default {
]),
currentIcon() {
return this.collapsed ? 'angle-double-left' : 'angle-double-right';
- }
+ },
},
methods: {
toggleCollapsed() {
diff --git a/app/assets/javascripts/ide/components/ide_project_branches_tree.vue b/app/assets/javascripts/ide/components/ide_project_branches_tree.vue
index 459e804f89c..84b650939ee 100644
--- a/app/assets/javascripts/ide/components/ide_project_branches_tree.vue
+++ b/app/assets/javascripts/ide/components/ide_project_branches_tree.vue
@@ -7,7 +7,7 @@ export default {
components: {
RepoTree,
Icon,
- newDropdown
+ newDropdown,
},
props: {
projectId: {
diff --git a/app/assets/javascripts/ide/components/ide_side_bar.vue b/app/assets/javascripts/ide/components/ide_side_bar.vue
index 894763a55b3..2644c681d06 100644
--- a/app/assets/javascripts/ide/components/ide_side_bar.vue
+++ b/app/assets/javascripts/ide/components/ide_side_bar.vue
@@ -20,7 +20,7 @@ export default {
]),
currentIcon() {
return this.collapsed ? 'angle-double-right' : 'angle-double-left';
- }
+ },
},
methods: {
toggleCollapsed() {
diff --git a/app/assets/javascripts/ide/components/new_dropdown/index.vue b/app/assets/javascripts/ide/components/new_dropdown/index.vue
index 612c149130c..cacaa728309 100644
--- a/app/assets/javascripts/ide/components/new_dropdown/index.vue
+++ b/app/assets/javascripts/ide/components/new_dropdown/index.vue
@@ -47,7 +47,7 @@
...mapState([
'trees',
]),
- }
+ },
};
</script>
diff --git a/app/assets/javascripts/ide/components/repo.vue b/app/assets/javascripts/ide/components/repo.vue
index a00e1e9d809..14cbe4c6cc2 100644
--- a/app/assets/javascripts/ide/components/repo.vue
+++ b/app/assets/javascripts/ide/components/repo.vue
@@ -1,6 +1,6 @@
<script>
import { mapState, mapGetters } from 'vuex';
-import RepoSidebar from './repo_sidebar.vue';
+import RepoSidebar from './ide_side_bar.vue';
import RepoCommitSection from './repo_commit_section.vue';
import RepoTabs from './repo_tabs.vue';
import RepoFileButtons from './repo_file_buttons.vue';
diff --git a/app/assets/javascripts/ide/components/repo_commit_section.vue b/app/assets/javascripts/ide/components/repo_commit_section.vue
index e19df063910..2b282b5a26b 100644
--- a/app/assets/javascripts/ide/components/repo_commit_section.vue
+++ b/app/assets/javascripts/ide/components/repo_commit_section.vue
@@ -69,11 +69,11 @@ export default {
this.commitChanges({ payload, newMr: this.startNewMR })
.then(() => {
this.submitCommitsLoading = false;
- store.dispatch('getTreeData', {
- projectId: this.currentProjectId,
- branch: this.currentBranchId,
- endpoint: `/${this.currentProjectId}/tree/${to.params.branch}`,
- });
+ this.$store.dispatch('getTreeData', {
+ projectId: this.currentProjectId,
+ branch: this.currentBranchId,
+ endpoint: `/${this.currentProjectId}/tree/${this.currentBranchId}`,
+ });
})
.catch(() => {
this.submitCommitsLoading = false;
diff --git a/app/assets/javascripts/ide/components/repo_editor.vue b/app/assets/javascripts/ide/components/repo_editor.vue
index f83c133332a..cafe5665ce6 100644
--- a/app/assets/javascripts/ide/components/repo_editor.vue
+++ b/app/assets/javascripts/ide/components/repo_editor.vue
@@ -41,10 +41,7 @@ export default {
.catch(() => flash('Error setting up monaco. Please try again.'));
},
setupEditor() {
- if (!this.activeFile) {
- alert('NO ACTIVE FILE ');
- return;
- }
+ if (!this.activeFile) return;
const model = this.editor.createModel(this.activeFile);
@@ -64,7 +61,7 @@ export default {
editorRow: e.position.lineNumber,
editorColumn: e.position.column,
});
- });
+ });
this.editor.setPosition({
lineNumber: this.activeFile.editorRow,
diff --git a/app/assets/javascripts/ide/stores/actions/tree.js b/app/assets/javascripts/ide/stores/actions/tree.js
index 8dd75541d0a..2cc0f25fe83 100644
--- a/app/assets/javascripts/ide/stores/actions/tree.js
+++ b/app/assets/javascripts/ide/stores/actions/tree.js
@@ -82,7 +82,10 @@ export const handleTreeEntryAction = ({ commit, dispatch }, row) => {
}
};
-export const createTempTree = ({ state, commit, dispatch }, { projectId, branchId, parent, name }) => {
+export const createTempTree = (
+ { state, commit, dispatch },
+ { projectId, branchId, parent, name },
+) => {
let selectedTree = state;
const dirNames = name.replace(new RegExp(`^${state.path}/`), '').split('/');
diff --git a/app/controllers/ide_controller.rb b/app/controllers/ide_controller.rb
index 30a0142c6d1..1ff25a45398 100644
--- a/app/controllers/ide_controller.rb
+++ b/app/controllers/ide_controller.rb
@@ -2,8 +2,5 @@ class IdeController < ApplicationController
layout 'nav_only'
def index
-
end
-
- private
end