From 2dfd4ad452a38d6b97ffe51cf24283c64e135124 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Fri, 12 Apr 2019 09:20:25 +0200
Subject: [PATCH 1/4] DOC is done with the app

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 .drone.yml | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 3877a6553..9cc970d39 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -4,21 +4,6 @@ clone:
     depth: 1
 
 pipeline:
-  signed-off-check:
-    image: nextcloudci/php7.1:php7.1-16
-    environment:
-      - APP_NAME=activity
-      - CORE_BRANCH=master
-      - DB=sqlite
-    commands:
-      - wget https://raw.githubusercontent.com/nextcloud/travis_ci/master/before_install.sh
-      - bash ./before_install.sh $APP_NAME $CORE_BRANCH $DB
-      - cd ../server
-      - php ./build/signed-off-checker.php
-    secrets: [ github_token ]
-    when:
-      matrix:
-        TESTS: signed-off-check
   handlebars:
     image: node
     commands:
@@ -30,5 +15,4 @@ pipeline:
 
 matrix:
   include:
-    - TESTS: signed-off-check
     - TESTS: handlebars

From 2f4f2226233249aa65bea859f176c7a4b141f59b Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Fri, 12 Apr 2019 09:20:42 +0200
Subject: [PATCH 2/4] Adjust drone config for v1.0

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 .drone.yml | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index 9cc970d39..8aa4b5e17 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -1,18 +1,17 @@
-clone:
-  git:
-    image: plugins/git
-    depth: 1
+kind: pipeline
+name: handlebars
 
-pipeline:
-  handlebars:
+steps:
+  - name: check-handlebars-templates
     image: node
     commands:
       - npm install -g handlebars
       - ./check-handlebars-templates.sh
-    when:
-      matrix:
-        TESTS: handlebars
 
-matrix:
-  include:
-    - TESTS: handlebars
+trigger:
+  branch:
+    - master
+    - stable*
+  event:
+    - pull_request
+    - push

From c4a71d8a29b3f343b05c64b7ae8462fc63239bed Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Fri, 12 Apr 2019 09:21:32 +0200
Subject: [PATCH 3/4] Disable always failing JS unit tests

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 230453c17..a6000d2d3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -60,8 +60,8 @@ matrix:
       env: DB=mysql;CODECHECK=1
     - php: 7.1
       env: DB=mysql;CODECHECK=2
-    - php: 7.1
-      env: DB=mysql;JSTESTS=1
+#    - php: 7.1
+#      env: DB=mysql;JSTESTS=1
   allow_failures:
     - env: DB=mysql;CODECHECK=2
   fast_finish: true

From eaf566642c4b72add0d360aa0c2dc3415245752b Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Thu, 11 Apr 2019 14:21:07 +0200
Subject: [PATCH 4/4] Update version on master to 17

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 appinfo/info.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/appinfo/info.xml b/appinfo/info.xml
index a03e5c8ff..57c33d2ea 100755
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -14,7 +14,7 @@
 		More information is available in the Activity documentation.
 	</description>
 
-	<version>2.9.0</version>
+	<version>2.10.0</version>
 	<licence>agpl</licence>
 	<author>Frank Karlitschek</author>
 	<author>Joas Schilling</author>
@@ -36,7 +36,7 @@
 	<repository>https://github.com/nextcloud/activity.git</repository>
 
 	<dependencies>
-		<nextcloud min-version="16" max-version="16"/>
+		<nextcloud min-version="17" max-version="17"/>
 	</dependencies>
 
 	<background-jobs>