]> source.dussan.org Git - gitea.git/log
gitea.git
5 years agoFix an issue with some pages throwing 'not defined' js exceptions #7450 (#7453)
Gary Kim [Sat, 13 Jul 2019 14:51:44 +0000 (14:51 +0000)]
Fix an issue with some pages throwing 'not defined' js exceptions #7450 (#7453)

Fix an issue introduced by cc8e7dd355c9c625b895a1b633a3a7fa5016f718

Signed-off-by: Gary Kim <gary@garykim.dev>
5 years agofix Dropzone.js integration (#7445) (#7448)
silverwind [Fri, 12 Jul 2019 21:27:36 +0000 (23:27 +0200)]
fix Dropzone.js integration (#7445) (#7448)

5 years agobackport of #7393 - create class for inline positioned lists (#7439)
Cherrg [Fri, 12 Jul 2019 19:11:05 +0000 (21:11 +0200)]
backport of #7393 - create class for inline positioned lists (#7439)

see #7393
affects #6464

Signed-off-by: Michael Gnehr michael@gnehr.de
5 years agoDiff: Fix indentation on unhighlighted code (#7435) (#7443)
silverwind [Fri, 12 Jul 2019 16:17:54 +0000 (18:17 +0200)]
Diff: Fix indentation on unhighlighted code (#7435) (#7443)

There was a missing space before the `nohighlight` class which made the
previous class concatenate wrongly as `wrapnohighlight` in the template.

5 years agobackport #7425 - jquery 3 (#7442)
techknowlogick [Fri, 12 Jul 2019 15:20:17 +0000 (11:20 -0400)]
backport #7425 - jquery 3 (#7442)

5 years agoOnly show "New Pull Request" button if repo allows pulls (#7426) (#7432)
Gary Kim [Fri, 12 Jul 2019 04:35:07 +0000 (04:35 +0000)]
Only show "New Pull Request" button if repo allows pulls (#7426) (#7432)

Signed-off-by: Gary Kim <gary@garykim.dev>
5 years agoFix vendor (#7394) (#7396)
Lunny Xiao [Tue, 9 Jul 2019 08:34:53 +0000 (16:34 +0800)]
Fix vendor (#7394) (#7396)

5 years agoonly return head: null if source branch was deleted (#6705) (#7376)
quantonganh [Tue, 9 Jul 2019 02:35:14 +0000 (09:35 +0700)]
only return head: null if source branch was deleted (#6705) (#7376)

* only return head: null if source branch was deleted

* add URL into GetPullRequest

* TestPullRequest_APIFormat

* log error if it is not Err(Branch)NotExist

(cherry picked from commit ff85a6331e02338100e3799b5787bf8b686fe003)

5 years agobackport of #7385 - add missing template variable on organisation settings (#7386)
Cherrg [Mon, 8 Jul 2019 18:03:44 +0000 (20:03 +0200)]
backport of #7385 - add missing template variable on organisation settings (#7386)

affects #6755

Signed-off-by: Michael Gnehr <michael@gnehr.de>
5 years agobackport of #7380 (#7383)
Cherrg [Mon, 8 Jul 2019 15:50:33 +0000 (17:50 +0200)]
backport of #7380 (#7383)

fix post parameter - on issue list - unset assignee

Signed-off-by: Michael Gnehr <michael@gnehr.de>
5 years agoFix migration tests since #7 fixed (#7375) (#7381)
Lunny Xiao [Mon, 8 Jul 2019 15:04:46 +0000 (23:04 +0800)]
Fix migration tests since #7 fixed (#7375) (#7381)

* fix migration tests since #7 fixed

* fix test time

5 years ago1.9.0-RC1 changelog (#7367) v1.10.0-dev v1.9.0-rc1
techknowlogick [Sat, 6 Jul 2019 23:00:49 +0000 (19:00 -0400)]
1.9.0-RC1 changelog (#7367)

5 years ago[skip ci] Updated translations via Crowdin
GiteaBot [Sat, 6 Jul 2019 22:14:41 +0000 (22:14 +0000)]
[skip ci] Updated translations via Crowdin

5 years agoui - issue view - fix icon position (#7354)
Cherrg [Sat, 6 Jul 2019 22:03:00 +0000 (00:03 +0200)]
ui - issue view - fix icon position (#7354)

* issue view - fix icon position

- move style from template to css
- add bullets to: key, circle-slash, comment

Signed-off-by: Michael Gnehr <michael@gnehr.de>
* add border to symbols

Signed-off-by: Michael Gnehr <michael@gnehr.de>
* fix circle slash position

Signed-off-by: Michael Gnehr <michael@gnehr.de>
* fix top margin

Signed-off-by: Michael Gnehr <michael@gnehr.de>
* changed mixed space/tab indent to tabindent only

Signed-off-by: Michael Gnehr <michael@gnehr.de>
5 years agoui - cut timeline length with last element on issue view (#7355)
Cherrg [Sat, 6 Jul 2019 21:37:46 +0000 (23:37 +0200)]
ui - cut timeline length with last element on issue view (#7355)

* cut timeline length with last element on issue view

fix #7304

- lightly enlight dark theme issue timeline color

Signed-off-by: Michael Gnehr <michael@gnehr.de>
* remove new container

Signed-off-by: Michael Gnehr <michael@gnehr.de>
5 years agoFix typo in PR migration check (#7368)
mrsdizzie [Sat, 6 Jul 2019 20:32:15 +0000 (16:32 -0400)]
Fix typo in PR migration check (#7368)

5 years agoFix mirror sync not automatically sending webhook requests (#7366)
Drew [Sat, 6 Jul 2019 20:01:21 +0000 (16:01 -0400)]
Fix mirror sync not automatically sending webhook requests (#7366)

5 years agoMake captcha and password optional for external accounts (#6606)
AJ ONeal [Sat, 6 Jul 2019 19:48:02 +0000 (13:48 -0600)]
Make captcha and password optional for external accounts (#6606)

5 years agoDetect migrating batch size (#7353)
Lunny Xiao [Sat, 6 Jul 2019 19:24:50 +0000 (03:24 +0800)]
Detect migrating batch size (#7353)

* Make migrating batch size as configurable

* detect different table batch insert size and remove config item

* remove unrelated changes

5 years agorouters: do not leak secrets via timing side channel (#7364)
leonklingele [Sat, 6 Jul 2019 17:03:13 +0000 (19:03 +0200)]
routers: do not leak secrets via timing side channel (#7364)

* routers: do not leak secrets via timing side channel

* routers/repo: do not leak secrets via timing side channel

5 years agorouters/user: ensure that decryption of cookie actually suceeds (#7363)
leonklingele [Sat, 6 Jul 2019 15:47:09 +0000 (17:47 +0200)]
routers/user: ensure that decryption of cookie actually suceeds (#7363)

Previously, only the first return value of ctx.GetSuperSecureCookie
was used to check whether decryption of the auth cookie succeeded.
ctx.GetSuperSecureCookie also returns a second value, a boolean,
indicating success or not. That value should be checked first to
be on the safe side and not rely on internal logic of the encryption
and decryption blackbox.

5 years agoworkaround broken drone build (#7362)
Cherrg [Sat, 6 Jul 2019 15:16:43 +0000 (17:16 +0200)]
workaround broken drone build (#7362)

* workaround broken swagger

only master brach is not working, latest release seems to work

Signed-off-by: Michael Gnehr <michael@gnehr.de>
* make vendor

Signed-off-by: Michael Gnehr <michael@gnehr.de>
* Don't export GO111MODULE

* set go-swagger to fixed release version

mentioned here: https://github.com/go-gitea/gitea/pull/7362#discussion_r300831537

Signed-off-by: Michael Gnehr <michael@gnehr.de>
5 years agoupdate contributing to use recent version of drone cli (#7351)
techknowlogick [Wed, 3 Jul 2019 23:28:48 +0000 (19:28 -0400)]
update contributing to use recent version of drone cli (#7351)

fix #7350

5 years agofix api route (#7346)
Lunny Xiao [Wed, 3 Jul 2019 05:31:29 +0000 (13:31 +0800)]
fix api route (#7346)

5 years agoupdate dependencies and various tweaks (#7344)
silverwind [Tue, 2 Jul 2019 19:11:24 +0000 (21:11 +0200)]
update dependencies and various tweaks (#7344)

- ran `make npm-update`
- ran `make js`, fixed new lint issue
- ran `make css`, this added back some vendor prefixes
- added `engines` property to package.json to specify minimum required
  Node.js version
- added `private` property to package.json to prevent accidential
  publishing to npm

5 years agoDisplay Github support button (#7343)
Antoine GIRARD [Tue, 2 Jul 2019 10:06:25 +0000 (12:06 +0200)]
Display Github support button (#7343)

This need an option to be enabled on repo : https://help.github.com/en/articles/displaying-a-sponsor-button-in-your-repository

5 years agoUse commit graph files for listing pages (#7314)
Filip Navara [Tue, 2 Jul 2019 02:15:14 +0000 (04:15 +0200)]
Use commit graph files for listing pages (#7314)

* Experimental support for git commit graph files and bloom filter index

Signed-off-by: Filip Navara <filip.navara@gmail.com>
* Force vendor of commitgraph

Signed-off-by: Filip Navara <filip.navara@gmail.com>
* Remove bloom filter experiment and debug prints

* Remove old code for building commit graphs

* Remove unused function

* Remove mmap usage

* gofmt

* sort vendor/modules.txt

* Add copyright header and log commit-graph error

5 years agoFix bug conflict between SyncReleasesWithTags and InsertReleases (#7337)
Lunny Xiao [Mon, 1 Jul 2019 21:17:16 +0000 (05:17 +0800)]
Fix bug conflict between SyncReleasesWithTags and InsertReleases (#7337)

* fix bug conflict between SyncReleasesWithTags and InsertReleases

* fix tests

* fix fmt

5 years agomake dropTableColumns drop columns on sqlite and constraints on all (#6849)
zeripath [Mon, 1 Jul 2019 19:26:59 +0000 (20:26 +0100)]
make dropTableColumns drop columns on sqlite and constraints on all (#6849)

5 years agofix updated drone file (#7336)
techknowlogick [Mon, 1 Jul 2019 07:32:50 +0000 (03:32 -0400)]
fix updated drone file (#7336)

5 years agofix pull view ui merge section (#7335)
Lunny Xiao [Mon, 1 Jul 2019 04:08:43 +0000 (12:08 +0800)]
fix pull view ui merge section (#7335)

* fix pull view ui merge section

* fix tests

* fix tests

5 years agowrap long texts on user profile info (#7333)
Cherrg [Mon, 1 Jul 2019 01:56:26 +0000 (03:56 +0200)]
wrap long texts on user profile info (#7333)

fix #7255

discussed in PR #7254

Signed-off-by: Michael Gnehr <michael@gnehr.de>
5 years ago#6946 Run hooks on merge/edit and cope with protected branches (#6961)
zeripath [Mon, 1 Jul 2019 01:18:13 +0000 (02:18 +0100)]
#6946 Run hooks on merge/edit and cope with protected branches (#6961)

* Fix #6946 by checking PullRequest ID on pushing

* Ensure we have the owner name, the pr attributes and the the issue

* Fix TestSearchRepo by waiting till indexing is done

* Update integrations/repo_search_test.go

* changes as per @mrsdizzie

* missing comma

* Spelling mistake

* Fix full pushing environment

5 years agochore: update drone format to 1.0 (#6602)
Bo-Yi Wu [Sun, 30 Jun 2019 23:53:41 +0000 (07:53 +0800)]
chore: update drone format to 1.0 (#6602)

* chore: update drone format to 1.0

* Converted old drone config

Signed-off-by: konrad <konrad@kola-entertainments.de>
* Moved translations to seperate pipeline

Signed-off-by: konrad <konrad@kola-entertainments.de>
* Split the steps in multiple pipelines and add dependencies

Signed-off-by: konrad <konrad@kola-entertainments.de>
* format

Signed-off-by: konrad <konrad@kola-entertainments.de>
* Fixed step depenednecies

Signed-off-by: konrad <konrad@kola-entertainments.de>
* Fixed discord notify

Signed-off-by: konrad <konrad@kola-entertainments.de>
* Exclude translations and docs pipelines from prs

Signed-off-by: konrad <konrad@kola-entertainments.de>
* Fixed exclude prs

Signed-off-by: konrad <konrad@kola-entertainments.de>
* Fixed exclude prs

Signed-off-by: konrad <konrad@kola-entertainments.de>
* Moved releases to seperate pipeline

Signed-off-by: konrad <konrad@kola-entertainments.de>
* Re-trigger drone

Signed-off-by: konrad <konrad@kola-entertainments.de>
* Disable release step

Signed-off-by: konrad <konrad@kola-entertainments.de>
* Fixed depending step

Signed-off-by: konrad <konrad@kola-entertainments.de>
* Adopted dependencies

Signed-off-by: konrad <konrad@kola-entertainments.de>
* Changed pipeline conditions

Signed-off-by: konrad <konrad@kola-entertainments.de>
* Replaced pipeline conditions with triggers

Signed-off-by: konrad <konrad@kola-entertainments.de>
* Fixed coverage step

Signed-off-by: konrad <konrad@kola-entertainments.de>
* Import changes from #7331

Signed-off-by: konrad <konrad@kola-entertainments.de>
* Add comment for lowest go version

Signed-off-by: konrad <konrad@kola-entertainments.de>
* Exclude fetch-tags from prs

Signed-off-by: konrad <konrad@kola-entertainments.de>
* Re-added comment about no tags

Signed-off-by: konrad <konrad@kola-entertainments.de>
* Removed unneeded conditions

Signed-off-by: konrad <konrad@kola-entertainments.de>
* Moved release version and release latest to different pipelines

Signed-off-by: konrad <konrad@kola-entertainments.de>
* Fixed depending pipeline

Signed-off-by: konrad <konrad@kola-entertainments.de>
* Removed the conditions for all services

Signed-off-by: konrad <konrad@kola-entertainments.de>
5 years ago[skip ci] Updated translations via Crowdin
GiteaBot [Sun, 30 Jun 2019 21:20:34 +0000 (21:20 +0000)]
[skip ci] Updated translations via Crowdin

5 years ago1.8.3 release (#7332)
Alexandru Bucur [Sun, 30 Jun 2019 21:17:43 +0000 (00:17 +0300)]
1.8.3 release (#7332)

5 years ago[skip ci] Updated translations via Crowdin
GiteaBot [Sun, 30 Jun 2019 11:57:58 +0000 (11:57 +0000)]
[skip ci] Updated translations via Crowdin

5 years agofix topic bar to allow prefixes (#7325)
Cherrg [Sun, 30 Jun 2019 11:55:48 +0000 (13:55 +0200)]
fix topic bar to allow prefixes (#7325)

* - do not select if escape is pressed
- allow prefixes by adding current request content to result list
- remove html-tags before insert on page

fix #7126

Signed-off-by: Michael Gnehr <michael@gnehr.de>
* sort current query to top

Signed-off-by: Michael Gnehr <michael@gnehr.de>
* remove already added topics from dropdown list

Signed-off-by: Michael Gnehr <michael@gnehr.de>
* protoct against xss

thanks to @silverwind

Signed-off-by: Michael Gnehr <michael@gnehr.de>
5 years agoAdd commit statuses reports on pull request view (#6845)
Lunny Xiao [Sun, 30 Jun 2019 07:57:59 +0000 (15:57 +0800)]
Add commit statuses reports on pull request view (#6845)

* Add commit statuses reports on pull view

* Add some translations

* improve the UI

* fix fmt

* fix tests

* add a new test git repo to fix tests

* fix bug when headRepo or headBranch missing

* fix tests

* fix tests

* fix consistency

* fix tests

* fix tests

* change the test repo

* fix tests

* fix tests

* fix migration

* keep db size consistency

* fix translation

* change commit hash status table unique index

* remove unused table

* use char instead varchar

* make hashCommitStatusContext private

* split merge section with status check on pull view ui

* fix tests; fix arc-green theme on pull ui

5 years agoupdate mssql drive to last working version 20180314172330-6a30f4e59a44 (#7306)
Antoine GIRARD [Sun, 30 Jun 2019 03:28:17 +0000 (05:28 +0200)]
update mssql drive to last working version 20180314172330-6a30f4e59a44 (#7306)

5 years ago[skip ci] Updated translations via Crowdin
GiteaBot [Sat, 29 Jun 2019 20:52:06 +0000 (20:52 +0000)]
[skip ci] Updated translations via Crowdin

5 years agoFixes #7292 - API File Contents bug (#7301)
Richard Mahn [Sat, 29 Jun 2019 20:51:10 +0000 (16:51 -0400)]
Fixes #7292 - API File Contents bug (#7301)

5 years ago[skip ci] Updated translations via Crowdin
GiteaBot [Sat, 29 Jun 2019 15:22:08 +0000 (15:22 +0000)]
[skip ci] Updated translations via Crowdin

5 years agoFixes #7152 - Allow create/update/delete message to be empty, use default message...
Richard Mahn [Sat, 29 Jun 2019 15:19:24 +0000 (11:19 -0400)]
Fixes #7152 - Allow create/update/delete message to be empty, use default message (#7324)

* Fixes #7152 - Allow create/update/delete message to be empty, use default message

* Linting fix

* Fix to delete integration tests

5 years agoUse batch insert on migrating repository to make the process faster (#7050)
Lunny Xiao [Sat, 29 Jun 2019 13:38:22 +0000 (21:38 +0800)]
Use batch insert on migrating repository to make the process faster (#7050)

* Use batch insert on migrating repository to make the process faster

* fix lint

* fix tests

* fix comments

5 years ago[skip ci] Updated translations via Crowdin
GiteaBot [Sat, 29 Jun 2019 11:47:09 +0000 (11:47 +0000)]
[skip ci] Updated translations via Crowdin

5 years agoadd commitgraph support global default true when git version >= 2.18 (#7313)
Lunny Xiao [Sat, 29 Jun 2019 11:46:25 +0000 (19:46 +0800)]
add commitgraph support global default true when git version >= 2.18 (#7313)

5 years ago[skip ci] Updated translations via Crowdin
GiteaBot [Sat, 29 Jun 2019 10:45:07 +0000 (10:45 +0000)]
[skip ci] Updated translations via Crowdin

5 years agoFixes #7238 - Annotated tag commit ID incorrect (#7321)
Richard Mahn [Sat, 29 Jun 2019 10:44:17 +0000 (06:44 -0400)]
Fixes #7238 - Annotated tag commit ID incorrect (#7321)

* Fixes #7238 - Annotated tag commit ID incorrect

* Fixes #7238 - Annotated tag commit ID incorrect

5 years ago[skip ci] Updated translations via Crowdin
GiteaBot [Sat, 29 Jun 2019 09:19:47 +0000 (09:19 +0000)]
[skip ci] Updated translations via Crowdin

5 years agoFix 7303 - remove unnessesary buttons on archived repos (#7326)
Cherrg [Sat, 29 Jun 2019 09:18:49 +0000 (11:18 +0200)]
Fix 7303 - remove unnessesary buttons on archived repos (#7326)

* archived repo - remove
- open/close button on issue list
- assigne person on issue list

Signed-off-by: Michael Gnehr <michael@gnehr.de>
* archived repo - remove
- comment field on issue view
- lock/unlock issue conversation button from sidebar on issue view

Signed-off-by: Michael Gnehr <michael@gnehr.de>
* archived repo - add 'compare commits' button to pull request

+ remove new pull request button from compare view

as the route is still working, and there is no need to be hidden

Signed-off-by: Michael Gnehr <michael@gnehr.de>
5 years ago[skip ci] Updated translations via Crowdin
GiteaBot [Fri, 28 Jun 2019 21:18:16 +0000 (21:18 +0000)]
[skip ci] Updated translations via Crowdin

5 years agoDark theme fixes (#7319)
Cherrg [Fri, 28 Jun 2019 21:17:21 +0000 (23:17 +0200)]
Dark theme fixes (#7319)

* add dark theme for jquery xdsoft_datetimepicker

Signed-off-by: Michael Gnehr <michael@gnehr.de>
* add border to dark theme - not checked issue checkboxes

Signed-off-by: Michael Gnehr <michael@gnehr.de>
5 years agogitea own dark codemirror theme (#7317)
Cherrg [Fri, 28 Jun 2019 02:45:54 +0000 (04:45 +0200)]
gitea own dark codemirror theme (#7317)

* modify dark codemirror theme

fix #6573

Signed-off-by: Michael Gnehr <michael@gnehr.de>
* add selection color

Signed-off-by: Michael Gnehr <michael@gnehr.de>
5 years agoShow Pull Request button or status of latest PR in branch list (#6990)
Mario Lubenka [Thu, 27 Jun 2019 14:15:30 +0000 (16:15 +0200)]
Show Pull Request button or status of latest PR in branch list (#6990)

* Show Pull Request button or status of latest PR in branch list

Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com>
* Do not show pull request button on deleted branches

Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com>
* Do not show commit divergence on deleted branches

Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com>
* Use XORMs Get instead of limit

* Links pull request ID and use smaller labels for displaying the pull request status

Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com>
* Handle error when getting latest pull request

Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com>
* Indent template

Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com>
* Check error when loading issue

Signed-off-by: Mario Lubenka <mario.lubenka@googlemail.com>
5 years agoreplace lesshint with stylelint (#7305)
silverwind [Thu, 27 Jun 2019 06:36:37 +0000 (08:36 +0200)]
replace lesshint with stylelint (#7305)

New CSS linter which is much more powerfull than the previous one.
Configuration is default but I had to remove a few rules that were
throwing too many or weird errors.

More importantly, the linter will exit with code 1 on errors so now our
build will fail if the CSS linter fails which should eliminate linter
errors being introduced without notice.

5 years agofix extra newlines when copying from diff in Firefox (#7288)
silverwind [Wed, 26 Jun 2019 21:35:07 +0000 (23:35 +0200)]
fix extra newlines when copying from diff in Firefox (#7288)

* fix extra newlines when copying from diff

See https://bugzilla.mozilla.org/show_bug.cgi?id=1273836

Basically, the <pre><code> seems to add a forced newline that is not
possible to get rid of via CSS, so I replaced it with just a <code>.

Secondly, .lines-type-marker also forced a newline in the copied text,
but that was possible to get rid of via user-select.

Safari still has a extraneous newline in the copied text of unknown
origin, but this should not block stop this PR.

* simplify .line-type-marker

* fix selector

* remove erronous ^^^

* Fix empty split diff

* Fix arc-theme-green

* fix add comment

* ensure line-num is copied too

* Update templates/repo/diff/box.tmpl

Co-Authored-By: zeripath <art27@cantab.net>
* attempt to fix safari via removing <code>

* remove useless whitespace at the end of 'class'

* remove inter-tag whitespace for code <td>s

* more inter-tag removal

* final inter-tag removal

* attempt to fix empty line copy

* move and comment getLineContent

* fix golint

* make background grey for missing added code

5 years agoMonitor all git commands; move blame to git package and replace git as a variable...
Lunny Xiao [Wed, 26 Jun 2019 18:15:26 +0000 (02:15 +0800)]
Monitor all git commands; move blame to git package and replace git as a variable (#6864)

* monitor all git commands; move blame to git package and replace git as a variable

* use git command but not other commands

* fix build

* move exec.Command to git.NewCommand

* fix fmt

* remove unrelated changes

* remove unrelated changes

* refactor IsEmpty and add tests

* fix tests

* fix tests

* fix tests

* fix tests

* remove gitLogger

* fix fmt

* fix isEmpty

* fix lint

* fix tests

5 years agoShadow the password on cache and session config on admin panel (#7300)
Lunny Xiao [Wed, 26 Jun 2019 16:12:38 +0000 (00:12 +0800)]
Shadow the password on cache and session config on admin panel (#7300)

* shadow the password on cache and session config on admin panel

* add shadow password of mysql/postgres/couchbase

* fix log import

5 years agofix API link header (#7298)
Lunny Xiao [Wed, 26 Jun 2019 08:51:32 +0000 (16:51 +0800)]
fix API link header (#7298)

5 years agoMake diff line-marker non-selectable (#7279)
zeripath [Mon, 24 Jun 2019 20:23:52 +0000 (21:23 +0100)]
Make diff line-marker non-selectable (#7279)

* Make diff line-marker non-selectable
* Move to use data-* as per @mrsdizzie
* fix missing line nums
* Add a minimum-width to force right-align of the line num
* Move line-type-marker into separate column

5 years ago[docker] Add LFS_START_SERVER option to control git-lfs support (#7281)
Marat Radchenko [Mon, 24 Jun 2019 05:33:57 +0000 (08:33 +0300)]
[docker] Add LFS_START_SERVER option to control git-lfs support (#7281)

5 years agoFix error log when loading issues caused by a xorm bug (#7271)
Lunny Xiao [Sun, 23 Jun 2019 15:22:43 +0000 (23:22 +0800)]
Fix error log when loading issues caused by a xorm bug (#7271)

* fix error log when loading issues caused by a xorm bug

* upgrade packages

* fix fmt

* fix Consistency

* fix tests

5 years agoFix #732: Add LFS objects to base repository on merging (#7082)
zeripath [Sat, 22 Jun 2019 17:35:34 +0000 (18:35 +0100)]
Fix #732: Add LFS objects to base repository on merging  (#7082)

On merge we walk the merge history and ensure that all lfs objects pointed to in
the history are added to the base repository. This switches from relying on having git-lfs installed on the server, (and in fact .gitattributes being correctly installed.)

5 years agoDark theme markdown fixes (#7260)
Cherrg [Fri, 21 Jun 2019 13:27:47 +0000 (15:27 +0200)]
Dark theme markdown fixes (#7260)

* fix colors in dark theme - tables inside rendered markdown

Signed-off-by: Michael Gnehr <michael@gnehr.de>
* fix colors in dark theme - simpleMDE rendered preview

Signed-off-by: Michael Gnehr <michael@gnehr.de>
* Update public/less/themes/arc-green.less

remove scroll bar color, to add this globally on additional PR

Co-Authored-By: Lauris BH <lauris@nix.lv>
Signed-off-by: Michael Gnehr <michael@gnehr.de>
* add missing class name

Signed-off-by: Michael Gnehr <michael@gnehr.de>
5 years agoFix Submodule dection in subdir (#7275)
mrsdizzie [Fri, 21 Jun 2019 06:13:54 +0000 (02:13 -0400)]
Fix Submodule dection in subdir (#7275)

Include the directory in name when looking for matching Submodule from
.gitmodules file

Fixes #7262

5 years agoAlpine 3.10 (#7256)
techknowlogick [Thu, 20 Jun 2019 23:47:51 +0000 (19:47 -0400)]
Alpine 3.10 (#7256)

5 years agoadd .fa margin like .octicon (#7258)
Antoine GIRARD [Thu, 20 Jun 2019 07:16:01 +0000 (09:16 +0200)]
add .fa margin like .octicon (#7258)

5 years agoOnly check and config git on web subcommand but not others (#7236)
Lunny Xiao [Wed, 19 Jun 2019 16:53:37 +0000 (00:53 +0800)]
Only check and config git on web subcommand but not others (#7236)

* only check and config git on web subcommand but not others

* add Init in git tests

5 years agoadd 'npm' and 'npm-update' make targets and lockfile (#7246)
silverwind [Wed, 19 Jun 2019 02:59:47 +0000 (04:59 +0200)]
add 'npm' and 'npm-update' make targets and lockfile (#7246)

* add 'npm' and 'npm-update' make targets and lockfile

- `make npm` installs and updates node_modules, triggered automatically
   on `make css` and `make js` as it completes reasonably fast and
   ensures consistent modules.
- `make npm-update` updates all dependencies to their latest version,
   regenerates `node_modules` from scratch and updates
   `package-lock.json`. It uses npm modules `updates` written by yours
   truly to find the latest version of each dependency.

* add suggested make dependencies

* remove package-lock.json during npm-update

* regenerate package-lock.json

5 years agoupdate go-git to v4.12.0 - fixes #7248 (#7249)
techknowlogick [Wed, 19 Jun 2019 02:14:15 +0000 (22:14 -0400)]
update go-git to v4.12.0 - fixes #7248 (#7249)

5 years agofix hljs unintenionally highlighting commit links (#7244)
silverwind [Tue, 18 Jun 2019 22:31:31 +0000 (00:31 +0200)]
fix hljs unintenionally highlighting commit links (#7244)

* fix hljs unintenionally highlighting commit links

* fix unit tests

5 years agoadd self to MAINTAINERS (#7245)
silverwind [Tue, 18 Jun 2019 19:32:49 +0000 (21:32 +0200)]
add self to MAINTAINERS (#7245)

5 years agoFix migration panic when Head.User is not exist (#7226)
Lunny Xiao [Tue, 18 Jun 2019 16:15:39 +0000 (00:15 +0800)]
Fix migration panic when Head.User is not exist (#7226)

* fix migration panic when Head.User is not exist

* fix test

5 years agoUpdate css (#7240)
zeripath [Tue, 18 Jun 2019 14:17:00 +0000 (15:17 +0100)]
Update css (#7240)

Remove -o-tab-size selectors from tab-sze-1 css

5 years agoFix relref link in docs (#7233)
Antoine GIRARD [Tue, 18 Jun 2019 02:57:48 +0000 (04:57 +0200)]
Fix relref link in docs (#7233)

5 years agoAdd docs for `INTERNAL_TOKEN_URI` (#7234)
techknowlogick [Tue, 18 Jun 2019 02:52:03 +0000 (22:52 -0400)]
Add docs for `INTERNAL_TOKEN_URI` (#7234)

5 years agoChangelog 1.8.3 (#7230) (#7231)
John Olheiser [Mon, 17 Jun 2019 18:42:14 +0000 (13:42 -0500)]
Changelog 1.8.3 (#7230) (#7231)

* Changelog 1.8.3

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

Co-Authored-By: zeripath <art27@cantab.net>
5 years agoAdd CLI commands to manage LDAP authentication source (#6681)
ngourdon [Mon, 17 Jun 2019 18:32:20 +0000 (20:32 +0200)]
Add CLI commands to manage LDAP authentication source (#6681)

* add CLI commands to manage LDAP authentication source

* delete Gogs copyright

* remove unused return value of func parseLoginSource

* fix comment

Co-Authored-By: ngourdon <31291059+ngourdon@users.noreply.github.com>
* remove config flag already present in global flags

* remove config flag from ldap commands in docs

* remove config flag handling

5 years ago[skip ci] Updated translations via Crowdin
GiteaBot [Mon, 17 Jun 2019 17:36:28 +0000 (17:36 +0000)]
[skip ci] Updated translations via Crowdin

5 years agoUse certmanager provided TLSConfig for LetsEncrypt (#7229)
zeripath [Mon, 17 Jun 2019 17:33:55 +0000 (18:33 +0100)]
Use certmanager provided TLSConfig for LetsEncrypt (#7229)

5 years agoshow lfs config on admin panel (#7220)
Lunny Xiao [Sun, 16 Jun 2019 18:24:49 +0000 (02:24 +0800)]
show lfs config on admin panel (#7220)

5 years agoAdd missing description of label on API (#7159)
Lunny Xiao [Sun, 16 Jun 2019 12:39:52 +0000 (20:39 +0800)]
Add missing description of label on API (#7159)

* add missing description of label on API

* fix comment head

* fix swagger

5 years agoUse go method to calculate ssh key fingerprint (#7128)
Antoine GIRARD [Sun, 16 Jun 2019 07:50:46 +0000 (09:50 +0200)]
Use go method to calculate ssh key fingerprint (#7128)

* Use go method to calculate key fingerprint

* add gitea copyright

* use native go method only for built-in server

* refactor and add tests

* add gitea copyright

5 years agoAdd LastLogin to the User API (#7196)
zeripath [Sun, 16 Jun 2019 03:28:32 +0000 (04:28 +0100)]
Add LastLogin to the User API (#7196)

5 years agosetting: don't require same running user for internal SSH (like win platform) (#7215)
Antoine GIRARD [Sun, 16 Jun 2019 02:49:07 +0000 (04:49 +0200)]
setting: don't require same running user for internal SSH (like win platform) (#7215)

5 years agoOnly warn on errors in deleting LFS orphaned files during repo deletion (#7213)
zeripath [Sat, 15 Jun 2019 22:20:29 +0000 (23:20 +0100)]
Only warn on errors in deleting LFS orphaned files during repo deletion (#7213)

5 years agofix duplicated file on pull request conflicted files (#7211)
Lunny Xiao [Sat, 15 Jun 2019 14:22:26 +0000 (22:22 +0800)]
fix duplicated file on pull request conflicted files (#7211)

5 years agoAllow colon between fixing word and issue (#7207)
zeripath [Sat, 15 Jun 2019 04:00:32 +0000 (05:00 +0100)]
Allow colon between fixing word and issue (#7207)

* Allow colon between fixing word and issue

* update test

5 years agoUI: Fix overflow issues in repo (#7190)
silverwind [Fri, 14 Jun 2019 01:32:14 +0000 (03:32 +0200)]
UI: Fix overflow issues in repo (#7190)

- Fix layout overflow in repo file list.
- Fix invisible status icon in file view and commit list. In file view,
  the icon was moved to the left because I could not figure out a proper
  fix because of HTML tables.
- Added title attribute to commit messages.
- Fixed two CSS linter warnings in existing CSS.
- Fixed CI variable check in 'make css'.

Fixes: https://github.com/go-gitea/gitea/issues/7180
5 years agofix drone build bug (#7192)
Cherrg [Thu, 13 Jun 2019 04:23:45 +0000 (06:23 +0200)]
fix drone build bug (#7192)

5 years agoAPI error cleanup (#7186)
John Olheiser [Wed, 12 Jun 2019 21:07:24 +0000 (16:07 -0500)]
API error cleanup (#7186)

5 years agoAdd error for fork already existing (#7185)
John Olheiser [Wed, 12 Jun 2019 20:20:43 +0000 (15:20 -0500)]
Add error for fork already existing (#7185)

5 years agoAdd golangci (#6418)
kolaente [Wed, 12 Jun 2019 19:41:28 +0000 (21:41 +0200)]
Add golangci (#6418)

5 years agoFix database lock when use random repository fallback image (#7166)
Lunny Xiao [Wed, 12 Jun 2019 00:12:13 +0000 (08:12 +0800)]
Fix database lock when use random repository fallback image (#7166)

* fix database lock when use random repository fallback image

* remove unused function

5 years agoFixes diff on merged pull requests (#7171)
Mario Lubenka [Tue, 11 Jun 2019 23:32:08 +0000 (01:32 +0200)]
Fixes diff on merged pull requests (#7171)

5 years agoVarious fixes for issue mail notifications (#7165)
silverwind [Tue, 11 Jun 2019 19:27:38 +0000 (21:27 +0200)]
Various fixes for issue mail notifications (#7165)

- Send individual mails for actions and comments
- Send mail for new issues/prs without a comment
- Use correct sender for reopen/close actions
- Hopefully fixed all bugs related to missing mails

Fixes: https://github.com/go-gitea/gitea/issues/7124
Fixes: https://github.com/go-gitea/gitea/issues/5977
5 years agofix pusher name via ssh push (#7167)
Lunny Xiao [Tue, 11 Jun 2019 01:13:24 +0000 (09:13 +0800)]
fix pusher name via ssh push (#7167)

5 years agoRevert "make modules/structs as a spereate go mod (#7127)" (#7175)
Lunny Xiao [Mon, 10 Jun 2019 19:55:58 +0000 (03:55 +0800)]
Revert "make modules/structs as a spereate go mod (#7127)" (#7175)

This reverts commit 835b53fc259c82f38945a3e107a4eb51478967d5.

5 years agomake modules/structs as a spereate go mod (#7127)
Lunny Xiao [Mon, 10 Jun 2019 15:20:49 +0000 (23:20 +0800)]
make modules/structs as a spereate go mod (#7127)