Change/remove a branch of an open issue #9080

vedranMv · 2019-11-19T22:56:59Z

Fix #3620 This PL addressed inability to change a branch of an open issue

b84622d Follows the pattern of changing a title of an issue (in the backend) and coupled with frontend changes allows changing the branch of an open issue. However, no comments are currently posted to the issue when a branch is changed. I'm still not sure about the best way to implement that but it looks like it might require changes in DB (add old_ref and new_ref columns to 'comment' table).

Perhaps it would also make sense to only merge this part for now, and then follow up with a new PL for comments :)

vedranMv · 2019-11-20T16:49:48Z

668d3c0 Merged master into branch (I messed up commit message)

codecov-io · 2019-11-20T17:03:53Z

Codecov Report

Merging #9080 into master will decrease coverage by 0.02%.
The diff coverage is 4.16%.

@@            Coverage Diff             @@
##           master    #9080      +/-   ##
==========================================
- Coverage   42.25%   42.23%   -0.03%     
==========================================
  Files         610      610              
  Lines       80372    80419      +47     
==========================================
+ Hits        33965    33966       +1     
- Misses      42227    42272      +45     
- Partials     4180     4181       +1

Impacted Files	Coverage Δ
models/issue.go	`54.33% <0%> (-0.48%)`	⬇️
modules/notification/indexer/indexer.go	`53.52% <0%> (-1.56%)`	⬇️
modules/notification/base/null.go	`63.63% <0%> (-1.99%)`	⬇️
modules/notification/notification.go	`74.1% <0%> (-2.2%)`	⬇️
services/issue/issue.go	`20.93% <0%> (-2.76%)`	⬇️
routers/routes/routes.go	`87.11% <100%> (+0.01%)`	⬆️
routers/repo/issue.go	`37.52% <5.26%> (-0.48%)`	⬇️
services/pull/merge.go	`51.36% <0%> (-0.69%)`	⬇️
models/repo.go	`49.66% <0%> (-0.14%)`	⬇️
services/pull/patch.go	`66.03% <0%> (+1.25%)`	⬆️
... and 1 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 20d637a...d7cd33e. Read the comment docs.

lunny · 2019-11-21T13:24:51Z

@vedranMv Could you give any screenshot?

vedranMv · 2019-11-21T16:46:54Z

Sure

models/issue.go

guillep2k · 2019-11-21T17:22:35Z

routers/repo/issue.go

+
+ ref := ctx.QueryTrim("ref")
+ if len(ref) == 0 {
+ ctx.Error(204)


How can the user remove the target branch?

So far it can't, however, that's the same problem as when you try to create an issue - once selected, the branch can't be removed short of refreshing the page. I'll look into it

And thanks for all the feedback, it's pretty useful :)

templates/repo/issue/branch_selector_field.tmpl

vedranMv · 2019-11-21T23:32:08Z

20f10af addresses all but one concern, deleting a branch.
I can't think of a simple solution as it involves completely new front-end element :)

guillep2k · 2019-11-22T00:20:13Z

20f10af addresses all but one concern, deleting a branch.
I can't think of a simple solution as it involves completely new front-end element :)

Can a ficticious blank (" ") branch name added at the end of the list as a placeholder?

vedranMv · 2019-11-22T07:05:33Z

That's why I like reviews :D I have a tendency to overcomplicate sometimes. I'll fix it later today

vedranMv · 2019-11-22T17:02:32Z

How about 8b68d5d ? There's now a button which appears only when issue has a ref assigned to it? :)

The drawback of this button is that page now has to be refreshed when selecting a branch otherwise the branch list doesn't get updated and you either can't see the 'clear ref' button after the branch has been selected, or it stays there after you've cleared a branch.

guillep2k

This works like a treat!

You may want to update the title of this PR though, to mention the possibility of branch removal. 😉

…issue-branch

vedranMv · 2020-05-17T19:32:31Z

Compiles and works as intended. What am I missing here for build to pass? :)

techknowlogick · 2020-05-17T19:36:34Z

@vedranMv make fmt will allow the file to pass lint

codecov-commenter · 2020-05-27T08:53:12Z

Codecov Report

Merging #9080 into master will decrease coverage by 0.05%.
The diff coverage is 22.89%.

@@            Coverage Diff             @@
##           master    #9080      +/-   ##
==========================================
- Coverage   43.30%   43.24%   -0.06%     
==========================================
  Files         647      648       +1     
  Lines       71800    71922     +122     
==========================================
+ Hits        31090    31102      +12     
- Misses      35675    35779     +104     
- Partials     5035     5041       +6

Impacted Files	Coverage Δ
cmd/migrate_storage.go	`0.00% <0.00%> (ø)`
models/issue.go	`56.46% <0.00%> (-0.41%)`	⬇️
modules/notification/base/null.go	`71.42% <0.00%> (-2.11%)`	⬇️
modules/notification/indexer/indexer.go	`48.61% <0.00%> (-1.39%)`	⬇️
modules/notification/notification.go	`81.25% <0.00%> (-2.24%)`	⬇️
modules/repofiles/update.go	`40.30% <0.00%> (-0.31%)`	⬇️
modules/repofiles/upload.go	`0.00% <0.00%> (ø)`
routers/repo/lfs.go	`0.00% <0.00%> (ø)`
services/issue/issue.go	`32.85% <0.00%> (-3.66%)`	⬇️
modules/storage/minio.go	`48.43% <5.00%> (-20.46%)`	⬇️
... and 24 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 0ed8d26...def127d. Read the comment docs.

stale · 2020-07-26T09:39:26Z

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.

