Implement "conversation lock" for issue comments #5073

adelowo · 2018-10-11T13:59:57Z

The goal of this PR is to add a lock conversation feature
present in Github.

Fixes #5063 .

Lock Conversation
Unlock Conversation
Update issues templates to show lock events
Disable entire comment box when an issue is locked if the user is not an instance admin or repo admin/writer
Allow a reason to be specified when locking an issue

Youtube video of what it looks like

codecov-io · 2018-10-11T14:08:29Z

Codecov Report

Merging #5073 into master will decrease coverage by 0.06%.
The diff coverage is 14.87%.

@@            Coverage Diff             @@
##           master    #5073      +/-   ##
==========================================
- Coverage   38.95%   38.88%   -0.07%     
==========================================
  Files         346      349       +3     
  Lines       49635    49754     +119     
==========================================
+ Hits        19334    19347      +13     
- Misses      27512    27612     +100     
- Partials     2789     2795       +6

Impacted Files	Coverage Δ
models/migrations/migrations.go	`1.52% <ø> (ø)`	⬆️
models/issue.go	`47.44% <ø> (ø)`	⬆️
modules/setting/setting.go	`47.68% <ø> (ø)`	⬆️
models/issue_comment.go	`46.33% <ø> (ø)`	⬆️
models/migrations/v80.go	`0% <0%> (ø)`
routers/repo/issue_lock.go	`0% <0%> (ø)`
routers/api/v1/repo/issue_comment.go	`56.09% <0%> (-0.7%)`	⬇️
models/issue_lock.go	`0% <0%> (ø)`
routers/repo/issue.go	`36.51% <33.33%> (-0.06%)`	⬇️
routers/routes/routes.go	`82.72% <37.5%> (-0.57%)`	⬇️
... and 5 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 64ce159...48bff7d. Read the comment docs.

adelowo · 2018-10-11T15:42:15Z

Any idea why drone is failing with package github.com/golang/lint/golint: code in directory /go/src/github.com/golang/lint/golint expects import "golang.org/x/lint/golint" ? make lint doesn't fail locally.. No idea why

Started failing at 9d66bc3

Edit

Looks like all builds are failing with this cryptic error, #5009 and #5051 just failed

custom/conf/app.ini.sample

templates/repo/issue/comment_tab.tmpl

templates/repo/issue/view_content/comments.tmpl

templates/repo/issue/view_content/sidebar.tmpl

models/issue_lock.go

jonasfranz

Please add a middleware to router.go in order to prevent creating comments via POST requests or API requests.

jonasfranz · 2018-10-15T17:01:33Z

modules/auth/repo_form.go

+
+// HasValidReason checks to make sure that the reason submitted in
+// the form matches any of the values in the config
+func (i IssueLockForm) HasValidReason() bool {


Maybe add this to Validate.

I think it is better if explicit enough ( I have a couple merged PRs that follow this route though ) .. And that regular Validate is just meant for validating the struct bindings..

I wouldn't want to mess with bindings.Error

Thoughts @JonasFranzDEV ?

ping @jonasfranz

options/locale/locale_en-US.ini

adelowo · 2018-10-15T17:28:29Z

prevent creating comments

You can still create comments but you must have write access,
I attached the repoWriter middleware to the route already..
See https://github.com/go-gitea/gitea/pull/5073/files#diff-7aa71b75b5fddf1332a485052ffbca9aR543

and https://github.com/go-gitea/gitea/pull/5073/files#diff-ece22e0fe138da6e0fe0f25213406313R1033

Would fix for api requests

models/issue_lock.go

kolaente · 2019-01-16T18:47:45Z

routers/repo/issue.go

@@ -61,6 +61,23 @@ var (
 	}
 )

+// MustAllowUserComment checks to make sure if an issue is locked.
+// If locked and user has permissions to write to the repository,


What do you think about making it an option whether or not a repo writer can still comment on a locked issue?

