summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorTim Zallmann <tzallmann@gitlab.com>2018-01-17 13:31:16 +0000
committerTim Zallmann <tzallmann@gitlab.com>2018-01-17 13:31:16 +0000
commitd7eb36921853d399076d18be8e5d4e4252d43cfa (patch)
tree42845944628d674fe0084b81a4dcff06b337f1ba /scripts
parent612d2266253a37a4f56b053f4dc17dd4f351f0d6 (diff)
parentecf6f1f8729119f7a7c4b9847a6a5c4eea331cab (diff)
downloadgitlab-ce-d7eb36921853d399076d18be8e5d4e4252d43cfa.tar.gz
Merge branch 'revert-c8ddf067' into 'master'
Revert "Merge branch 'pre-commit-prettier' into 'master'" See merge request gitlab-org/gitlab-ce!16217
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/add-code-formatters18
-rw-r--r--scripts/pre-commit18
2 files changed, 0 insertions, 36 deletions
diff --git a/scripts/add-code-formatters b/scripts/add-code-formatters
deleted file mode 100755
index 56bb8754d80..00000000000
--- a/scripts/add-code-formatters
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-# Check if file exists with -f. Check if in in the gdk rook directory.
-if [ ! -f ../GDK_ROOT ]; then
- echo "Please run script from gitlab (e.g. gitlab-development-kit/gitlab) root directory."
- exit 1
-fi
-
-PRECOMMIT=$(git rev-parse --git-dir)/hooks/pre-commit
-
-# Check if symlink exists with -L. Check if script was already installed.
-if [ -L $PRECOMMIT ]; then
- echo "Pre-commit script already installed."
- exit 1
-fi
-
-ln -s ./pre-commit $PRECOMMIT
-echo "Pre-commit script installed successfully"
diff --git a/scripts/pre-commit b/scripts/pre-commit
deleted file mode 100644
index 48935e90a87..00000000000
--- a/scripts/pre-commit
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-# Check if file exists with -f. Check if in in the gdk rook directory.
-if [ ! -f ../GDK_ROOT ]; then
- echo "Please run pre-commit from gitlab (e.g. gitlab-development-kit/gitlab) root directory."
- exit 1
-fi
-
-jsfiles=$(git diff --cached --name-only --diff-filter=ACM "*.js" | tr '\n' ' ')
-[ -z "$jsfiles" ] && exit 0
-
-# Prettify all staged .js files
-echo "$jsfiles" | xargs ./node_modules/.bin/prettier --write
-
-# Add back the modified/prettified files to staging
-echo "$jsfiles" | xargs git add
-
-exit 0