diff options
author | Lin Jen-Shin <godfat@godfat.org> | 2017-04-11 12:33:58 +0000 |
---|---|---|
committer | Lin Jen-Shin <godfat@godfat.org> | 2017-04-11 12:33:58 +0000 |
commit | d41eb62e20a74ccb4964602a9e1ea105f8a72d34 (patch) | |
tree | ea05043b1fbe5a2acad9d03826e195d0bbe72737 /vendor/gitignore/Global | |
parent | 862b74bc4688bcd572b32d9998cbfbedec39e053 (diff) | |
download | gitlab-ce-d41eb62e20a74ccb4964602a9e1ea105f8a72d34.tar.gz |
Update templates via:gitlab-update_templates
rake gitlab:update_templates
Diffstat (limited to 'vendor/gitignore/Global')
-rw-r--r-- | vendor/gitignore/Global/Eclipse.gitignore | 6 | ||||
-rw-r--r-- | vendor/gitignore/Global/JetBrains.gitignore | 3 | ||||
-rw-r--r-- | vendor/gitignore/Global/macOS.gitignore | 51 |
3 files changed, 28 insertions, 32 deletions
diff --git a/vendor/gitignore/Global/Eclipse.gitignore b/vendor/gitignore/Global/Eclipse.gitignore index 4f88399d2d8..ce1c12cdb7a 100644 --- a/vendor/gitignore/Global/Eclipse.gitignore +++ b/vendor/gitignore/Global/Eclipse.gitignore @@ -11,9 +11,6 @@ local.properties .loadpath .recommenders -# Eclipse Core -.project - # External tool builders .externalToolBuilders/ @@ -26,9 +23,6 @@ local.properties # CDT-specific (C/C++ Development Tooling) .cproject -# JDT-specific (Eclipse Java Development Tools) -.classpath - # Java annotation processor (APT) .factorypath diff --git a/vendor/gitignore/Global/JetBrains.gitignore b/vendor/gitignore/Global/JetBrains.gitignore index ec7e95c6ab5..a5d4cc86d33 100644 --- a/vendor/gitignore/Global/JetBrains.gitignore +++ b/vendor/gitignore/Global/JetBrains.gitignore @@ -36,6 +36,9 @@ # JIRA plugin atlassian-ide-plugin.xml +# Cursive Clojure plugin +.idea/replstate.xml + # Crashlytics plugin (for Android Studio and IntelliJ) com_crashlytics_export_strings.xml crashlytics.properties diff --git a/vendor/gitignore/Global/macOS.gitignore b/vendor/gitignore/Global/macOS.gitignore index f0f3fbc06c8..5972fe50f66 100644 --- a/vendor/gitignore/Global/macOS.gitignore +++ b/vendor/gitignore/Global/macOS.gitignore @@ -1,26 +1,25 @@ -*.DS_Store
-.AppleDouble
-.LSOverride
-
-# Icon must end with two \r
-Icon
-
-
-# Thumbnails
-._*
-
-# Files that might appear in the root of a volume
-.DocumentRevisions-V100
-.fseventsd
-.Spotlight-V100
-.TemporaryItems
-.Trashes
-.VolumeIcon.icns
-.com.apple.timemachine.donotpresent
-
-# Directories potentially created on remote AFP share
-.AppleDB
-.AppleDesktop
-Network Trash Folder
-Temporary Items
-.apdisk
+*.DS_Store +.AppleDouble +.LSOverride + +# Icon must end with two \r +Icon
+ +# Thumbnails +._* + +# Files that might appear in the root of a volume +.DocumentRevisions-V100 +.fseventsd +.Spotlight-V100 +.TemporaryItems +.Trashes +.VolumeIcon.icns +.com.apple.timemachine.donotpresent + +# Directories potentially created on remote AFP share +.AppleDB +.AppleDesktop +Network Trash Folder +Temporary Items +.apdisk |