Add feature flags to the config for Wiki and Issues #7032

jpicht · 2019-05-24T12:53:56Z

This pull request aims to close #3336, implementing ENABLE_WIKI and ENABLE_ISSUES config options (defaulting to true).

It would probably be good if somebody, who really knows how the Issue system works, had a close look over what I did and if there are some places that I missed (maybe pull-request related).

Currently there are two unrelated commits in this branch, that I needed to make the Makefile work for me. I can remove them, if they pose a problem.

jpicht · 2019-05-24T12:56:16Z

The next step for me would be (in another pull request) to try and make pull requests work with issues disabled.

lunny · 2019-05-24T14:20:41Z

I think just change defaultRepoUnits according configs and change the repository settings UI is OK. Or maybe team add/edit page.

jpicht · 2019-05-24T15:02:05Z

I think just change defaultRepoUnits according configs and change the repository settings UI is OK. Or maybe team add/edit page.

I thought about that, but I was unsure if the config file is parsed early enough. I do not really know enough about the initialization sequence. When some code path uses defaultRepoUnits before the config is read, it could have weird consequences.

I can change the patch set to do exactly what you said, if that's the better solution.

charlesmorin · 2019-07-08T14:30:38Z

Do we have any ETA for this feature to be pulled into the master branch? Working in a large organization where Confluence and JIRA are used, such flag would be very helpful. Thanks!

Makefile

routers/api/v1/api.go

routers/repo/issue_label_test.go

codecov-io · 2019-07-11T13:22:57Z

Codecov Report

Merging #7032 into master will decrease coverage by <.01%.
The diff coverage is 53.57%.

@@            Coverage Diff             @@
##           master    #7032      +/-   ##
==========================================
- Coverage   41.32%   41.31%   -0.01%     
==========================================
  Files         474      474              
  Lines       63837    63850      +13     
==========================================
- Hits        26379    26378       -1     
- Misses      34019    34031      +12     
- Partials     3439     3441       +2

Impacted Files	Coverage Δ
routers/repo/setting.go	`9.29% <0%> (ø)`	⬆️
routers/repo/wiki.go	`40.5% <0%> (-0.38%)`	⬇️
routers/user/home.go	`53.28% <0%> (ø)`	⬆️
modules/setting/repository.go	`56.41% <100%> (+4.98%)`	⬆️
routers/api/v1/api.go	`71.36% <100%> (ø)`	⬆️
routers/routes/routes.go	`82.38% <100%> (-0.03%)`	⬇️
routers/repo/activity.go	`40.35% <100%> (ø)`	⬆️
models/repo.go	`48.53% <20%> (-0.08%)`	⬇️
routers/repo/issue.go	`35.34% <60%> (+0.05%)`	⬆️
models/unit.go	`62.16% <0%> (-5.41%)`	⬇️
... and 2 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 714dcf9...3647ab6. Read the comment docs.

jpicht · 2019-07-19T08:39:35Z

