Skip to content

Commit 672f0bb

Browse files
committed
fix
1 parent 666a019 commit 672f0bb

File tree

2 files changed

+5
-8
lines changed

2 files changed

+5
-8
lines changed

services/repository/commit.go

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,9 @@ import (
1212
)
1313

1414
type ContainedLinks struct { // TODO: better name?
15-
Branches []*namedLink `json:"branches"`
16-
Tags []*namedLink `json:"tags"`
17-
ContainedInDefaultBranch bool `json:"contained_in_default_branch"`
18-
DefaultBranch string `json:"default_branch"`
15+
Branches []*namedLink `json:"branches"`
16+
Tags []*namedLink `json:"tags"`
17+
DefaultBranch string `json:"default_branch"`
1918
}
2019

2120
type namedLink struct { // TODO: better name?
@@ -35,8 +34,6 @@ func LoadBranchesAndTags(ctx context.Context, baseRepo *gitea_ctx.Repository, co
3534
}
3635

3736
result := &ContainedLinks{
38-
ContainedInDefaultBranch: util.SliceContains(containedBranches, baseRepo.Repository.DefaultBranch),
39-
4037
DefaultBranch: baseRepo.Repository.DefaultBranch,
4138
Branches: make([]*namedLink, 0, len(containedBranches)),
4239
Tags: make([]*namedLink, 0, len(containedTags)),

web_src/js/features/load-branches-and-tags.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
import {showElem, toggleElem} from '../utils/dom.js';
1+
import {hideElem, showElem, toggleElem} from '../utils/dom.js';
22

33
async function loadBranchesAndTags(area, loadingButton) {
44
loadingButton.classList.add('disabled');
55
try {
66
const res = await fetch(loadingButton.getAttribute('data-fetch-url'));
77
const data = await res.json();
8-
loadingButton.classList.add('gt-hidden');
8+
hideElem(loadingButton);
99
addTags(area, data.tags);
1010
addBranches(area, data.branches, data.default_branch);
1111
showElem(area.querySelectorAll('.branch-and-tag-detail'));

0 commit comments

Comments
 (0)