summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke "Jared" Bennett <lbennett@gitlab.com>2017-10-05 17:02:36 +0100
committerJacob Schatz <jschatz1@gmail.com>2017-10-10 14:09:07 -0400
commit9213a735c6adbbe825cfb872d4a82b091d4d27ab (patch)
tree02ced2d205d320b2f6bea0673b28ce8b4763a2dd
parent2bc531a45bce384313a5ae55590d1d5a3df2eaed (diff)
downloadgitlab-ce-fork-or-branch-permissions.tar.gz
-rw-r--r--app/assets/javascripts/repo/components/repo_edit_button.vue8
-rw-r--r--app/assets/javascripts/repo/index.js4
-rw-r--r--spec/javascripts/repo/components/repo_edit_button_spec.js2
3 files changed, 8 insertions, 6 deletions
diff --git a/app/assets/javascripts/repo/components/repo_edit_button.vue b/app/assets/javascripts/repo/components/repo_edit_button.vue
index be631328e9c..64c8bf97862 100644
--- a/app/assets/javascripts/repo/components/repo_edit_button.vue
+++ b/app/assets/javascripts/repo/components/repo_edit_button.vue
@@ -23,14 +23,16 @@ export default {
},
methods: {
editCancelClicked() {
- if(!this.canCommit) {
+ if (!this.canCommit) {
this.showForkDialog = true;
return;
}
- if(this.changedFiles.length) {
+
+ if (this.changedFiles.length) {
this.dialog.open = true;
return;
}
+
this.editMode = !this.editMode;
Store.toggleBlobView();
},
@@ -46,7 +48,7 @@ export default {
Store.showForkDialog = false;
forkForm.name = 'fork-repo';
forkForm.method = 'POST';
- let input = document.createElement('INPUT');
+ const input = document.createElement('INPUT');
input.type = 'HIDDEN';
input.name = csrfParam;
input.value = authToken;
diff --git a/app/assets/javascripts/repo/index.js b/app/assets/javascripts/repo/index.js
index b0000a9818e..0e63a3c701e 100644
--- a/app/assets/javascripts/repo/index.js
+++ b/app/assets/javascripts/repo/index.js
@@ -30,9 +30,9 @@ function setInitialStore(data) {
Store.projectName = data.projectName;
Store.projectUrl = data.projectUrl;
Store.forkUrl = data.forkUrl;
- Store.canCommit = data.canCommit === 'true' ? true : false;
+ Store.canCommit = data.canCommit === 'true';
Store.onTopOfBranch = data.onTopOfBranch;
- Store.signedIn = data.signedIn === 'true' ? true : false;
+ Store.signedIn = data.signedIn === 'true';
Store.currentBranch = $('button.dropdown-menu-toggle').attr('data-ref');
Store.checkIsCommitable();
}
diff --git a/spec/javascripts/repo/components/repo_edit_button_spec.js b/spec/javascripts/repo/components/repo_edit_button_spec.js
index 658532de4de..b29d6bf06fe 100644
--- a/spec/javascripts/repo/components/repo_edit_button_spec.js
+++ b/spec/javascripts/repo/components/repo_edit_button_spec.js
@@ -2,7 +2,7 @@ import Vue from 'vue';
import repoEditButton from '~/repo/components/repo_edit_button.vue';
import RepoStore from '~/repo/stores/repo_store';
-fdescribe('RepoEditButton', () => {
+describe('RepoEditButton', () => {
function createComponent() {
const RepoEditButton = Vue.extend(repoEditButton);