wanderer/gitea
1
0
Fork 0
forked from mirror/gitea
Code Issues Pull Requests Releases Activity
9,832 Commits 2 Branches 0 Tags 167 MiB
0122cf9cdc
Commit Graph

9832 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
赵智超
0122cf9cdc
[ui] Link to pr list page on sidebar when view pr (#12256) 
Fix #12254

Signed-off-by: a1012112796 <1012112796@qq.com>

Co-authored-by: techknowlogick <techknowlogick@gitea.io>
 2020-07-16 11:07:13 -04:00
mrsdizzie
9542b7317d
Fix Syntax highlight for token change in added/deleted code (#12238) 
* Fix Syntax highlight for token change in added/deleted code

For diffs we first syntax highlight the before and after line then use a 3rd party diff library to find the difference in them and create a substring based on that, which we then highlight a 2nd time to show the specific difference within a line that has changed. In a specific case if the diffrence also changes the chroma class it will split in the middle of the attr and cause broken HTML:

```
<span class="nx">oldtext<span>
<span class="k">var newtext<span>
```

Will then split on

```
<span class="
```

Where the difference starts, and produce something broken like:

```
<span class="<span class="removed-code">nx"oldtext</span></span

```

Fix that by detecting when it happens and putting the HTML back together properly before highlighting the added/deleted code.

Fixes #12235

* fix lint

* apply fix to all diff sections. Also handle case where insert/remove starts with a closing span

* Add a test for this new code

* remove comment

Co-authored-by: Lauris BH <lauris@nix.lv>
 2020-07-16 16:58:54 +03:00
techknowlogick
6ea2701cd9
Release docs as archive (#12253) 
It is ok to use go modules at this point as release-source make target has already been run. Otherwise hugo fails to build. Example of failed build: https://drone.gitea.io/go-gitea/gitea/27976/5/3

Co-authored-by: Lauris BH <lauris@nix.lv>
 2020-07-15 22:39:45 +01:00
Tchoupinax
fd9e8951d8
fix: add type=text for user_name (password manager) (#12250) 
* fix: add type=text for user_name (password manager)

* Update templates/user/auth/reset_passwd.tmpl

Co-authored-by: jaqra <48099350+jaqra@users.noreply.github.com>

Co-authored-by: jaqra <48099350+jaqra@users.noreply.github.com>
 2020-07-15 16:48:50 +03:00
GiteaBot
670db99f4f [skip ci] Updated translations via Crowdin 2020-07-15 04:38:43 +00:00
Lauris BH
bae5293d24
Show drone status for master branch in README (#12248) 2020-07-15 12:37:38 +08:00
Ben Harris
a4da46d182
Use correct make target for building static assets (#12247) 
The webpack make target does not build semantic-ui
 2020-07-14 15:45:23 -04:00
GiteaBot
3b498ebc77 [skip ci] Updated translations via Crowdin 2020-07-14 02:10:41 +00:00
Antoine GIRARD
b92a5d8d64
release docs as an archive (#12243) 
* release docs along sources

* use a custom offline version

Co-authored-by: Gitea <gitea@fake.local>
 2020-07-13 22:09:39 -04:00
Cirno the Strongest
633f52c220
Fix filepath basename on Windows for SVG bindata (#12241) 2020-07-13 21:16:40 +01:00
silverwind
84a419de98
Replace code fold icons with octicons (#12222) 
- replace font-awesome icons with octicons
- clean up js and css surrounding the code expansion and file folding
- fix hover color on arc-green
- tweak diff line number colors

Co-authored-by: zeripath <art27@cantab.net>
 2020-07-13 16:21:19 +03:00
Lars Lehtonen
b49a195839
models: fix xorm variable clobber (#12231) 
NewTestEngine() takes a *xorm.Engine as its argument, and then immediately overwrites it.

This fixes the model package to not take an unneeded variable, and changes the routers package to not create a nil *xorm.Engine that is immediately discarded by model.
 2020-07-13 09:58:55 +01:00
silverwind
48ad76c25e
Fix repolist icons (#12228) 
Fixes: https://github.com/go-gitea/gitea/issues/12226
 2020-07-13 02:48:48 +03:00
mrsdizzie
a60f506dd7
Syntax highlight expanded code blobs (#12223) 
Expanded code in diffs wasn't being highlighted properly because it wasn't passing the filename to highlighting code.

Fixes #12218
 2020-07-12 21:25:05 +03:00
bobemoe
bac57ab590
When starting new stopwatch stop previous if it is still running (#10533) 
Co-authored-by: zeripath <art27@cantab.net>
Co-authored-by: Lauris BH <lauris@nix.lv>
 2020-07-12 13:01:20 +03:00
silverwind
8188176b58
Direct SVG rendering (#12157) 
Introduce 'make svg' which calls a node script that compiles svg files
to `public/img/svg`. These files are vendored to not create a dependency
on Node for the backend build.

On the frontend side, configure webpack using `raw-loader` so SVGs can
be imported as string.

Also moved our existing SVGs to web_src/svg for consistency.

Fixes: https://github.com/go-gitea/gitea/issues/11618
 2020-07-12 12:10:56 +03:00
zeripath
63591016b3
Extend Notifications API and return pinned notifications by default (#12164) 
* Extend notifications API and return pinned notifications in notifications list

Signed-off-by: Andrew Thornton <art27@cantab.net>

* fix swagger

Signed-off-by: Andrew Thornton <art27@cantab.net>

* Fix swagger again

Signed-off-by: Andrew Thornton <art27@cantab.net>

* fix test

Signed-off-by: Andrew Thornton <art27@cantab.net>

* remove spurious debugs

* as per @6543

Signed-off-by: Andrew Thornton <art27@cantab.net>

* Update models/notification.go

* as per @6543

Signed-off-by: Andrew Thornton <art27@cantab.net>

Co-authored-by: techknowlogick <techknowlogick@gitea.io>
 2020-07-12 00:46:01 +03:00
Lunny Xiao
d08996c7b9
Upgrade xorm to v1.0.3 (#12210) 
Co-authored-by: Lauris BH <lauris@nix.lv>
Co-authored-by: techknowlogick <techknowlogick@gitea.io>
 2020-07-11 17:07:52 -04:00
6543
3973a4609e
Frontport Changelog of v1.12.2 (#12216) 
* Changelog for v1.12.2 (#12214)

* Changelog for v1.12.2

* Update CHANGELOG.md

Co-authored-by: mrsdizzie <info@mrsdizzie.com>

* Update CHANGELOG.md

Co-authored-by: mrsdizzie <info@mrsdizzie.com>

* Update CHANGELOG.md

Co-authored-by: mrsdizzie <info@mrsdizzie.com>

* Update CHANGELOG.md

Co-authored-by: mrsdizzie <info@mrsdizzie.com>

* Update CHANGELOG.md

Co-authored-by: mrsdizzie <info@mrsdizzie.com>

* Update CHANGELOG.md

Co-authored-by: mrsdizzie <info@mrsdizzie.com>

* Update CHANGELOG.md

Co-authored-by: mrsdizzie <info@mrsdizzie.com>

* Update CHANGELOG.md

Co-authored-by: mrsdizzie <info@mrsdizzie.com>

Co-authored-by: mrsdizzie <info@mrsdizzie.com>

* update docs

Co-authored-by: Lauris BH <lauris@nix.lv>
Co-authored-by: mrsdizzie <info@mrsdizzie.com>
 2020-07-11 16:28:23 -04:00
mrsdizzie
8d081950e6
Ensure syntax highlighting is the same inside diffs (#12205) 
Make sure to end up with the same syntax highlighting inside various sections of diffs by processing the code first before detecting specific changes between the lines. Also try and make sure that when highlighting individual lines in a diff that it is tokenized the same as it would be when part of an entire file with more context.

Fixes: #12190
 2020-07-11 13:43:12 +08:00
GiteaBot
6a62884782 [skip ci] Updated translations via Crowdin 2020-07-09 21:14:09 +00:00
6543
16980d13ce
Default to showing closed Issues/PR list when there are only closed issues/PRs (#12200) 
If all issues are closed, then set the default to show the closed issues.
 2020-07-09 22:13:06 +01:00
mrsdizzie
a6168fa25d
Make copy/paste work for source code (#12191) 
* Make copy/paste work for source code

Fix regression casued by #12047 so copy/paste works properly in all browsers.

Fixes #12184

Also while looking at this I saw a small display issue for blame view. I think #12023 was merged into original PR through an update branch before #12047 was merged and made one of the css ruules not apply anymore.

* use pseudo-element to prevent copying of comment + symbol even when not visually selected

* remove added newline here should not be necessary anymore

* make sure empty line is newline so there is something to select and copy
 2020-07-08 22:02:38 +01:00
Kristian Antonsen
cedbd3684f
Fix regression: Gitea commits API again returns commit summaries, not full messages (#12186) 
Closes #12185
 2020-07-08 14:53:09 +01:00
silverwind
dbd5e4bb8d
Update JS dependencies (#12181) 
- Update all dependencies excluding octicons
- Configure new eslint 7.3.0 rules

Co-authored-by: techknowlogick <techknowlogick@gitea.io>
 2020-07-08 09:47:05 +08:00
William Hilton
3a46d1ef58
Enable cloning via Git Wire Protocol v2 over HTTP (#12170) 
* Enable Git Wire Protocol v2 over HTTP

* use RunInDirTimeoutEnv

* pass $HOME environment variable to git upload-pack
 2020-07-08 01:31:49 +03:00
mrsdizzie
078d2fbd4c
Remove newline when highlighting random chunks of code (#12180) 
* Remove newline when highlighting random chunks of code

Somewhere when tokenizing a newline gets added to code formatted by chroma. This breaks the case of 'added-code' inside of an 'added-line' in a diff. Just remove any newline when processing chunks of code since we don't need it.

Fixes #12172

* don't process empty lines

* This is the proper way to fix this by telling chroma not to add the newline in the first place
 2020-07-08 01:30:21 +03:00
Jürgen Hötzel
30399cf04a
Trim to 255 runes instead of bytes (#12150) 
* Trim to 255 runes instead of bytes

Prevents invalid UTF-8 encoding for Description and Website. Refs #7905

* Apply suggestions from code review

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

Co-authored-by: techknowlogick <matti@mdranta.net>
Co-authored-by: zeripath <art27@cantab.net>
Co-authored-by: Lauris BH <lauris@nix.lv>
 2020-07-08 00:35:52 +03:00
赵智超
12f9dd8fa9
Decrease the num_stars when deleting a repo (#11954) 
* Decrease the  num_stars when deleting a repo

fix #11949

Signed-off-by: a1012112796 <1012112796@qq.com>

* Add migration

* use batch

* Apply suggestions from code review

Co-authored-by: Lauris BH <lauris@nix.lv>

* fix lint

* fix lint

* fix ci

* fix ci2

* add doctor

* duplicate code

* fix migration

* fix some nits

* add start

Co-authored-by: Lauris BH <lauris@nix.lv>
Co-authored-by: zeripath <art27@cantab.net>
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
 2020-07-07 15:16:34 -04:00
Cirno the Strongest
88ef04dbe9
Adjust margin-top for repo header label (#12174) 2020-07-07 19:47:18 +08:00
silverwind
075f33c48c
Fix U2F button icon (#12167) 
Previously this used a USB icon which required a separate font file used
nowhere else so replace it with a octicon and fix the background color
on arc-green too.
 2020-07-07 01:37:48 +03:00
zeripath
8a0bb7cd04
Ensure Subkeys are verified (#12155) 
When attempting to verify subkeys the email address verification step
requires checking the emails however, these emails are not stored on
subkeys but instead on the primary key.

This PR will obtain the primaryKey and check against these emails too.

Fix #12128

Signed-off-by: Andrew Thornton <art27@cantab.net>

Co-authored-by: techknowlogick <techknowlogick@gitea.io>
 2020-07-06 14:33:34 -04:00
Stormxx
26e931ae34
fix a spelling error (#12163) 
Co-authored-by: techknowlogick <techknowlogick@gitea.io>
 2020-07-06 11:58:31 -04:00
Lars Lehtonen
56f222d44c
models: break out of loops (#12159) 
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
 2020-07-06 13:07:07 +01:00
GiteaBot
ae2916c792 [skip ci] Updated translations via Crowdin 2020-07-06 08:58:05 +00:00
silverwind
62c2c17031
Fonts rework (#12114) 
- Use system fonts only for text to avoid FOUT
- Move font-awesome to npm/webpack
- Move NotoColorEmoji to web_src
- Remove presumably unneccesary 'PT Sans Narrow'
- Simplify webpack import exclusions

Fixes: https://github.com/go-gitea/gitea/issues/11818
Fixes: https://github.com/go-gitea/gitea/pull/11814

Co-authored-by: zeripath <art27@cantab.net>
Co-authored-by: Lauris BH <lauris@nix.lv>
 2020-07-06 11:56:54 +03:00
yisiliang
9fc9c1de98
Update the wiki repository remote origin while update the mirror repository's Clone From URL (#12053) 
* update the wiki repository remote origin #12050

* wikiRemoteURL is under repo_module

* export WikiRemoteURL func

* remove redundant space and empty line

Co-authored-by: Lauris BH <lauris@nix.lv>
Co-authored-by: techknowlogick <techknowlogick@gitea.io>
 2020-07-05 22:08:32 -04:00
zeripath
c5b08f6d5a
Pause, Resume, Release&Reopen, Add and Remove Logging from command line (#11777) 
* Make LogDescriptions race safe

* Add manager commands for pausing, resuming, adding and removing loggers

Signed-off-by: Andrew Thornton <art27@cantab.net>

* Placate lint

* Ensure that file logger is run!

* Add support for smtp and conn

Signed-off-by: Andrew Thornton <art27@cantab.net>

* Add release-and-reopen

Signed-off-by: Andrew Thornton <art27@cantab.net>

Co-authored-by: techknowlogick <techknowlogick@gitea.io>
Co-authored-by: Lauris BH <lauris@nix.lv>
 2020-07-05 20:07:07 -04:00
GiteaBot
38fb087d19 [skip ci] Updated translations via Crowdin 2020-07-05 22:41:35 +00:00
Lauris BH
4384320db9
Use hash of repo path, ref and entrypath as cache key (#12151) 2020-07-06 01:40:34 +03:00
zeripath
217647f331
Multiple small admin dashboard fixes (#12153) 
* Remove spurious spacing between Maintenance Operations and its table on dashboard
* Prevent (EXTRA string) comments in Task headers
* Redirect tasks started from monitor page back to monitor
* Fix #12107 - redirects from process cancel should use AppSubUrl
* When wrapping queues set the name correctly

Signed-off-by: Andrew Thornton <art27@cantab.net>
 2020-07-05 22:38:03 +03:00
George Merlocco
0d03fbf2ca
Ensure tabs wrap correctly on user profile page (#12144) 
Co-authored-by: zeripath <art27@cantab.net>
 2020-07-05 12:09:52 -04:00
xenofem
d1562bfc34
properly set symbolic-ref HEAD when a repo is created with a non-master default branch (#12135) 
This fixes an issue I noticed with #10803: when you create a repo with a non-master default branch, gitea doesn't change the remote ref HEAD, so it still points at refs/heads/master. As a result, cloning my repos gives me error messages and doesn't check out the desired default branch, so I need to manually check it out after cloning.
 2020-07-05 16:25:46 +01:00
silverwind
15d3aa7b95
Enable a few more eslint rules (#12145) 
This gets the config closer to what 1.12 had.

Related: https://github.com/go-gitea/gitea/pull/12129
 2020-07-05 11:51:29 +01:00
zeripath
c6d6c51ada
Remove spurious logging (#12139) 
Unfortunately #10745 merged a spurious logging message. This PR removes this.

Signed-off-by: Andrew Thornton <art27@cantab.net>

Co-authored-by: Lauris BH <lauris@nix.lv>
 2020-07-05 12:11:02 +08:00
zeripath
2ab185d3ab
Rewrite GitGraph.js (#12137) 
The current vendored gitgraph.js is no longer maintained and is
difficult to understand, fix and maintain.

This PR completely rewrites its logic - hopefully in a clearer fashion
and easier to maintain.

It also includes @silverwind's improvements of coloring the commit dots
and preventing the flash of incorrect content.

Further changes to contemplate in future will be abstracting out of the
flows to an object, storing the involved commit references on the flows
etc. However, this is probably a required step for this.

Replaces #12131
Fixes #11981 (part 3)

Signed-off-by: Andrew Thornton <art27@cantab.net>
 2020-07-05 02:04:24 +01:00
zeripath
3c4388f668
Re-fix #12095 again (#12138) 
Unfortunately some of the suggested changes to #12095 introduced
bugs which due to caching behaviour of sharedworkers were not caught
on simple tests.

These are as follows:

* Changing from simple for loop to use includes here:

```js
  register(port) {
    if (!this.clients.includes(port)) return;

    this.clients.push(port);

    port.postMessage({
      type: 'status',
      message: `registered to ${this.url}`,
    });
  }
```

The additional `!` prevents any clients from being added and should
read:

```js
    if (this.clients.includes(port)) return;
```

* Dropping the use of jQuery `$(...)` selection and using DOM
`querySelector` here:

```js
async function receiveUpdateCount(event) {
  try {
    const data = JSON.parse(event.data);

    const notificationCount = document.querySelector('.notification_count');
    if (data.Count > 0) {
      notificationCount.classList.remove('hidden');
    } else {
      notificationCount.classList.add('hidden');
    }

    notificationCount.text() = `${data.Count}`;
    await updateNotificationTable();
  } catch (error) {
    console.error(error, event);
  }
}
```

Requires that `notificationCount.text()` be changed to use `textContent`
instead.

Signed-off-by: Andrew Thornton <art27@cantab.net>
 2020-07-05 01:04:00 +03:00
zeripath
60cb9fe448
Bugfix for shared event source (#12129) 
For some reason our eslint configuration is not working correctly
and a bug has become apparent when trying to backport this to 1.12.

Signed-off-by: Andrew Thornton <art27@cantab.net>

Co-authored-by: techknowlogick <techknowlogick@gitea.io>
 2020-07-04 10:01:25 -04:00
Andreas Shimokawa
510e4bd245
templates/repo/empty.tmpl : fix repo setup instructions (#12122) 
Co-authored-by: codeberg <codeberg@codeberg.org>
 2020-07-03 17:22:14 -04:00
zeripath
ae56411e9f
Move EventSource to SharedWorker (#12095) 
Move EventSource to use a SharedWorker. This prevents issues with HTTP/1.1
open browser connections from preventing gitea from opening multiple tabs.

Also allow setting EVENT_SOURCE_UPDATE_TIME to disable EventSource updating

Fix #11978

Signed-off-by: Andrew Thornton <art27@cantab.net>

Co-authored-by: silverwind <me@silverwind.io>
Co-authored-by: techknowlogick <techknowlogick@gitea.io>
 2020-07-03 10:55:36 +01:00