Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
ecf6f1f8
Commit
ecf6f1f8
authored
Jan 04, 2018
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "Merge branch 'pre-commit-prettier' into 'master'"
This reverts merge request !16061
parent
0e7e9e32
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
0 additions
and
41 deletions
+0
-41
package.json
package.json
+0
-1
scripts/add-code-formatters
scripts/add-code-formatters
+0
-18
scripts/pre-commit
scripts/pre-commit
+0
-18
yarn.lock
yarn.lock
+0
-4
No files found.
package.json
View file @
ecf6f1f8
...
...
@@ -61,7 +61,6 @@
"
mousetrap
"
:
"
^1.4.6
"
,
"
name-all-modules-plugin
"
:
"
^1.0.1
"
,
"
pikaday
"
:
"
^1.6.1
"
,
"
prettier
"
:
"
^1.9.2
"
,
"
prismjs
"
:
"
^1.6.0
"
,
"
raphael
"
:
"
^2.2.7
"
,
"
raven-js
"
:
"
^3.14.0
"
,
...
...
scripts/add-code-formatters
deleted
100755 → 0
View file @
0e7e9e32
#!/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"
scripts/pre-commit
deleted
100644 → 0
View file @
0e7e9e32
#!/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
yarn.lock
View file @
ecf6f1f8
...
...
@@ -5150,10 +5150,6 @@ prettier@^1.7.0:
version "1.8.2"
resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.8.2.tgz#bff83e7fd573933c607875e5ba3abbdffb96aeb8"
prettier@^1.9.2:
version "1.9.2"
resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.9.2.tgz#96bc2132f7a32338e6078aeb29727178c6335827"
prismjs@^1.6.0:
version "1.6.0"
resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.6.0.tgz#118d95fb7a66dba2272e343b345f5236659db365"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment