Version 1.15.2

CHANGELOG

@@ -461,3 +461,19 @@
 [1.15.0]
 * Update Gitea to 1.11.0
 
+[1.15.1]
+* Update Gitea to 1.11.1
+* Repo name added to automatically generated commit message when merging (#9997) (#10285)
+* Fix Workerpool deadlock (#10283) (#10284)
+* Divide GetIssueStats query in smaller chunks (#10176) (#10282)
+* Fix reply on code review (#10257)
+* Stop hanging issue indexer initialisation from preventing shutdown (#10243) (#10249)
+* Fix filter label emoji width (#10241) (#10244)
+* Fix issue sidebar menus having an infinite height (#10239) (#10240)
+* Fix commit between two commits calculation if there is only last commit (#10225) (#10226)
+* Only check for conflicts/merging if the PR has not been merged in the interim (#10132) (#10206)
+* Blacklist manifest.json & milestones user (#10292) (#10293)
+
+[1.15.2]
+* Update Gitea to 1.11.2
+

CloudronManifest.json

@@ -4,7 +4,7 @@
   "author": "Gitea developers",
   "description": "file://DESCRIPTION.md",
   "tagline": "A painless self-hosted Git Service",
-  "version": "1.15.0",
+  "version": "1.15.2",
   "healthCheckPath": "/healthcheck",
   "httpPort": 3000,
   "addons": {

DESCRIPTION.md

@@ -1,4 +1,4 @@
-This app packages Gitea <upstream>1.11.0</upstream>
+This app packages Gitea <upstream>1.11.2</upstream>
 
 Gitea is a painless self-hosted Git service. It is similar to GitHub, Bitbucket or Gitlab.
 

Dockerfile

@@ -1,6 +1,6 @@
 FROM cloudron/base:1.0.0@sha256:147a648a068a2e746644746bbfb42eb7a50d682437cead3c67c933c546357617
 
-ARG VERSION=1.11.0
+ARG VERSION=1.11.2
 
 RUN apt-get update && \
     apt-get install -y openssh-server git && \

test/package.json

@@ -9,11 +9,12 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "selenium-webdriver": "^3.6.0",
-    "chromedriver": "^76.0.1",
+    "chromedriver": "^80.0.1",
     "expect.js": "^0.3.1",
-    "mocha": "^6.2.2",
-    "rimraf": "^3.0.0",
-    "superagent": "^5.1.0"
+    "mocha": "^7.1.0",
+    "rimraf": "^3.0.2",
+    "selenium-server-standalone-jar": "^3.141.59",
+    "selenium-webdriver": "^3.6.0",
+    "superagent": "^5.2.2"
   }
 }

test/test.js

@@ -9,6 +9,8 @@
 
 'use strict';
 
+require('chromedriver');
+
 var execSync = require('child_process').execSync,
     expect = require('expect.js'),
     fs = require('fs'),
@@ -31,10 +33,10 @@ describe('Application life cycle test', function () {
     var LOCATION = 'test';
     var SSH_PORT = 29420;
 
-    var browser;
     var app;
     var token;
 
+    var server, browser = new Builder().forBrowser('chrome').build();
     var repodir = '/tmp/testrepo';
     var reponame = 'testrepo';
 
@@ -43,7 +45,10 @@ describe('Application life cycle test', function () {
     var email = process.env.EMAIL;
 
     before(function () {
-        browser = new Builder().forBrowser('chrome').setChromeOptions(new Options().windowSize({ width: 1280, height: 1024 })).build();
+        var seleniumJar= require('selenium-server-standalone-jar');
+        var SeleniumServer = require('selenium-webdriver/remote').SeleniumServer;
+        server = new SeleniumServer(seleniumJar.path, { port: 4444 });
+        server.start();
     });
 
     after(function (done) {
@@ -151,8 +156,14 @@ return done();
     }
 
     function logout(done) {
-        browser.get('https://' + app.fqdn + '/user/logout').then(function () {
-            return waitForUrl('https://' + app.fqdn + '/explore/repos');
+        browser.get('https://' + app.fqdn).then(function () {
+            return browser.findElement(By.xpath('//img[contains(@class, "avatar")]')).click();
+        }).then(function () {
+            browser.sleep(2000);
+        }).then(function () {
+            return browser.findElement(By.xpath('//a[@data-url="/user/logout"]')).click();
+        }).then(function () {
+            browser.sleep(2000);
         }).then(function () {
             done();
         });