Now the docker test fails because of unrelated issues. :(

Can that be re-run or do I need to push an empty commit to the branch?

go: strk.kbt.io/projects/go/libravatar@v0.0.0-20160628055650-5eed7bff870a: git fetch -f https://strk.kbt.io/git/go-libravatar.git refs/heads/*:refs/heads/* refs/tags/*:refs/tags/* in /go/pkg/mod/cache/vcs/20b35e8f598eb07a4d3d0fb9a878597498193f8a12440138d148579fe7ea90eb: exit status 128:
--
418 | fatal: unable to access 'https://strk.kbt.io/git/go-libravatar.git/': The requested URL returned error: 500

lafriks · 2019-07-19T09:36:27Z

Currently this will totally break options page to enable/disable pull requests if both issue and wiki are disabled, no?

IMHO this PR can not be merged if it leaves broken state that no PR can be used in Gitea

jpicht · 2019-07-23T09:17:30Z

Currently this will totally break options page to enable/disable pull requests if both issue and wiki are disabled, no?

Actually Pull-Requests are working just fine. I don't know about a broken options page? Can you point me to it?

jpicht · 2019-07-23T09:22:43Z

Currently this will totally break options page to enable/disable pull requests if both issue and wiki are disabled, no?

Actually Pull-Requests are working just fine. I don't know about a broken options page? Can you point me to it?

Never mind ... I found it.

modules/setting/service.go

Signed-off-by: Julian Picht <julian.picht@gmail.com>

This reverts commit e2eb47569ed4d8cd05f89abac600b4e062f7f8a7. Signed-off-by: Julian Picht <julian.picht@gmail.com>

…Issues Signed-off-by: Julian Picht <julian.picht@gmail.com>

Signed-off-by: Julian Picht <julian.picht@gmail.com>

jpicht · 2019-08-07T14:06:13Z

@zeripath I changed the config section to [repository]

jpicht · 2019-08-08T06:13:13Z

@lunny Somehow the page still shows one of your change request to be open. It somehow got confused, when I rebased the branch on the current master. The requested change has been implemented.

lafriks · 2019-08-08T07:53:25Z

models/repo.go

@@ -1278,6 +1278,9 @@ func createRepository(e *xorm.Session, doer, u *User, repo *Repository) (err err
 	var units = make([]RepoUnit, 0, len(DefaultRepoUnits))
 	for _, tp := range DefaultRepoUnits {
 		if tp == UnitTypeIssues {
+			if !setting.Repository.EnableIssues {


wouldn't it be possible to do these changes without changing how unit rights are saved to DB? so that if you later enable enable issues back you would not have to go through all repo teams to enable issues back

I don't really think this is will happen.

Example: We have a company wiki, and an issue tracker. All we do need gitea for is for managing git repositories.
Enabling wiki and issue functions will - very probably - not happen in this use case.

I also don't see a different use case, where you would want to globally disable the Wiki / Issue functions, do you?

DefaultRepoUnits also does not contain UnitTypeIssues (as by @lunny's request #7032 (comment)). So that even removing that line will not change the behavior.

I can provide a small bash+curl script to enable the wiki and/or issues via the API for inclusion in the documentation, so a user could easily work around this.

What I mean is what if I already have existing repository and now I disable issues globally, units for existing repositories will be added so there is not really much point in skiping this for new repos as you will have to check anyway later not only if unit is enabled but also new setting. And if for whaterver reason I later want to enable it back it would be better that user would not have to run scripts to fix db to have working instance.

To me it seems this PR is doing two things at the same time

Disabling the possibility to enable issues/wiki (including default value)

Disabling any issue/wiki view, even if it was enabled.

Of course in the second case, it would be confusing to still have the settings for enabling it, but there is really no point of affecting the defaults (as @lafriks point out). If only the first case is wanted, there should not be necessary with any changes in routers, as the wiki/issues is anyhow disabled. For a fresh installation I don't think it matter, but the question is how it shall behave for an existing installation if issues/wikis are globally disabled. Either issues/wikis are disabled for existing repos even if they was enabled before the ini setting was changed. Other alternative is to only allow disable issues/wiki for a repo but not enable it. This would correspond to how FORCE_PRIVATE option is working.

davidsvantesson

Personally I find it more useful with a setting for default repo units. Even if it is a common use-case to not use internal wiki/tracker, you might want to link to an external one.

This PR still leaves it open to enable issues/wiki from API, is that intentional?

jpicht · 2019-08-12T06:59:01Z

Personally I find it more useful with a setting for default repo units. Even if it is a common use-case to not use internal wiki/tracker, you might want to link to an external one.

I can certainly add "DEFAULT_WIKI_ENABLED" and "DEFAULT_ISSUES_ENABLED" config options, but including this in this pull request would be be scope creep IMO

This PR still leaves it open to enable issues/wiki from API, is that intentional?

No, that would not be intentional. I thought I disabled the API routes, but I will check again.

davidsvantesson · 2019-08-12T17:19:47Z

This PR still leaves it open to enable issues/wiki from API, is that intentional?

No, that would not be intentional. I thought I disabled the API routes, but I will check again.

I think https://try.gitea.io/api/swagger#/repository/repoEdit is still available which allows to enable or disable wiki/issue tracker? And I don't think the route shall be disabled because it would disable any repository setting through API. Rather an http error response shall be returned if trying to enable issue/wiki (alternatively, just ignore the setting).

lunny · 2019-08-13T02:19:56Z

@jpicht sorry for late to review. I will review this ASAP.

lunny · 2019-08-15T02:24:32Z

routers/api/v1/api.go

@@ -454,7 +454,7 @@ func mustAllowPulls(ctx *context.APIContext) {
 }

 func mustEnableIssuesOrPulls(ctx *context.APIContext) {
-	if !ctx.Repo.CanRead(models.UnitTypeIssues) &&
+	if (!setting.Repository.EnableIssues || !ctx.Repo.CanRead(models.UnitTypeIssues)) &&


So even the repository created some issues, this will still hide them when setting.Repository.EnableIssues changed to true?

stale · 2019-10-14T02:51:41Z

This pull request has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs during the next 2 months. Thank you for your contributions.

6543 · 2019-10-27T22:24:42Z

@jpicht are you still working on this?

jpicht · 2019-10-28T06:24:57Z

We are running this in production, so I would be happy to get it merged. I've ported it to the latest rc one or two weeks back.

The problem with merging though, seems to mostly be to define what is supposed to happen in the corner cases, that (IMO) would probably never happen: re-enabling issues/wiki after disabling them.

I do only see the use case that my company has: we already have a wiki and an issue tracker, we do not want to confuse people with a second one, that they are supposed to ignore. If there's another use case I'd be happy to accommodate that in my patch.

I'll push an updated version in the next few days.

guillep2k · 2019-10-28T11:35:45Z

@jpicht In the meantime, you could cheat the feature by using a custom template that hides Wikis and Issues from the menu.

davidsvantesson · 2019-10-29T07:35:48Z

I don't think the corner cases is a big problem. My main comment on this PR is that I think it solves a too specific use case. Shouldn't we have a system where any repo unit can be globally disabled? (Maybe a bit connected to the plugin discussions). So the app.ini could be something like
GLOBAL_UNIT_DISABLE = issues, external_tracker, wiki, external_wiki, pull_requests, releases

I don't mean disabling of all units need to be implemented in the same PR, just that it would be good to think about the structure.

Sorry if I am being discouraging, I really see the use of being able to globally disable certain units. In my organization we don't use the internal issue and wiki, so it would be good to be able to disable those (we have a script to turn them off at creation). The problem is that this PR also switches off other units with the same flag options (external tracker and wiki), which makes it much less useful.

stale · 2019-12-30T21:40:31Z

This pull request has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs during the next 2 months. Thank you for your contributions.

davidsvantesson · 2020-05-30T16:17:22Z

I think this pull request can be closed as #8788 solves the same thing.

@jpicht Thanks for your work! It is valuable even if a slightly different solution was merged.

GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label May 24, 2019

lunny added the type/feature Completely new functionality. Can only be merged if feature freeze is not active. label Jun 9, 2019

techknowlogick reviewed Jul 8, 2019

View reviewed changes

Makefile Outdated Show resolved Hide resolved

lunny requested changes Jul 8, 2019

View reviewed changes

routers/api/v1/api.go Outdated Show resolved Hide resolved

lunny requested changes Jul 8, 2019

View reviewed changes

routers/repo/issue_label_test.go Outdated Show resolved Hide resolved

jpicht force-pushed the issue_3336 branch from 4dbfebd to 11bebf7 Compare July 11, 2019 12:55

zeripath suggested changes Jul 25, 2019

View reviewed changes

modules/setting/service.go Outdated Show resolved Hide resolved

jpicht added 9 commits August 7, 2019 10:14

Implement ENABLE_WIKI config option

2e43a6a

Signed-off-by: Julian Picht <julian.picht@gmail.com>

Implement ENABLE_ISSUES config option

7d753f9

Signed-off-by: Julian Picht <julian.picht@gmail.com>

Clean up the repo settings page, if both issues and wiki are disabled

f14272e

Signed-off-by: Julian Picht <julian.picht@gmail.com>

remove unneccessary changes

033d7e1

Signed-off-by: Julian Picht <julian.picht@gmail.com>

set EnableIssues = true for TestUpdateIssueLabel_Clear

061316c

Signed-off-by: Julian Picht <julian.picht@gmail.com>

Revert "set EnableIssues = true for TestUpdateIssueLabel_Clear"

d91679e

This reverts commit e2eb47569ed4d8cd05f89abac600b4e062f7f8a7. Signed-off-by: Julian Picht <julian.picht@gmail.com>

Actually set default values for Service.EnableWiki and Service.Enable…

161500b

…Issues Signed-off-by: Julian Picht <julian.picht@gmail.com>

Fix the repository options page not displaying pull request options

fe8ae36

Signed-off-by: Julian Picht <julian.picht@gmail.com>

move config options Service.EnableWiki, Server.EnableWiki to Repository

c8d84df

Signed-off-by: Julian Picht <julian.picht@gmail.com>

jpicht force-pushed the issue_3336 branch from cfab4b8 to c8d84df Compare August 7, 2019 08:26

Fix ".Repository" in templates maps to different type on different pages

3647ab6

Signed-off-by: Julian Picht <julian.picht@gmail.com>

jpicht force-pushed the issue_3336 branch from aec3b17 to 3647ab6 Compare August 7, 2019 13:37

zeripath approved these changes Aug 7, 2019

View reviewed changes

GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Aug 7, 2019

lafriks reviewed Aug 8, 2019

View reviewed changes

davidsvantesson reviewed Aug 12, 2019

View reviewed changes

lunny reviewed Aug 15, 2019

View reviewed changes

stale bot added the issue/stale label Oct 14, 2019

stale bot removed the issue/stale label Oct 27, 2019

davidsvantesson mentioned this pull request Nov 2, 2019

Add setting to set default and global disabled repository units. #8788

Merged

stale bot added the issue/stale label Dec 30, 2019

lunny added the issue/confirmed Issue has been reviewed and confirmed to be present or accepted to be implemented label Jan 1, 2020

stale bot removed the issue/stale label Jan 1, 2020

sapk added the type/changelog Adds the changelog for a new Gitea version label Jan 13, 2020

zeripath closed this Jul 1, 2020

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

Add feature flags to the config for Wiki and Issues #7032

Add feature flags to the config for Wiki and Issues #7032

jpicht commented May 24, 2019

jpicht commented May 24, 2019

lunny commented May 24, 2019

jpicht commented May 24, 2019

charlesmorin commented Jul 8, 2019

codecov-io commented Jul 11, 2019 •

edited

Loading

jpicht commented Jul 19, 2019

lafriks commented Jul 19, 2019

jpicht commented Jul 23, 2019 •

edited

Loading

jpicht commented Jul 23, 2019

jpicht commented Aug 7, 2019

jpicht commented Aug 8, 2019

lafriks Aug 8, 2019

jpicht Aug 8, 2019

lafriks Aug 12, 2019

davidsvantesson Aug 12, 2019

davidsvantesson left a comment

jpicht commented Aug 12, 2019 •

edited

Loading

davidsvantesson commented Aug 12, 2019

lunny commented Aug 13, 2019

lunny Aug 15, 2019

stale bot commented Oct 14, 2019

6543 commented Oct 27, 2019

jpicht commented Oct 28, 2019

guillep2k commented Oct 28, 2019

davidsvantesson commented Oct 29, 2019

stale bot commented Dec 30, 2019

davidsvantesson commented May 30, 2020

Add feature flags to the config for Wiki and Issues #7032

Add feature flags to the config for Wiki and Issues #7032

Conversation

jpicht commented May 24, 2019

jpicht commented May 24, 2019

lunny commented May 24, 2019

jpicht commented May 24, 2019

charlesmorin commented Jul 8, 2019

codecov-io commented Jul 11, 2019 • edited Loading

Codecov Report

jpicht commented Jul 19, 2019

lafriks commented Jul 19, 2019

jpicht commented Jul 23, 2019 • edited Loading

jpicht commented Jul 23, 2019

jpicht commented Aug 7, 2019

jpicht commented Aug 8, 2019

lafriks Aug 8, 2019

Choose a reason for hiding this comment

jpicht Aug 8, 2019

Choose a reason for hiding this comment

lafriks Aug 12, 2019

Choose a reason for hiding this comment

davidsvantesson Aug 12, 2019

Choose a reason for hiding this comment

davidsvantesson left a comment

Choose a reason for hiding this comment

jpicht commented Aug 12, 2019 • edited Loading

davidsvantesson commented Aug 12, 2019

lunny commented Aug 13, 2019

lunny Aug 15, 2019

Choose a reason for hiding this comment

stale bot commented Oct 14, 2019

6543 commented Oct 27, 2019

jpicht commented Oct 28, 2019

guillep2k commented Oct 28, 2019

davidsvantesson commented Oct 29, 2019

stale bot commented Dec 30, 2019

davidsvantesson commented May 30, 2020

codecov-io commented Jul 11, 2019 •

edited

Loading

jpicht commented Jul 23, 2019 •

edited

Loading

jpicht commented Aug 12, 2019 •

edited

Loading