diff --git a/CHANGELOG b/CHANGELOG index 0b11224..daa18b8 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -53,3 +53,6 @@ * Only require one email when validating GPG key (#2266, #2467, #2663) (#2788) * Fix order of comments (#2835) (#2839) +[1.2.0] +* Update to version 1.3.0 + diff --git a/CloudronManifest.json b/CloudronManifest.json index e89b22f..feae972 100644 --- a/CloudronManifest.json +++ b/CloudronManifest.json @@ -4,7 +4,7 @@ "author": "Gitea developers", "description": "file://DESCRIPTION.md", "tagline": "A painless self-hosted Git Service", - "version": "1.1.3", + "version": "1.2.0", "healthCheckPath": "/healthcheck", "httpPort": 3000, "addons": { diff --git a/DESCRIPTION.md b/DESCRIPTION.md index 1c9ab6d..955cbd1 100644 --- a/DESCRIPTION.md +++ b/DESCRIPTION.md @@ -1,4 +1,4 @@ -This app packages Gitea 1.2.3 +This app packages Gitea 1.3.0 Gitea is a painless self-hosted Git service. It is similar to GitHub, Bitbucket or Gitlab. diff --git a/Dockerfile b/Dockerfile index c09d49e..564bade 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM cloudron/base:0.10.0 -ENV VERSION 1.2.3 +ENV VERSION 1.3.0 RUN apt-get update && \ apt-get install -y openssh-server git && \ diff --git a/test/test.js b/test/test.js index 4827412..985d032 100755 --- a/test/test.js +++ b/test/test.js @@ -106,7 +106,7 @@ return done(); }).then(function () { return browser.findElement(by.xpath('//button[contains(text(), "Commit Changes")]')).click(); }).then(function () { - waitForUrl('https://' + app.fqdn + '/' + username + '/' + reponame + '/src/master/newfile', done); + waitForUrl('https://' + app.fqdn + '/' + username + '/' + reponame + '/src/branch/master/newfile', done); }); } @@ -300,7 +300,7 @@ return done(); it('file exists in repo', function () { expect(fs.existsSync(repodir + '/newfile')).to.be(true); }); it('move to different location', function () { - browser.manage().deleteAllCookies(); + //browser.manage().deleteAllCookies(); // commented because of error "'Network.deleteCookie' wasn't found" execSync('cloudron configure --wait --location ' + LOCATION + '2', { cwd: path.resolve(__dirname, '..'), stdio: 'inherit' }); var inspect = JSON.parse(execSync('cloudron inspect')); app = inspect.apps.filter(function (a) { return a.location === LOCATION + '2'; })[0];