diff options
| author | Clement Ho <clemmakesapps@gmail.com> | 2018-01-17 21:01:06 +0000 |
|---|---|---|
| committer | Clement Ho <clemmakesapps@gmail.com> | 2018-01-17 21:01:06 +0000 |
| commit | 195448c28c3a3238126e9e21f7b1abb8f186980e (patch) | |
| tree | 0d2d760317e17aeb3a7dc0d74ffc5d1978a00cb0 /scripts/pre-commit | |
| parent | 525b178e5d5cfe127fe2cfc6f211725e6c3089ae (diff) | |
| parent | f351cc28c2c878bf491bb0886be65bf35b58b261 (diff) | |
| download | gitlab-ce-dispatcher-project-mr-edit.tar.gz | |
Merge branch 'master' into 'dispatcher-project-mr-edit'dispatcher-project-mr-edit
# Conflicts:
# app/assets/javascripts/dispatcher.js
Diffstat (limited to 'scripts/pre-commit')
| -rw-r--r-- | scripts/pre-commit | 18 |
1 files changed, 0 insertions, 18 deletions
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 |