Commit Graph

521 Commits (53c8e4263b71d20e8decfcc7a6970e3497473bec)

Author SHA1 Message Date
Unknwon 53c8e4263b
models: skip JSON for fields skipped by XORM
Reduce output JSON size by backup command
2018-06-09 16:06:47 +08:00
Unknwon 775919c129
mirror: show sync feeds on dashboard (#2017) 2018-05-30 21:26:03 +08:00
Unknwon aff4208244
*: rename "gogits" to "gogs" 2018-05-27 08:53:48 +08:00
Lauris BH eccc8109c1 security: fix path cleanup for repository init and editor (#5207)
Reported by Kacper Szurek https://security.szurek.pl/.
2018-05-08 14:32:49 -04:00
Dennis Chen f0bbcef3a4 api: fix nil pointer dereference on repo/forks (#4633)
Sets BaseRepo value for each resulting fork in GetForks().
Finds correct permissions for parent repository in APIFormat().

The output JSON is a little redundant, perhaps we should offer a
different view of the api.Repository without the Parent attribute?

Signed-off-by: Dennis Chen <barracks510@gmail.com>
2018-03-12 15:03:51 -04:00
Unknwon 3b8b8a2ee3
pull_request: able to ignore whitespace when check conflict (#4834) 2017-11-16 22:22:38 -05:00
Unknwon 34c2e52bd5
repo/pull: allow rebase before merging (#4805) 2017-11-15 23:28:31 -05:00
mharinder 5cd1fdeb9e
pull: add an option to use rebase for merging pull requests
For DVCS, either merge or rebase works for getting new code in a pull
request in the main branch.

The rebase workflow produces a linear history which is cleaner, and
more bisect-able.

This commit adds a repo-level option to enable the rebase workflow. Once
enabled, "Merge Pull Request" will be replaced by
"Rebase and Merge Pull Request" which does exactly what the user wants.
It's unlikely a project wants a mixed-use of both rebase and merge
workflows, therefore the feature is not implemented as a drop-down
button like what GitHub does
(https://github.com/blog/2243-rebase-and-merge-pull-requests).
2017-11-15 23:28:23 -05:00
Unknwon 643c85e9c8
routes/home: minor code improve 2017-07-18 22:09:57 -04:00
Unknwon ee9950ec2f
explore: fix total repository number and page number do not match (#4441)
Because in the final repository list we use Distinct to remove
duplicates, but didn't do so when count total number of repositories.
2017-07-18 22:07:40 -04:00
Unknwon dc10594d7b
repo: fix cannot fork repository (#4572)
Should not load attributes if repository not found in HasForkedRepo.
2017-07-18 12:56:23 -04:00
Unknwon e02fac4968
repo: fix panic on pull request submit (#4572) 2017-07-14 18:51:23 -04:00
Unknwon 11b1498a6e
api/repo: load attributes when listing user repositories (#4565) 2017-06-21 17:41:18 -04:00
Unknwon 0e6a6bf880
Refactoring: remove sessionRelease()
XORM supports automatic roll back in session Close() already.
2017-06-11 03:06:36 -04:00
Unknwon ab2197bc75
random: some code simplify 2017-06-11 00:56:31 -04:00
Unknwon a887e475e3
repo: change action visibility when repository visibility changed (#4414) 2017-06-11 00:43:56 -04:00
Unknwon 3efc0d8681
repo: load base repository for loadAttributes 2017-06-08 16:18:04 -04:00
Simon Dann e9a2b72ddb models/repo: modify keyword search to include description for #4287 (#4548)
* Modified repository keyword search to include description for #4287

* Replacing Where with And for #4548
2017-06-06 06:23:42 -04:00
Unknwon c69fa18434
repo: expose more fields to API format (#4484) 2017-06-02 14:26:34 -04:00
Unknwon ce6e8ed8fe
models: remove redundant tags for primary keys 2017-05-21 04:36:41 -04:00
Unknwon 65277e47c5
api/repo: add Mirror field (#4392) 2017-04-07 18:15:23 -04:00
Unknwon 9e3c83372f
api/repo: improve migration error handling 2017-04-07 16:00:25 -04:00
Unknwon 90b9f7e08c
pkg/setting: rename {AppUrl, AppSubUrl} -> {AppURL, AppSubURL} 2017-04-06 17:27:57 -04:00
Unknwon d05395fe90
Refactoring: rename modules -> pkg
Reasons to change:

1. Shorter than 'modules'
2. More generally used by other Go projects
3. Corresponds to the naming of '$GOPATH/pkg' directory
2017-04-04 19:29:59 -04:00
Unknwon c07899701a
vendor: update github.com/gogits/git-module 2017-04-03 15:09:53 -04:00
Unknwon ab42671c63
repo: handle git.ErrUnsupportedVersion error type 2017-04-01 17:56:55 -04:00
Unknwon c1c269d9ef
modules: rename markdown -> markup
To further support more markup languages (e.g. Org-mode, AsciiDoc,
reStructuredText), the name 'markdown' is inappropriate.

This is the first step towards more markup language support.
2017-03-31 15:29:43 -04:00
Pablo Saavedra 496e07c1c9 models/repo: avoid duplicated results in SearchRepositoryByName (#4344) 2017-03-26 23:23:17 -04:00
Unknwon 674106c7b6
repo: cleanup some code 2017-03-24 16:32:14 -04:00
Unknwon 8196430f47
repo: allow private repository to have public wiki or issues
Relates to #649 and #2157
2017-03-24 16:25:40 -04:00
Unknwon 7a99e56893
repo: update size after fork, migrate and mirror sync (#4336) 2017-03-24 14:22:19 -04:00
Unknwon 3144be5c81
repo: remove legacy sanitizer for repository description
Related to #4329.
2017-03-23 20:23:23 -04:00
Unknwon fdc7cb565d
repo: fix unable to propose pull request from secondary fork (#4324) 2017-03-23 20:04:20 -04:00
Unknwon 66c1e6b0e8
user/settings: complete repositories panel (#4312) 2017-03-23 14:28:31 -04:00
Unknwon beee6e03b1
error: move ErrRepoNotExist -> errors.RepoNotExist 2017-03-23 14:27:34 -04:00
Unknwon cac7af2c78
explore: able list and search for private but accessible repositories (#3088) 2017-03-17 19:17:40 -04:00
Unknwon 171f97868d
repo: allow issues and wiki for bare repository (#4104) 2017-03-16 23:10:45 -04:00
Unknwon bc630cc52b
repo/commit: able to config default commits page size (#4230)
Added config option '[ui.user] COMMITS_PAGING_NUM'.
2017-03-16 22:28:32 -04:00
Unknwon 96ae0129ef
models/repo: minor code style and comment fix (#4273) 2017-03-13 00:53:50 -04:00
Rob Richards aaadc61ee8 models/repo: allow SearchRepos to return private but accessible repositories (#4273)
* models/repo.go SearchRepositoryByName()
Updated function to return public and private repositories that the logged in user has been given rights to view
issue #3088

* models/repo.go SearchRepositoryName
changed repository table alias to 'repo'
removed debug line

* models/repo.go SearchRepositoryByName
modified UserID search query to use the "access" table instead of team_repo, team_user etc

* models/repo.go SearchRepositoryByName
1) uppercased SQL keywords
2) removed alias for ACCESS table
2017-03-13 00:37:12 -04:00
Unknwon bb19bb601e
repo: able to view size (#1158) 2017-03-12 01:59:48 -05:00
Unknwon 05dbd3f7d7
refactoring: experimental with models/errors package 2017-03-12 00:47:34 -05:00
Unknwon b06f299748
webhook: add fork event 2017-02-27 22:48:18 -05:00
Unknwon 70072e2842
dashboard: add delete branch and tag news feeds 2017-02-27 22:47:33 -05:00
Unknwon 87f0ce793d
repo: able to perform initial commit on behave of actual user 2017-02-27 22:47:12 -05:00
Unknwon cd15a17970
models/repo: delete protect branch options when delete repository 2017-02-23 18:42:03 -05:00
Unknwon 6072e9a52c
repo: add protect branch whitelist (#4177)
Add options to add users and teams to whitelist of a protected
branch. This is only available for organizational repositories.
2017-02-23 18:25:12 -05:00
Unknwon b78e03934d
models/access: hasAccess only need userID not user object 2017-02-23 16:15:25 -05:00
Unknwon d21dc0da78
migrate: fix unexpected removal of repository when wiki is detected 2017-02-21 22:00:45 -05:00
Unknwon c5b85f2733
models/repo: fix repository files weren't cleaned up (#4167) 2017-02-21 11:12:46 -05:00