Merge pull request #2447 from hannesa2/CodeStyle

Code style
owncloud · Feb 28, 2019 · f10456d · f10456d
2 parents 6eb0032 + 57fd78e
commit f10456d
Show file tree

Hide file tree

Showing 378 changed files with 11,722 additions and 11,653 deletions.
diff --git a/.drone.yml b/.drone.yml
@@ -3,7 +3,7 @@ workspace:
   path: src
 
 branches:
-  - master
+- master
 
 clone:
   git:
@@ -23,43 +23,43 @@ pipeline:
     image: owncloudci/nodejs:11
     pull: true
     commands:
-      - cd docs/
-      - yarn install
+    - cd docs/
+    - yarn install
 
   docs-validate:
     image: owncloudci/nodejs:11
     pull: true
     commands:
-      - cd docs/
-      - yarn validate
+    - cd docs/
+    - yarn validate
 
   docs-build:
     image: owncloudci/nodejs:11
     pull: true
     commands:
-      - cd docs/
-      - yarn antora
+    - cd docs/
+    - yarn antora
 
   docs-pdf:
     image: owncloudci/asciidoctor:latest
     pull: true
     commands:
-      - cd docs/
-      - make pdf
+    - cd docs/
+    - make pdf
 
   docs-artifacts:
     image: owncloud/ubuntu:latest
     pull: true
     commands:
-      - tree docs/public/
+    - tree docs/public/
 
   cache-rebuild:
     image: plugins/s3-cache:1
     pull: true
     secrets: [ cache_s3_endpoint, cache_s3_access_key, cache_s3_secret_key ]
     rebuild: true
     mount:
-      - docs/cache
+    - docs/cache
     when:
       local: false
       event: [ push ]

diff --git a/.gitignore b/.gitignore
@@ -41,3 +41,11 @@ build
 
 # android sdk captures folder
 captures
+
+!.idea/
+.idea/*
+!.idea/codeStyles/
+
+!Project.xml
+!codeStyleConfig.xml
+