Sounds nice.

Will this potentially be a global config or an option set at the point of locking the issue ?

I'd make a global option (in the config file) and then a setting in the repo to overwrite the global default.

So, what about this? I think it'd be ok if we move the configuration to another pr.

@kolaente this PR is already long history, let's move such option to other PR

@lafriks sounds good!

custom/conf/app.ini.sample

lunny · 2019-01-17T00:26:36Z

CI still failed.

adelowo · 2019-01-17T12:42:27Z

CI has been fixed @lunny

adelowo · 2019-01-19T14:35:24Z

Can anyone help me look at the icon thing ? So it doesn't align because other icons have this octicon-primitive-iconName but what I am using doesn't ( octicion-lock and octicon-key) ..

I have added an hack here though :)
428d8df 3

templates/repo/issue/view_content/comments.tmpl

…conversation

lafriks · 2019-02-12T08:56:40Z

@lunny @jonasfranz please review

…conversation

lunny · 2019-02-17T05:51:57Z

@jonasfranz Please review this PR.

Dismissing your review for not ponging back ;)

lafriks · 2019-02-18T16:02:07Z

@kolaente please review

kolaente

Looks pretty good so far, just one tiny nit.

kolaente · 2019-02-18T19:31:26Z

routers/repo/issue.go

@@ -61,6 +61,23 @@ var (
 	}
 )

+// MustAllowUserComment checks to make sure if an issue is locked.
+// If locked and user has permissions to write to the repository,


So, what about this? I think it'd be ok if we move the configuration to another pr.

bkcsoft added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Oct 11, 2018

adelowo changed the title ~~Implement conversation locking~~ Implement conversation locking feature present in Github Oct 11, 2018

adelowo mentioned this pull request Oct 11, 2018

show only opened milestones on issues page milestone filter #5051

Merged

lunny added this to the 1.7.0 milestone Oct 12, 2018

lunny added the type/feature Completely new functionality. Can only be merged if feature freeze is not active. label Oct 12, 2018

adelowo force-pushed the lock_conversation branch from 671749f to 3252b6f Compare October 12, 2018 21:27

adelowo changed the title ~~Implement conversation locking feature present in Github~~ Implement "conversation lock" feature present in Github Oct 12, 2018

jonasfranz suggested changes Oct 13, 2018

View reviewed changes

lafriks reviewed Oct 14, 2018

View reviewed changes

models/issue_lock.go Outdated Show resolved Hide resolved

jonasfranz previously requested changes Oct 15, 2018

View reviewed changes

techknowlogick modified the milestones: 1.7.0, 1.8.0 Dec 19, 2018

kolaente reviewed Jan 16, 2019

View reviewed changes

models/issue_lock.go Outdated Show resolved Hide resolved

kolaente reviewed Jan 16, 2019

View reviewed changes

adelowo force-pushed the lock_conversation branch 2 times, most recently from 0070a94 to 4c3a0b7 Compare January 16, 2019 20:12

kolaente suggested changes Jan 16, 2019

View reviewed changes

custom/conf/app.ini.sample Show resolved Hide resolved

custom/conf/app.ini.sample Outdated Show resolved Hide resolved

adelowo force-pushed the lock_conversation branch from a775b61 to 28dffd7 Compare January 17, 2019 12:38

adelowo force-pushed the lock_conversation branch 2 times, most recently from 73a5bca to 428d8df Compare January 19, 2019 14:32

adelowo added 4 commits January 19, 2019 15:38

fix merge conflicts

09d170a

initial implementation of issue locking

59b2c1f

an issue cannot be locked twice

8b6afb3

add better UI indicators for (un)locked issues

2496762

lafriks reviewed Jan 31, 2019

View reviewed changes

templates/repo/issue/view_content/comments.tmpl Outdated Show resolved Hide resolved

adelowo added 3 commits February 11, 2019 19:16

Merge remote-tracking branch 'origin/master' into lock_conversation

