mirror of
https://github.com/go-gitea/gitea.git
synced 2025-11-05 18:32:41 +09:00
Compare commits
5 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f3cacf1332 | ||
|
|
a15dc93011 | ||
|
|
66b31786d3 | ||
|
|
931ddfec6d | ||
|
|
7e0a5b17db |
@@ -387,7 +387,7 @@ steps:
|
|||||||
|
|
||||||
- name: static
|
- name: static
|
||||||
pull: always
|
pull: always
|
||||||
image: techknowlogick/xgo:latest
|
image: techknowlogick/xgo:go-1.13.x
|
||||||
commands:
|
commands:
|
||||||
- apt update && apt -y install curl
|
- apt update && apt -y install curl
|
||||||
- curl -sL https://deb.nodesource.com/setup_12.x | bash - && apt -y install nodejs
|
- curl -sL https://deb.nodesource.com/setup_12.x | bash - && apt -y install nodejs
|
||||||
@@ -485,7 +485,7 @@ steps:
|
|||||||
|
|
||||||
- name: static
|
- name: static
|
||||||
pull: always
|
pull: always
|
||||||
image: techknowlogick/xgo:latest
|
image: techknowlogick/xgo:go-1.13.x
|
||||||
commands:
|
commands:
|
||||||
- apt update && apt -y install curl
|
- apt update && apt -y install curl
|
||||||
- curl -sL https://deb.nodesource.com/setup_12.x | bash - && apt -y install nodejs
|
- curl -sL https://deb.nodesource.com/setup_12.x | bash - && apt -y install nodejs
|
||||||
|
|||||||
12
CHANGELOG.md
12
CHANGELOG.md
@@ -4,6 +4,13 @@ This changelog goes through all the changes that have been made in each release
|
|||||||
without substantial changes to our git log; to see the highlights of what has
|
without substantial changes to our git log; to see the highlights of what has
|
||||||
been added to each release, please refer to the [blog](https://blog.gitea.io).
|
been added to each release, please refer to the [blog](https://blog.gitea.io).
|
||||||
|
|
||||||
|
## [1.11.3](https://github.com/go-gitea/gitea/releases/tag/v1.11.3) - 2020-03-10
|
||||||
|
|
||||||
|
* BUGFIXES
|
||||||
|
* Prevent panic in stopwatch (#10670) (#10673)
|
||||||
|
* Fix bug on pull view when required status check no ci result (#10648) (#10651)
|
||||||
|
* Build explicitly with Go 1.13 (#10684)
|
||||||
|
|
||||||
## [1.11.2](https://github.com/go-gitea/gitea/releases/tag/v1.11.2) - 2020-03-06
|
## [1.11.2](https://github.com/go-gitea/gitea/releases/tag/v1.11.2) - 2020-03-06
|
||||||
|
|
||||||
* BREAKING
|
* BREAKING
|
||||||
@@ -512,6 +519,11 @@ been added to each release, please refer to the [blog](https://blog.gitea.io).
|
|||||||
* Update CodeMirror to version 5.49.0 (#8381)
|
* Update CodeMirror to version 5.49.0 (#8381)
|
||||||
* Wiki editor: enable side-by-side button (#7242)
|
* Wiki editor: enable side-by-side button (#7242)
|
||||||
|
|
||||||
|
## [1.10.5](https://github.com/go-gitea/gitea/releases/tag/v1.10.5) - 2020-03-06
|
||||||
|
|
||||||
|
* BUGFIXES
|
||||||
|
* Fix release attachments being deleted while upgrading (#10572) (#10574)
|
||||||
|
|
||||||
## [1.10.4](https://github.com/go-gitea/gitea/releases/tag/v1.10.4) - 2020-02-16
|
## [1.10.4](https://github.com/go-gitea/gitea/releases/tag/v1.10.4) - 2020-02-16
|
||||||
|
|
||||||
* FEATURE
|
* FEATURE
|
||||||
|
|||||||
@@ -5,6 +5,7 @@
|
|||||||
package repo
|
package repo
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"errors"
|
||||||
"net/http"
|
"net/http"
|
||||||
|
|
||||||
"code.gitea.io/gitea/models"
|
"code.gitea.io/gitea/models"
|
||||||
@@ -172,19 +173,21 @@ func prepareIssueStopwatch(ctx *context.APIContext, shouldExist bool) (*models.I
|
|||||||
|
|
||||||
if !ctx.Repo.CanWriteIssuesOrPulls(issue.IsPull) {
|
if !ctx.Repo.CanWriteIssuesOrPulls(issue.IsPull) {
|
||||||
ctx.Status(http.StatusForbidden)
|
ctx.Status(http.StatusForbidden)
|
||||||
return nil, err
|
return nil, errors.New("Unable to write to PRs")
|
||||||
}
|
}
|
||||||
|
|
||||||
if !ctx.Repo.CanUseTimetracker(issue, ctx.User) {
|
if !ctx.Repo.CanUseTimetracker(issue, ctx.User) {
|
||||||
ctx.Status(http.StatusForbidden)
|
ctx.Status(http.StatusForbidden)
|
||||||
return nil, err
|
return nil, errors.New("Cannot use time tracker")
|
||||||
}
|
}
|
||||||
|
|
||||||
if models.StopwatchExists(ctx.User.ID, issue.ID) != shouldExist {
|
if models.StopwatchExists(ctx.User.ID, issue.ID) != shouldExist {
|
||||||
if shouldExist {
|
if shouldExist {
|
||||||
ctx.Error(http.StatusConflict, "StopwatchExists", "cannot stop/cancel a non existent stopwatch")
|
ctx.Error(http.StatusConflict, "StopwatchExists", "cannot stop/cancel a non existent stopwatch")
|
||||||
|
err = errors.New("cannot stop/cancel a non existent stopwatch")
|
||||||
} else {
|
} else {
|
||||||
ctx.Error(http.StatusConflict, "StopwatchExists", "cannot start a stopwatch again if it already exists")
|
ctx.Error(http.StatusConflict, "StopwatchExists", "cannot start a stopwatch again if it already exists")
|
||||||
|
err = errors.New("cannot start a stopwatch again if it already exists")
|
||||||
}
|
}
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -35,6 +35,11 @@ func MergeRequiredContextsCommitStatus(commitStatuses []*models.CommitStatus, re
|
|||||||
|
|
||||||
if targetStatus == "" {
|
if targetStatus == "" {
|
||||||
targetStatus = structs.CommitStatusPending
|
targetStatus = structs.CommitStatusPending
|
||||||
|
commitStatuses = append(commitStatuses, &models.CommitStatus{
|
||||||
|
State: targetStatus,
|
||||||
|
Context: ctx,
|
||||||
|
Description: "Pending",
|
||||||
|
})
|
||||||
}
|
}
|
||||||
if targetStatus.NoBetterThan(returnedStatus) {
|
if targetStatus.NoBetterThan(returnedStatus) {
|
||||||
returnedStatus = targetStatus
|
returnedStatus = targetStatus
|
||||||
|
|||||||
Reference in New Issue
Block a user