Skip to content
Snippets Groups Projects

Don't execute git hooks if you create branch as part of other change

Merged Kamil Trzciński requested to merge fix-git-hooks-when-creating-file into master
All threads resolved!
Compare and Show latest version
874 files
+ 21524
14208
Compare changes
  • Side-by-side
  • Inline
Files
874
@@ -10,6 +10,7 @@
@@ -10,6 +10,7 @@
window.gl.issueBoards = window.gl.issueBoards || {};
window.gl.issueBoards = window.gl.issueBoards || {};
gl.issueBoards.Board = Vue.extend({
gl.issueBoards.Board = Vue.extend({
 
template: '#js-board-template',
components: {
components: {
'board-list': gl.issueBoards.BoardList,
'board-list': gl.issueBoards.BoardList,
'board-delete': gl.issueBoards.BoardDelete,
'board-delete': gl.issueBoards.BoardDelete,
@@ -24,7 +25,6 @@
@@ -24,7 +25,6 @@
return {
return {
detailIssue: Store.detail,
detailIssue: Store.detail,
filters: Store.state.filters,
filters: Store.state.filters,
showIssueForm: false
};
};
},
},
watch: {
watch: {
@@ -58,10 +58,10 @@
@@ -58,10 +58,10 @@
},
},
methods: {
methods: {
showNewIssueForm() {
showNewIssueForm() {
this.showIssueForm = !this.showIssueForm;
this.$refs['board-list'].showIssueForm = !this.$refs['board-list'].showIssueForm;
}
}
},
},
ready () {
mounted () {
const options = gl.issueBoards.getBoardSortableDefaultOptions({
const options = gl.issueBoards.getBoardSortableDefaultOptions({
disabled: this.disabled,
disabled: this.disabled,
group: 'boards',
group: 'boards',
@@ -72,13 +72,9 @@
@@ -72,13 +72,9 @@
if (e.newIndex !== undefined && e.oldIndex !== e.newIndex) {
if (e.newIndex !== undefined && e.oldIndex !== e.newIndex) {
const order = this.sortable.toArray(),
const order = this.sortable.toArray(),
$board = this.$parent.$refs.board[e.oldIndex + 1],
list = Store.findList('id', parseInt(e.item.dataset.id));
list = $board.list;
$board.$destroy(true);
this.$nextTick(() => {
this.$nextTick(() => {
Store.state.lists.splice(e.newIndex, 0, list);
Store.moveList(list, order);
Store.moveList(list, order);
});
});
}
}
@@ -87,8 +83,5 @@
@@ -87,8 +83,5 @@
this.sortable = Sortable.create(this.$el.parentNode, options);
this.sortable = Sortable.create(this.$el.parentNode, options);
},
},
beforeDestroy () {
Store.state.lists.$remove(this.list);
}
});
});
})();
})();
Loading