a2d0191

fix issue with a text not being translatable

e85b63b

add migration

8315601

adelowo force-pushed the lock_conversation branch from eeae85b to 8315601 Compare February 11, 2019 23:20

adelowo added 2 commits February 12, 2019 09:50

Merge remote-tracking branch 'origin/master' into lock_conversation

7cd2563

Merge branch 'master' of https://github.com/go-gitea/gitea into lock_…

e308329

…conversation

lunny approved these changes Feb 12, 2019

View reviewed changes

GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Feb 12, 2019

adelowo added 3 commits February 15, 2019 16:49

added another translation

09d5eb7

Merge remote-tracking branch 'origin/master' into lock_conversation

3f7b816

Merge branch 'master' of https://github.com/go-gitea/gitea into lock_…

aefe3bc

…conversation

adelowo force-pushed the lock_conversation branch from 5df50b8 to aefe3bc Compare February 15, 2019 16:05

Merge branch 'master' into lock_conversation

10dcb9c

Merge branch 'master' into lock_conversation

5e979e5

kolaente reviewed Feb 18, 2019

View reviewed changes

kolaente approved these changes Feb 18, 2019

View reviewed changes

Merge branch 'master' into lock_conversation

48bff7d

lafriks changed the title ~~Implement "conversation lock" feature present in Github~~ Implement "conversation lock" feature Feb 18, 2019

lafriks changed the title ~~Implement "conversation lock" feature~~ Implement "conversation lock" for issue comments Feb 18, 2019

lafriks merged commit 44114b3 into go-gitea:master Feb 18, 2019

adelowo deleted the lock_conversation branch February 19, 2019 14:28

go-gitea locked and limited conversation to collaborators Nov 24, 2020

delvh removed the type/changelog Adds the changelog for a new Gitea version label Oct 7, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Implement "conversation lock" for issue comments #5073

Implement "conversation lock" for issue comments #5073

adelowo commented Oct 11, 2018 •

edited

Loading

codecov-io commented Oct 11, 2018 •

edited

Loading

adelowo commented Oct 11, 2018 •

edited

Loading

jonasfranz left a comment

jonasfranz Oct 15, 2018

adelowo Oct 17, 2018 •

edited

Loading

adelowo Oct 18, 2018

ghost Nov 1, 2018

techknowlogick Jan 7, 2019

adelowo commented Oct 15, 2018 •

edited

Loading

kolaente Jan 16, 2019

adelowo Jan 16, 2019

kolaente Jan 16, 2019

kolaente Feb 18, 2019

lafriks Feb 18, 2019

kolaente Feb 18, 2019

lunny commented Jan 17, 2019

adelowo commented Jan 17, 2019

adelowo commented Jan 19, 2019

lafriks commented Feb 12, 2019

lunny commented Feb 17, 2019

lafriks commented Feb 18, 2019

kolaente left a comment

kolaente Feb 18, 2019

Implement "conversation lock" for issue comments #5073

Implement "conversation lock" for issue comments #5073

Conversation

adelowo commented Oct 11, 2018 • edited Loading

codecov-io commented Oct 11, 2018 • edited Loading

Codecov Report

adelowo commented Oct 11, 2018 • edited Loading

jonasfranz left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

adelowo Oct 17, 2018 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

adelowo commented Oct 15, 2018 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

lunny commented Jan 17, 2019

adelowo commented Jan 17, 2019

adelowo commented Jan 19, 2019

lafriks commented Feb 12, 2019

lunny commented Feb 17, 2019

lafriks commented Feb 18, 2019

kolaente left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

adelowo commented Oct 11, 2018 •

edited

Loading

codecov-io commented Oct 11, 2018 •

edited

Loading

adelowo commented Oct 11, 2018 •

edited

Loading

adelowo Oct 17, 2018 •

edited

Loading

adelowo commented Oct 15, 2018 •

edited

Loading