Skip to content

Implement "conversation lock" for issue comments #5073

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 60 commits into from
Feb 18, 2019
Merged
Changes from 1 commit
Commits
Show all changes
60 commits
Select commit Hold shift + click to select a range
09d170a
fix merge conflicts
adelowo Jan 19, 2019
59b2c1f
initial implementation of issue locking
adelowo Oct 11, 2018
8b6afb3
an issue cannot be locked twice
adelowo Oct 11, 2018
2496762
add better UI indicators for (un)locked issues
adelowo Oct 11, 2018
af23f1c
remove unneccessary form input
adelowo Oct 11, 2018
815e6ce
unlock a locked issue
adelowo Oct 11, 2018
e0698fd
only an admin can (un)lock an issue
adelowo Oct 11, 2018
15b8ed5
update templates
adelowo Oct 11, 2018
fbaa69e
update translations
adelowo Oct 11, 2018
08f7d16
updat translation
adelowo Oct 11, 2018
4a09287
disable file uploads and comment text box if issue is locked
adelowo Oct 11, 2018
f4578b8
restrict commenting on a locked issue
adelowo Oct 11, 2018
41cb4ef
remove entire comment box block if issue is locked
adelowo Oct 11, 2018
808aebc
fix permissions
adelowo Oct 11, 2018
c596b9d
use octicon-key for issue unlocking events to keep in sync with Github
adelowo Oct 11, 2018
d7e6c0a
make sure users with write access can actually make comments on a loc…
adelowo Oct 11, 2018
f517a61
simplify conditions
adelowo Oct 11, 2018
f4c5d3d
add modal so as to implement reasons
adelowo Oct 12, 2018
40ec39f
add modal to prompt user with information about effects of (un)lockin…
adelowo Oct 12, 2018
6930064
update UI to include lock reasons
adelowo Oct 12, 2018
53becb7
only show reasons in modal when locking an issue
adelowo Oct 12, 2018
7abf90f
validate reasons
adelowo Oct 12, 2018
6b633c1
add reason for locking an issue to the DB
adelowo Oct 12, 2018
52da337
update UI to include lock reasons stated
adelowo Oct 12, 2018
b8b2103
fix unrelated changes plus added commas
adelowo Oct 13, 2018
642d320
unlock events don't have reasons
adelowo Oct 13, 2018
ca444dd
rename function name as per review
adelowo Oct 14, 2018
2b44d24
prevent user creating issues' comment via the api too
adelowo Oct 17, 2018
e9b48f7
update translations
adelowo Oct 17, 2018
cdda82f
update copyright years
adelowo Jan 16, 2019
d9ad8ec
fix build
adelowo Jan 17, 2019
24f68fe
update comparision table
adelowo Jan 17, 2019
d902bd4
update default lock reasons
adelowo Jan 17, 2019
59ed8be
update docs
adelowo Jan 17, 2019
0268e90
try to align icons
adelowo Jan 19, 2019
b23ce7e
fix merge conflicts
adelowo Jan 20, 2019
b25d7e7
fix merge conflicts
adelowo Jan 20, 2019
e8e13fa
fix tests
adelowo Jan 20, 2019
d3e1556
fix merge conflicts
adelowo Jan 24, 2019
e6779a6
fix template
adelowo Jan 24, 2019
f003778
fix template
adelowo Jan 24, 2019
3272f1e
use CanWrite instead of creating a new method, IsWriter
adelowo Jan 26, 2019
fec9e37
Merge remote-tracking branch 'origin' into lock_conversation
adelowo Jan 26, 2019
2e3502f
fix @kolaente review
adelowo Jan 26, 2019
6d181e7
Merge branch 'master' of https://github.com/go-gitea/gitea into lock_…
adelowo Jan 26, 2019
865c618
403 instead of 500
adelowo Jan 26, 2019
67d6dc7
Merge branch 'master' of https://github.com/go-gitea/gitea into lock_…
adelowo Jan 26, 2019
25efb71
merge origin/master
adelowo Jan 28, 2019
29cf5f0
use HTMLURL instead
adelowo Jan 28, 2019
a2d0191
Merge remote-tracking branch 'origin/master' into lock_conversation
adelowo Feb 11, 2019
e85b63b
fix issue with a text not being translatable
adelowo Feb 11, 2019
8315601
add migration
adelowo Feb 11, 2019
7cd2563
Merge remote-tracking branch 'origin/master' into lock_conversation
adelowo Feb 12, 2019
e308329
Merge branch 'master' of https://github.com/go-gitea/gitea into lock_…
adelowo Feb 12, 2019
09d5eb7
added another translation
adelowo Feb 15, 2019
3f7b816
Merge remote-tracking branch 'origin/master' into lock_conversation
adelowo Feb 15, 2019
aefe3bc
Merge branch 'master' of https://github.com/go-gitea/gitea into lock_…
adelowo Feb 15, 2019
10dcb9c
Merge branch 'master' into lock_conversation
adelowo Feb 16, 2019
5e979e5
Merge branch 'master' into lock_conversation
lafriks Feb 17, 2019
48bff7d
Merge branch 'master' into lock_conversation
lafriks Feb 18, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
add migration
  • Loading branch information
adelowo committed Feb 11, 2019
commit 831560135f4a57af0197b86d37d8491a7ad04a60
2 changes: 2 additions & 0 deletions models/migrations/migrations.go
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,8 @@ var migrations = []Migration{
NewMigration("rename repo is_bare to repo is_empty", renameRepoIsBareToIsEmpty),
// v79 -> v80
NewMigration("add can close issues via commit in any branch", addCanCloseIssuesViaCommitInAnyBranch),
// v80 -> v81
NewMigration("add is locked to issues", addIsLockedToIssues),
}

// Migrate database to current version
Expand Down