modules/notification/indexer/indexer.go

DefinitelyADev · 2020-09-02T15:51:54Z

Hi, will this get merged in 1.13.0?

That's would be really helpful instead of using ref #issue in the commits.

services/issue/issue.go

templates/repo/issue/branch_selector_field.tmpl

Co-authored-by: zeripath <art27@cantab.net>

Gitea added 7 commits November 18, 2019 20:15

Add field with isIssueWriter to front end

c7d3b19

Make branch field editable

0e106f0

Switch frontend to form and POST from javascript

de06054

Add /issue/id/ref endpoint to routes

c99c280

Use UpdateIssueTitle model to change ref in backend

c41a8a9

Removed crossreference check and adding comments on branch change

b84622d

Merge branch into master

668d3c0

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

vedranMv marked this pull request as ready for review November 20, 2019 16:49

vedranMv changed the title ~~WIP: Change branch of an open issue (#3620)~~ Change branch of an open issue (#3620) Nov 20, 2019

lunny added the type/enhancement An improvement of existing functionality label Nov 21, 2019

vedranMv changed the title ~~Change branch of an open issue (#3620)~~ Change branch of an open issue Nov 21, 2019

guillep2k reviewed Nov 21, 2019

View reviewed changes

Gitea added 3 commits November 21, 2019 22:04

Use ref returned from POST to update the field

92a031f

Prevent calling loadRepo from models/

7d339c1

Branch/tag refreshed without page reload

20f10af

Remove filter for empty branch name

9e36b25

Gitea added 2 commits November 22, 2019 07:06

Add clear option to tag list as well

bb1b87f

Delete button translation and coloring

8b68d5d

guillep2k approved these changes Nov 22, 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 Nov 22, 2019

lafriks modified the milestones: 1.12.0, 1.13.0 May 16, 2020

Merge branch 'master' of git://github.com/go-gitea/gitea into change-…

c74afb9

…issue-branch

This comment has been minimized.

Sign in to view

Merge branch 'master' of git://github.com/go-gitea/gitea into change-…

c0a77d4

…issue-branch

This comment has been minimized.

Sign in to view

Fix for renamed permission parameter

52f6763

Fix for failing build

7d97d58

stale bot added the issue/stale label Jul 26, 2020

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

stale bot removed the issue/stale label Jul 26, 2020

lunny reviewed Aug 18, 2020

View reviewed changes

modules/notification/indexer/indexer.go Show resolved Hide resolved

zeripath reviewed Sep 3, 2020

View reviewed changes

services/issue/issue.go Outdated Show resolved Hide resolved

zeripath reviewed Sep 3, 2020

View reviewed changes

templates/repo/issue/branch_selector_field.tmpl Outdated Show resolved Hide resolved

Apply suggestions from code review

f8f8d13

Co-authored-by: zeripath <art27@cantab.net>

zeripath approved these changes Sep 4, 2020

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 Sep 4, 2020

Merge branch 'master' into change-issue-branch

aeb173b

zeripath requested a review from lunny September 4, 2020 17:00

lunny approved these changes Sep 7, 2020

View reviewed changes

lunny and others added 2 commits September 8, 2020 08:50

Merge branch 'master' into change-issue-branch

0fc8d10

Merge branch 'master' into change-issue-branch

def127d

techknowlogick merged commit e204398 into go-gitea:master Sep 8, 2020

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Change/remove a branch of an open issue #9080

Change/remove a branch of an open issue #9080

vedranMv commented Nov 19, 2019 •

edited

Loading

vedranMv commented Nov 20, 2019

codecov-io commented Nov 20, 2019 •

edited

Loading

lunny commented Nov 21, 2019

vedranMv commented Nov 21, 2019

guillep2k Nov 21, 2019

vedranMv Nov 21, 2019 •

edited

Loading

vedranMv commented Nov 21, 2019

guillep2k commented Nov 22, 2019

vedranMv commented Nov 22, 2019

vedranMv commented Nov 22, 2019

guillep2k left a comment

This comment has been minimized.

This comment has been minimized.

vedranMv commented May 17, 2020

techknowlogick commented May 17, 2020

codecov-commenter commented May 27, 2020 •

edited

Loading

stale bot commented Jul 26, 2020

DefinitelyADev commented Sep 2, 2020

Change/remove a branch of an open issue #9080

Change/remove a branch of an open issue #9080

Conversation

vedranMv commented Nov 19, 2019 • edited Loading

vedranMv commented Nov 20, 2019

codecov-io commented Nov 20, 2019 • edited Loading

Codecov Report

lunny commented Nov 21, 2019

vedranMv commented Nov 21, 2019

guillep2k Nov 21, 2019

Choose a reason for hiding this comment

vedranMv Nov 21, 2019 • edited Loading

Choose a reason for hiding this comment

vedranMv commented Nov 21, 2019

guillep2k commented Nov 22, 2019

vedranMv commented Nov 22, 2019

vedranMv commented Nov 22, 2019

guillep2k left a comment

Choose a reason for hiding this comment

This comment has been minimized.

This comment has been minimized.

vedranMv commented May 17, 2020

techknowlogick commented May 17, 2020

codecov-commenter commented May 27, 2020 • edited Loading

Codecov Report

stale bot commented Jul 26, 2020

DefinitelyADev commented Sep 2, 2020

vedranMv commented Nov 19, 2019 •

edited

Loading

codecov-io commented Nov 20, 2019 •

edited

Loading

vedranMv Nov 21, 2019 •

edited

Loading

codecov-commenter commented May 27, 2020 •

edited

Loading