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

1210 Commits

Author SHA1 Message Date
zeripath
a07cc0df76
Handle multiple merges in gitgraph.js (#11996) 
* Handle multiple merges in gitgraph.js

There is a bug in web_src/js/vendor/gitgraph.js whereby it fails to
handle multiple merges in a single commit correctly. This PR adds
changes to make this work.

Fix #11981

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

* Update web_src/js/vendor/gitgraph.js
 2020-06-20 22:29:44 +03:00
Cirno the Strongest
6c81b738f7
Update Fomantic-UI to 2.8.6 and remove old workarounds (#11933) 
Co-authored-by: zeripath <art27@cantab.net>
Co-authored-by: techknowlogick <techknowlogick@gitea.io>
 2020-06-17 21:20:07 -04:00
techknowlogick
6bf78d2b57
Global default branch setting (#11918) 
* Global default branch setting

* add to app.ini example per @silverwind

* update per @lunny

Co-authored-by: John Olheiser <john.olheiser@gmail.com>
 2020-06-17 16:53:55 -04:00
Cirno the Strongest
61cd0ce866
Fix double divider on issue sidebar (#11919) 2020-06-17 10:12:06 -04:00
6543
f399cd326b
UI: Fix wrong closing tag (#11910) 
* rm wrong closing tag

* Update templates/repo/sub_menu.tmpl

Co-authored-by: John Olheiser <john.olheiser@gmail.com>

Co-authored-by: John Olheiser <john.olheiser@gmail.com>
 2020-06-16 11:27:20 -04:00
Cirno the Strongest
80a3745fc8
Make repository size unclickable on repo summary bar (#11887) 
Co-authored-by: techknowlogick <techknowlogick@gitea.io>
 2020-06-15 21:45:17 -04:00
Cirno the Strongest
c8780984f8
Rework blame template and styling (#11885) 
* Rework blame template and styling

* cleanup template and add missing NumLines

Co-authored-by: techknowlogick <techknowlogick@gitea.io>
 2020-06-15 14:39:39 -04:00
Cirno the Strongest
5f47835f4c
Better align items using flex within review request box (#11879) 
* Better align items using flex within review request box

* use justify-content

Co-authored-by: Lauris BH <lauris@nix.lv>
Co-authored-by: techknowlogick <techknowlogick@gitea.io>
 2020-06-15 03:37:00 -04:00
赵智超
48842ed108
ui: Show update branch item in merge box when it's necessary (#11761) 
* ui: Show update branch item in merge box when it's necessary

As title, should show it without care about whether
this pr can be merged.

fix #10959

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

* fix ui

* Fix ui, thanks to @silverwind.

Co-authored-by: silverwind <me@silverwind.io>

* fix lint

* Update templates/repo/issue/view_content/pull.tmpl

Co-authored-by: silverwind <me@silverwind.io>

* Apply review suggestion

Co-authored-by: zeripath <art27@cantab.net>
Co-authored-by: silverwind <me@silverwind.io>
Co-authored-by: techknowlogick <techknowlogick@gitea.io>
 2020-06-13 14:49:59 -04:00
Cirno the Strongest
b6adf80a80
Fix repo internal icon when avatar is present (#11873) 
* Fix repo internal icon when avatar is present

* fix tabs

* move repo icons in header to separate template
 2020-06-13 00:24:41 +03:00
Cirno the Strongest
8770bceafa
Fix search form button overlap (#11840) 
Co-authored-by: techknowlogick <techknowlogick@gitea.io>
 2020-06-11 23:35:03 -04:00
silverwind
ca8ecf7ffc
Improve label edit buttons labels (#11841) 
* Improve label edit buttons labels

Previously when editing the buttons in the "Edit Label" modal were a
strange "Update" and "No". Improved them to "Save" and "Cancel".

Also fixed indentation in the template file, recommended to view changes
with the "Hide whitespace changes" option enabled on GitHub.

* remove unnecessary button icon

Co-authored-by: techknowlogick <techknowlogick@gitea.io>
 2020-06-11 17:06:20 -04:00
Cirno the Strongest
b682a2c1b2
Show exact tag for commit on diff view (#11846) 
* Show exact tag for commit on diff view

* Fix comment

Co-authored-by: techknowlogick <techknowlogick@gitea.io>
 2020-06-11 15:42:55 -04:00
silverwind
628ee1d82e
Replace jquery-datetimepicker with native date input (#11684) 
This removes the jQuery plugin as well as the associated config options.
Native input[type=date] does not require a language attribute as it is
localized by default, except for the placeholder attribute for which I
currently piggy-back the repo.issues.due_date_form localization option.

Implementation should pretty much match GH. Of note is that Safari does
not provide a UI for this input type, but I don't think providing one is
neccessary and GH did not bother either.

Co-authored-by: techknowlogick <techknowlogick@gitea.io>
 2020-06-10 14:35:27 -04:00
silverwind
19db3f4f0a
rework eslint config (#11615) 
* rework eslint config

- use explicit config that only enables rules
- upgrade eslint to 7.1.0
- add new plugins with selected rules enabled
- fix discovered issues, remove global wipPrefixes

* remove if

* undo template change

* add disabled rules as well for easier config updating

* add missing disabled rule

* update eslint and plugins

* fix new violation

* remove deprecated rules

Co-authored-by: Lauris BH <lauris@nix.lv>
 2020-06-09 17:31:15 -04:00
John Olheiser
aaff47ad75
Fix reply octicon (#11821) 
Signed-off-by: jolheiser <john.olheiser@gmail.com>
 2020-06-09 10:13:00 -05:00
Cirno the Strongest
880ae454db
Work around fomantic 2.8.5 bugs (#11767) 
Work around fomantic 2.8.5 bugs 

Closes #11759

Related fomantic/Fomantic-UI#1372 and fomantic/Fomantic-UI#1473
 2020-06-07 19:25:52 +01:00
Cirno the Strongest
bbe13b60cd
Fix timezone on issue deadline (#11697) 
* Fix timezone on issue deadline

* FormatDate

Co-authored-by: zeripath <art27@cantab.net>
 2020-06-05 18:51:10 -04:00
John Olheiser
ac07418011
Add compare link to releases (#11752) 
Signed-off-by: jolheiser <john.olheiser@gmail.com>

Co-authored-by: Lauris BH <lauris@nix.lv>
 2020-06-05 14:44:54 -04:00
Cirno the Strongest
5acba4609a
Add internal-repo octicon for public repos of private org (#11529) 
* Show multiple octicons on repo list

* fix mixed spaces/tabs

* Internal repo octicon

* show internal icon in dashboard repolist

* swagger

* fix icon for normal repo on repo page

* don't expose owner visibility directly; provide internal in repo api

* fix icons for forks and mirrors

Co-authored-by: Lauris BH <lauris@nix.lv>
 2020-06-05 14:41:06 +03:00
赵智超
17f8de7a54
Fix to allow comment poster to edit or delete his own comments (#11671) 
* bug: fix comment update permision check

No the ui only allow poster to update or delet comment, which
is not reasonable and different with handle logic, this pr
change it to allow poster of comment do it

ref code:
e8955173a9/routers/repo/issue.go (L1636)

e8955173a9/routers/repo/issue.go (L1681)

fix #11663

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

* simplify code

* fix sign in

Co-authored-by: zeripath <art27@cantab.net>
Co-authored-by: Lauris BH <lauris@nix.lv>
 2020-06-05 13:10:10 +03:00
Cirno the Strongest
3ea5d864b9
Fix message wrapping on PR commit list (#11616) 
* Fix message wrapping on PR commit list

* Update templates/repo/commits_list_small.tmpl

Co-authored-by: silverwind <me@silverwind.io>
 2020-06-03 09:30:34 +01:00
赵智超
de0b2d4e32
bug: fix wrong poster message for code comment on Pull view (#11721) 
As title, maybe fix one of issue in #11705

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

Co-authored-by: techknowlogick <techknowlogick@gitea.io>
 2020-06-03 02:09:03 -04:00
Cirno the Strongest
8e035f81c0
Fix styling for commiter on diff view (#11715) 
* Fix styling for commiter on diff view

* Update options/locale/locale_en-US.ini

* Update templates/repo/commit_page.tmpl

Co-authored-by: silverwind <me@silverwind.io>

* Update templates/repo/commit_page.tmpl

Co-authored-by: silverwind <me@silverwind.io>

* Apply suggestions from code review

Co-authored-by: silverwind <me@silverwind.io>

Co-authored-by: silverwind <me@silverwind.io>
Co-authored-by: techknowlogick <techknowlogick@gitea.io>
 2020-06-02 22:40:08 -04:00
John Olheiser
a6fd2f23f7
Allow site admin to disable mirrors (#11740) 
* Allow site admin to disable mirrors

Signed-off-by: jolheiser <john.olheiser@gmail.com>

* No need to run through Safe

Signed-off-by: jolheiser <john.olheiser@gmail.com>

* Clarify only disabling NEW mirrors

Signed-off-by: jolheiser <john.olheiser@gmail.com>

* Apply suggestions from @guillep2k

Co-authored-by: guillep2k <18600385+guillep2k@users.noreply.github.com>

Co-authored-by: guillep2k <18600385+guillep2k@users.noreply.github.com>
 2020-06-02 21:21:38 -04:00
Cirno the Strongest
d0a18a1270
Show full GPG commit status on PR commit history (#11702) 
* Show full GPG commit status on PR commit history

* move shabox badge to separate template

* unnecessary $

Co-authored-by: zeripath <art27@cantab.net>
Co-authored-by: Lauris BH <lauris@nix.lv>
 2020-06-02 20:22:26 -04:00
Cirno the Strongest
75739d00cb
Fix styling for PR merge section when no checks (#11609) 
Makes styling consistent between two cases. Also removed unnecessary double border.
 2020-05-25 20:08:06 +01:00
Cirno the Strongest
f32bf902e7
Right-align status icon on pull request commit history (#11594) 
Co-authored-by: techknowlogick <techknowlogick@gitea.io>
 2020-05-25 09:51:13 -04:00
Cirno the Strongest
39b792f424
Do not show avatar for "{{user}} added X commits" (#11591) 
Co-authored-by: techknowlogick <techknowlogick@gitea.io>
 2020-05-24 16:26:03 -04:00
mrsdizzie
ae55dc7a6b
Fix images in wiki edit preview (#11546) 
Make sure wiki editor sets wiki to true so gitea renders it as a wiki page.

Also change the context data attr for edit form. This looks wrong but everywhere else in our code assumes the urlPrefix to be just the repo url when rendering and manually adds /wiki to the rendered url regardless.

Fixes #11540
 2020-05-24 11:41:33 +01:00
zeripath
814ca9ffea
Allow different HardBreaks settings for documents and comments (#11515) 
GH has different HardBreaks behaviour for markdown comments and documents.

Comments have hard breaks and documents have soft breaks - therefore Gitea's rendering will always be different from GH's if we only provide one setting.

Here we split the setting in to two - one for documents and one for comments and other things.

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

Changes to index.js as per @silverwind 
Co-authored-by: silverwind <me@silverwind.io>

Changes to docs as per @guillep2k 
Co-authored-by: guillep2k <18600385+guillep2k@users.noreply.github.com>
 2020-05-24 09:14:26 +01:00
Cirno the Strongest
ac3c467770
Fix styling and padding for commit list on PR view (#11588) 
* Fix styling and padding for commit list on PR view

* fix bold on author
 2020-05-24 01:05:20 +03:00
Cirno the Strongest
31df012968
Properly handle and return empty string for dangling commits in GetBranchName (#11587) 2020-05-23 20:49:48 +01:00
赵智超
0903b1ac8c
Add push commits history comment on PR time-line (#11167) 
* Add push commits history comment on PR time-line
* Add notify by email and ui of this comment type also

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

* Add migrations for IsForcePush
* fix wrong force-push judgement
* Apply suggestions from code review
* Remove commit number check
* add own notify fun
* fix some typo

Co-authored-by: guillep2k <18600385+guillep2k@users.noreply.github.com>

* fix lint

* fix style again, I forgot something before

* Change email notify way

* fix api

* add number check if It's force-push

* Add repo commit link fuction
remove unnecessary check
skip show push commits comment which not have commits alive

* Update issue_comment.go

* Apply suggestions from code review

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

* Apply suggestions from code review

* fix ui view

Co-authored-by: silverwind <me@silverwind.io>

* fix height

* remove unnecessary style define

* simplify GetBranchName

* Apply suggestions from code review

* save commit ids and isForce push by json
* simplify GetBranchName

* fix bug

Co-authored-by: guillep2k <18600385+guillep2k@users.noreply.github.com>
Co-authored-by: mrsdizzie <info@mrsdizzie.com>
Co-authored-by: Lauris BH <lauris@nix.lv>
Co-authored-by: silverwind <me@silverwind.io>
 2020-05-20 09:47:24 -03:00
Cirno the Strongest
ef5f176517
Fix .comment-code-cloud not being removed when cancelling new code comment (#11464) 2020-05-17 23:36:34 +03:00
Cirno the Strongest
17f652a91c
Increase width for authors on commit view (#11441) 
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-authored-by: zeripath <art27@cantab.net>
Co-authored-by: Lauris BH <lauris@nix.lv>
 2020-05-17 18:35:07 +03:00
mrsdizzie
b2b86ea870
Support view individual commit for wiki pages (#11415) 
Currently you can see a list of commit history for wiki pages but aren't able to view the commit diff itself. This adds the feature to view an individual commit to a wiki repo.

Closes #8999

Co-authored-by: Lauris BH <lauris@nix.lv>
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
 2020-05-16 19:38:40 +03:00
Cirno the Strongest
c483419184
Better styling for code review comment form (#11413) 
Co-authored-by: techknowlogick <techknowlogick@gitea.io>
 2020-05-15 18:54:18 -04:00
kolaente
c72a471215
Fix webhook template when validation errors occur (#11421) 
Signed-off-by: kolaente <k@knt.li>
 2020-05-15 22:02:46 +03:00
Sijmen Schoon
66a9ef9036
Fix ref links in issue overviews for tags (#8742) 
* Properly generate ref URLs

Tags used to not generate correct URLs (src/branch/tags/1.0.0 instead of
src/tags/1.0.0).

Also cleans up some code around it with the created helper functions.

* Fix formatting and create migration

* Add copyright head to utils_test

* Use a raw query for the ref migration

* Remove semicolon

* Quote column and table names in migration SQL

* Change || to CONCAT, since MSSQL does not support ||

* Make migration engine aware

* Add missing import

* Move ref EndName and URL to the issue service

* Fix tests

* Add test for commit refs

* Update issue.go

* Use the right command for building JavaScript bundles

* Prepare for merge

* Check for refs/* before prepending in migration

* Update services/issue/issue_test.go

* Update modules/git/utils_test.go

Co-authored-by: techknowlogick <techknowlogick@gitea.io>
Co-authored-by: techknowlogick <matti@mdranta.net>
 2020-05-14 18:55:43 -04:00
Sorien
1982194dc5
Prettify timeline 3 (#11139) 
* Fix timeline comments sections borders

* Fix files dropzone right alignment

* Update review comment form and controls

* Clear segment style from comment form tabs

* Remove segment class from pulls tab

* Fix Time Tracker - Add Time button border

* Fix buttons right alignment

* Markdown tab minimal height

* Fix DropZone hover effect

* Fix Lint + remove unused controls class

Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-authored-by: zeripath <art27@cantab.net>
 2020-05-14 15:15:21 -04:00
Cirno the Strongest
5df72ef7e7
Fix svg octicon-key placement (#11410) 2020-05-14 18:59:18 +01:00
silverwind
9249c810b8
Switch code editor to Monaco (#11366) 
* Switch code editor to Monaco

This switches out CodeMirror for Monaco which is based on the same code
base as VS code and should work pretty similar to it.

It does add a few async chunks, totalling around 10MB to our build. It
currently supports around 65 languages and in the default configuration,
each language would emit one ugly [number].js chunk, so I opted to
combine them all into a single file for now.

CodeMirror is still being used under the hood by SimpleMDE so it can not
be removed yet.

* inline editorconfig, fix diff, use for markdown, remove more dead code

* refactors, remove jquery usage

* use tab_width

* fix intellisense

* rename function for clarity

* misc tweaks, enable webpack progress display

* only use --progress on dev build

* remove useless borders in arc-green

* fix typo

* remove obsolete comment

* small refactor

* fix file creation and various refactors

* unset useTabStops too when no editorconfig

* small refactor

* disable webpack's [big] warnings

* remove useless await

* fix dark theme check

* rename chunk to 'monaco'

* add to .gitignore and delete webpack dest before build

* increase editor height

* support more editorconfig properties

* remove empty element filter

* rename

Co-authored-by: John Olheiser <john.olheiser@gmail.com>
 2020-05-14 19:06:01 +03:00
zeripath
ba40263fdd
Unfortunately go template if does not shortcut (#11392) 
Go template's `{{if ...}}` does not shortcut its tests therefore it is
possible to cause a NPE unless you separate ifs into two.

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

Co-authored-by: techknowlogick <techknowlogick@gitea.io>
 2020-05-12 17:01:27 -04:00
zeripath
aa29f1c2b9
Ensure search action button coalesced to adjacent input (#11385) 
Fomantic-ui's action button syntax requires that the button is
the next sibling of the input it is attached to and that they
are both children of a div.action.

Fix #11375

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

Co-authored-by: Lauris BH <lauris@nix.lv>
 2020-05-12 15:08:43 -04:00
zeripath
0198bbedc1
Allow compare page to look up base, head, own-fork, forkbase-of-head (#11327) 
* Allow compare page to look up base, head, own-fork, forkbase-of-head

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

* as per @guillep2k

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

* Update routers/repo/compare.go

* as per @guillep2k

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

* Rationalise the names a little

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

* Rationalise the names a little (2)

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

* Fix 500 with fork of fork

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

* Prevent 500 on compare different trees

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

* dotdotdot is perfectly valid in both usernames and repo names

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

* ensure we can set the head and base repos too

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

* ensure we can set the head and base repos too (2)

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

* fix lint

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

* only set headRepo == baseRepo if isSameRepo

Signed-off-by: Andrew Thornton <art27@cantab.net>
 2020-05-12 08:52:46 +03:00
L0veSunshine
866ce126ec
Split some words from template to improve translation. (#11221) 
* split some words from template

* split some words from template

* add " " to mustache expression

* split some words from template

Co-authored-by: zeripath <art27@cantab.net>
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
 2020-05-08 13:39:17 +01:00
Kyle Evans
38cd9ba47b
Allow unauthenticated users to compare (#11240) 
* routers: make /compare route available to unauthenticated users

Remove some bits of the compare interface if the user isn't signed in.
Notably, they don't need to see the "New Pull Request" button box nor the
hidden form that would fail to submit due to the POST request continuing to
require proper privileges.

Follow-up commits will improve the UI a bit around this, removing some
"Pull Request" verbiage in favor of "Compare."

* ui: home: show "compare" button for unauthenticated users

This change requires pulling in the BaseRepo unconditionally and
recording if the pull request is in-fact not allowed
(.PullRequestCtx.Allowed). If the user isn't allowed to create a pull
request, either because this isn't a fork or same-fork branch PRs aren't
allowed, then we'll name the button "Compare" instead of "Pull Request."

* ui: branch list: use the new Compare language when available

When viewing the branch listing as an unauthenticated user, you'll get
"Pull Request" buttons. use the new "Compare" verbiage instead, which
matches GitHub behavior when you can't issue a pull request from the
branches.

Co-authored-by: zeripath <art27@cantab.net>
Co-authored-by: guillep2k <18600385+guillep2k@users.noreply.github.com>
 2020-05-04 19:44:30 -03:00
Lunny Xiao
71e4c75a61
Fix bug about comment attachment (#11272) 2020-05-02 15:03:47 +01:00
zeripath
28f8308d47
Show pull request selection even when unrelated branches (#11239) 
Fix #10525

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

Co-authored-by: guillep2k <18600385+guillep2k@users.noreply.github.com>
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
 2020-05-02 16:06:01 +08:00