diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2017-08-07 11:09:50 +0100 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2017-08-07 11:09:50 +0100 |
| commit | 3b9012871da7dbf6d4f5463654c7c478012e694e (patch) | |
| tree | 0dfd072107d486a85de73b3ae4016d4f4d13d04a /scripts/lint-conflicts.sh | |
| parent | 25c9b5b531c5dfe08f9dc9d075589a30465fa318 (diff) | |
| parent | 03b816f3e845c9b25d3588336fc1616238465deb (diff) | |
| download | gitlab-ce-3b9012871da7dbf6d4f5463654c7c478012e694e.tar.gz | |
Merge branch 'master' into zj-project-templates
* master: (623 commits)
Fix issues with pdf-js dependencies
fix missing changelog entries for security release on 2017-01-23
Update top bar issues icon
Fix pipeline icon in contextual nav for projects
Since mysql is not a priority anymore, test it less
Fix order of CI lint ace editor loading
Add container registry and spam logs icons
Fix different Markdown styles
Backport to CE for:
Make new dropdown dividers full width
Fix spec
Fix spec
Fix spec
Bump GITLAB_SHELL_VERSION and GITALY_VERSION to support unhiding refs
Add changelog
Install yarn via apt in update guides
Use long curl options
fix
Add a spec for concurrent process
Remove monkey-patched Array.prototype.first() and last() methods
...
Diffstat (limited to 'scripts/lint-conflicts.sh')
| -rwxr-xr-x | scripts/lint-conflicts.sh | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/scripts/lint-conflicts.sh b/scripts/lint-conflicts.sh new file mode 100755 index 00000000000..f3877600c8c --- /dev/null +++ b/scripts/lint-conflicts.sh @@ -0,0 +1,5 @@ +#!/bin/sh + +output=`git ls-files -z | grep -zvE '\.(rb|js|haml)$' | xargs -0n1 grep -HEn '^<<<<<<< '` +echo $output +test -z "$output" |