aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Pull request conflict files detection (#5951)Lunny Xiao2019-02-054-5/+45
| | | | | | | | | | * add conflict detection * test pull request conflict files * fix detection files number * fix comments
* [skip ci] Updated translations via CrowdinGiteaBot2019-02-052-0/+2
|
* Automatically clear stopwatch on merging a PR (#4327)Lanre Adelowo2019-02-056-2/+49
| | | | | | | | | | | | | | | | | | | | * Don't display buttons if there are no notices * clear stopwatch on merging a PR * remove redundant gt check * use ctx.Flash as per @bkcsoft comment * stop timer on closing issues/PRs too * updated translation as per review * redirect to login page after successfully activating account * remove unrelated changes * stop timer for issues that are closed via commits too..Not just the 'close' UI button
* [skip ci] Updated translations via CrowdinGiteaBot2019-02-042-0/+5
|
* Add label names as filter in issue search api (#5946)Lanre Adelowo2019-02-044-2/+59
|
* [skip ci] Updated translations via CrowdinGiteaBot2019-02-0413-13/+0
|
* Issue 5924 fix compare button (#5929)zeripath2019-02-033-5/+5
| | | | | | | | | | | | * Revert #5877 This unfortunately was not the solution. Signed-off-by: Andrew Thornton <art27@cantab.net> * Change permission check to create pull requests to CanReadIssuesOrPulls Signed-off-by: Andrew Thornton <art27@cantab.net>
* Fix ssh deploy and user key constraints (#1357) (#5939)zeripath2019-02-0314-342/+694
| | | | | | | | | | | | | | | | 1. A key can either be an ssh user key or a deploy key. It cannot be both. 2. If a key is a user key - it can only be associated with one user. 3. If a key is a deploy key - it can be used in multiple repositories and the permissions it has on those repositories can be different. 4. If a repository is deleted, its deploy keys must be deleted too. We currently don't enforce any of this and multiple repositories access with different permissions doesn't work at all. This PR enforces the following constraints: - [x] You should not be able to add the same user key as another user - [x] You should not be able to add a ssh user key which is being used as a deploy key - [x] You should not be able to add a ssh deploy key which is being used as a user key - [x] If you add an ssh deploy key to another repository you should be able to use it in different modes without losing the ability to use it in the other mode. - [x] If you delete a repository you must delete all its deploy keys. Fix #1357
* show user who created the repository instead of the organization in action ↵Lanre Adelowo2019-02-041-2/+2
| | | | feed (#5948)
* handle milestone events for issues and PR (#5947)Lanre Adelowo2019-02-031-0/+8
|
* Fix notifications on pushing with deploy keys by setting hook environment ↵zeripath2019-02-032-0/+166
| | | | | | | | | | | | | variables (#5935) The gitea prerecieve and postrecieve hooks and the gitea PushUpdate function require that the PusherID and PusherName are real users. Previously, these environment variables were not being set when using a deploy key - the main result being that pushing to empty repositories meant that is_empty status was not changed. I've also added an integration test to ensure that the is_empty status is updated on pushing with a deploy key. There is a slight issue in that the deploy key is now considered a proxy for the owner - we don't have a way of separating out the deploy key from the owner at present. This can be fixed in another PR. Fix #3795 Signed-off-by: Andrew Thornton art27@cantab.net
* Fix #5866: Silence console logger in gitea serv (#5887)zeripath2019-02-031-0/+1
| | | | | | | By default, if `setting.NewContext()` prints out any warning logs, these are printed to the stdout breaking `git receive-pack` etc. meaning that even if there is a warning because of a minor problem in your app.ini but gitea starts despite this - you **CANNOT** push or pull over SSH. This PR disables the console logger whilst in `serv.go` Signed-off-by: Andrew Thornton <art27@cantab.net>
* Remove all CommitStatus when a repo is deleted (#5940)John Olheiser2019-02-021-0/+1
| | | Signed-off-by: jolheiser <john.olheiser@gmail.com>
* Add single commit API support (#5843)Lunny Xiao2019-02-0210-11/+389
| | | | * add single commit API support
* Make log mailer for testing (#5893)zeripath2019-02-028-12/+60
| | | | | | | | | | | | | | | | | | * Create log mailer for testing email settings Signed-off-by: Andrew Thornton <art27@cantab.net> * Switch on the log mailer for the integration tests This ensures that the sending mail process works Signed-off-by: Andrew Thornton <art27@cantab.net> * rename the from user for mysql/mssql * rename log sender to dummy sender * update the integration tests
* fix log output (#5938)Sergey Romanov2019-02-021-1/+1
|
* Fix wrapping long code lines in UI (#5927)silverwind2019-02-025-25/+11
| | | | | | | | | | | | | Wrapping was initially added in https://github.com/go-gitea/gitea/pull/2789 but it is currently disabled because the rule that applies wrapping to the wrap class did not have enough CSS specificity. Resolved the issue by using a general selector that matches all code boxes. The previous wrap class was removed because it had only been inconsistenly applied to various code boxes and because I found no easy way to add classes to code boxes rendered in Markdown. Also removed a seemingly useless :before on code view and added padding to restore the spacing.
* UI: Better support for long repo names (#5932)silverwind2019-02-022-4/+4
| | | | | | * UI: Make long repo names wrap less often * also adjust news feed column widths
* support reviewing on a deleted file path (#5880)Lanre Adelowo2019-02-011-2/+3
|
* 1.7.1 changelog (#5919)techknowlogick2019-01-311-0/+21
|
* Disable redirect for i18n (#5910)techknowlogick2019-01-311-1/+1
|
* [skip ci] Updated translations via CrowdinGiteaBot2019-01-311-1/+1
|
* Fix bug when read public repo lfs file (#5912)Lunny Xiao2019-01-311-2/+5
| | | | | | * fix bug when read public repo lfs file * add comment on lfs permission check
* Recover panic in orgmode.Render if bad orgfile (#4982) (#5903)zeripath2019-01-301-4/+10
| | | | | | | This PR protects against the panic referred to in chaseadmsio/goorgeous#82 by recovering from the panic and just returning the raw bytes if there is an error. Signed-off-by: Andrew Thornton <art27@cantab.net>
* Provide better panic handling (#5902)zeripath2019-01-304-2/+118
| | | | | | | This PR gitea'ises the macaron.Recovery() handler meaning that in the event of panic we get proper gitea 500 pages and the stacktrace is logged with the gitea logger. Signed-off-by: Andrew Thornton <art27@cantab.net>
* Only allow local login if password is non-empty (#5906)zeripath2019-01-302-2/+2
|
* Fix go-get URL generation (#5905)Lauris BH2019-01-303-3/+5
|
* don't allow pull requests to be created on an archived repository (#5883)Lanre Adelowo2019-01-303-8/+15
| | | | | | * don't allow pull requests to be created on an archived repository Also disable the "PR" button if the repo is archived * Refuse creating an issue/PR via API calls too
* Don't discard the value of DISABLE_REGULAR_ORG_CREATION (#5886)Lanre Adelowo2019-01-302-0/+45
| | | | | * Consider the configuration value of DISABLE_REGULAR_ORG_CREATION when creating a user
* respect value of REQUIRE_SIGNIN_VIEW (#5901)Lanre Adelowo2019-01-301-1/+1
|
* Fix new release creation API to allow empty target (#5870)Lauris BH2019-01-3011-348/+168
| | | | | | | | * Fix new release creation API to allow empty target * Add more test cases * Update swagger
* if repo does not exist, show a 404 not a 500 (#5900)Lanre Adelowo2019-01-301-1/+4
|
* UI: Correct footer height if screen-width is to small (fixes #5878) (#5889) ↵EpicCoder2019-01-293-8/+10
| | | | (#5889)
* fix compare button on upstream repo leading to 404 (#5877)Lanre Adelowo2019-01-291-2/+2
|
* UI: Change GPG Validation colors and remove inline CSS; fixes #5404 (#5896)EpicCoder2019-01-295-8/+23
|
* Also ensure the repo is loaded (#5895)zeripath2019-01-291-0/+4
| | | Signed-off-by: Andrew Thornton <art27@cantab.net>
* [skip ci] Updated translations via CrowdinGiteaBot2019-01-293-0/+20
|
* Ensure issue.Poster is loaded in mailIssueCommentToParticipants (#5891)zeripath2019-01-291-2/+2
| | | | | | Previous code could potentially dereference nil - this PR ensures that the poster is loaded before dereferencing it. Signed-off-by: Andrew Thornton <art27@cantab.net>
* Add migration test (#5773)zeripath2019-01-2812-1/+277
| | | | | | | | | | | | | | * Add migration test This commit adds a simple migration test for v1.5.3, v1.6.4 and v1.7.0-rc3 Signed-off-by: Andrew Thornton <art27@cantab.net> * Automigrate based on available dbs * remove old ini file * Standardise the dialect names
* [skip ci] Updated translations via CrowdinGiteaBot2019-01-287-7/+1
|
* Fix wrong URL to download link. (#5881)vee w2019-01-281-3/+3
| | | | | | | | * Fix wrong URL to download link. The link does not contain trailing slash and cause error page displayed. * Update version
* New Issue ?body= query (#5851)kekero2019-01-283-2/+7
| | | | | | | | * New Issue ?body= query * Override issue template with body query * Add documentation for issue body query
* Fix "pulls.blocked_by_approvals" text (#5879)Lanre Adelowo2019-01-281-1/+1
|
* [skip ci] Updated translations via CrowdinGiteaBot2019-01-284-0/+89
|
* API: Fix null pointer in attempt to Sudo if not logged in (#5872)zeripath2019-01-281-1/+1
| | | Signed-off-by: Andrew Thornton <art27@cantab.net>
* Revert #3711 overwrite of only show "No Description" to repo admins #2167 ↵Gabriel Silva Simões2019-01-272-1/+21
| | | | | (#5836) Revert #3711 overwrite of only show "No Description" to repo admins #2167 and add tests to prevent accidental overwrite again.
* Fix wording of #5858 issue.review.reject string (#5869)zeripath2019-01-271-1/+1
| | | | | As per @lafriks comment this should be: requested changes Signed-off-by: Andrew Thornton <art27@cantab.net>
* [skip ci] Updated translations via CrowdinGiteaBot2019-01-271-0/+8
|
* Fix an error while adding a dependency via UI. (#5862)Harshit Bansal2019-01-272-2/+3
| | | Fixes: #5783
* [skip ci] Updated translations via CrowdinGiteaBot2019-01-2711-20/+18
|