Unknwon
1f7983059a
models: move ErrBranchNotExist to errors package
7 years ago
Unknwon
3b8b8a2ee3
pull_request: able to ignore whitespace when check conflict ( #4834 )
7 years ago
Unknwon
34c2e52bd5
repo/pull: allow rebase before merging ( #4805 )
7 years ago
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 ).
7 years ago
Unknwon
ab2197bc75
random: some code simplify
8 years ago
Unknwon
4400d2fdd9
Refactoring: rename package routers -> routes
8 years ago
Unknwon
2478b87432
Refactoring: rename ctx -> c
8 years ago
Unknwon
90b9f7e08c
pkg/setting: rename {AppUrl, AppSubUrl} -> {AppURL, AppSubURL}
8 years ago
Unknwon
edaf14f2b6
Refactoring: remove tool.TplName
8 years ago
Unknwon
6fbb984ebf
Refactoring: rename pkg/base -> pkg/tool
8 years ago
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
8 years ago
Unknwon
ab42671c63
repo: handle git.ErrUnsupportedVersion error type
8 years ago
Unknwon
73de9f9d6a
repo/settings/branches: add prompt for bare repository
8 years ago
Unknwon
8196430f47
repo: allow private repository to have public wiki or issues
...
Relates to #649 and #2157
8 years ago
Unknwon
7c802f6d83
repo/setting: filter out deleted branch in protect list ( #4288 )
8 years ago
Unknwon
0ccd7c97ab
models: rename ErrUserNotExist -> errors.UserNotExist
8 years ago
Unknwon
e1dcd11051
repo/settings: improve Git hook editor
8 years ago
Unknwon
6c3424dc3f
repo/setting: fix admin cannot transfer organizational repository
8 years ago
Unknwon
d1f0bc48ce
repo/setting: fix admin cannot delete organizational repository wiki
8 years ago
Unknwon
4f9c5981a9
refactoring: modules/auth/*_form.go -> modules/form
8 years ago
Unknwon
10b93efc4a
repo: able to add organization member as repository collaborator
8 years ago
Unknwon
0696d430c9
protect_branch: only list teams have write access
...
List teams without write access to the repository cause confusion
to make users think members of team could push to the branch.
8 years ago
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.
8 years ago
Unknwon
162504e90c
repo/setting: fix admin cannot delete organizational repository
8 years ago
Unknwon
7de71333c6
repo: several minor improvements
...
1. Fix sample content didn't show up when hook doesn't exist.
2. Fix CSS 'word-break' to use 'break-word' not 'break-all'.
3. Fix single quote in 'locale_en-US.ini' file.
8 years ago
Unknwon
266586e866
repo: assignee can be anyone who has read access ( #3739 )
8 years ago
Unknwon
7e09d210ba
Initial version of protected branches ( #776 )
...
- Able to restrict force push and deletion
- Able to restrict direct push
8 years ago
Unknwon
9b8fa69c15
models/ssh_key: fix SSH_KEYGEN_PATH not working ( #3770 )
8 years ago
Unknwon
eb66060cd7
log: start using gopkg.in/clog.v1
8 years ago
Rémy Boulanouar
be3a13a0d6
Allow use to set an external tracker url and to redirect user when clicking in Issues same behavior as Wiki. ( #3646 )
8 years ago
Unknwon
4bc98f7aa2
Move models/mail.go to modules/mail.go
...
To use interface to replace *models.User in avoiding cycle import.
8 years ago
Unknwon
8516dfcb6c
#2018 able to sync now for mirrors
...
- Refactor code to use sync.UniqueQueue
- Closes #3509
8 years ago
Andrew
0885784f13
Wiki mirroring implementation ( #3233 )
...
* Implement wiki mirroring, add Update mirrors operation to admin dashboard
* bindata.go update after merge
* Implement checking Git repo endpoint existence, support for BB included
* Remove admin dashboard operation
Fix bindata.go
* Apply gofmt to repo model file
* Try to remove bindata from PR
* Revert accepted wiki names change in favor of better system
* Remove unused imports
9 years ago
Unknwon
1f2e173a74
Refactor User.Id to User.ID
9 years ago
lstahlman
25b3836418
Refresh repository mirror from database when the repository's name has changed. ( #3276 )
9 years ago
Unknwon
f1b8d52eb3
#2854 fix no mail notification when issue is closed/reopened
9 years ago
Unknwon
7ca5f8f119
models/repo: remove redundant info for some repo methods
...
RepoLink -> Link, RepoRelLink -> RelLink, FullRepoLink -> FullLink
9 years ago
Pablo Saavedra
98b152030d
The pruning for the synchronized mirrors is a option now. Default value: enable_prune = true ( #3246 )
...
Executed go fmt
getEngine() not handles DB parameters (#2972 ) (#2974 )
Uses .AllCols() for Update in updateMirror()
Spanish traslation removed
Fixed a wrong way to ommit the --prune option in process.ExecDir() for MirrorUpdate function
9 years ago
Cosmin Stroe
ba314a7a36
Support alphanumeric issue style (ABC-1234) for external issue tracker ( #2992 )
9 years ago
Unknwon
514382e2eb
Rename module: middleware -> context
9 years ago
Unknwon
a5b0400be7
#1146 finish new access rights for collaborators
9 years ago
Unknwon
045f14fbd0
#1146 finsih UI work for access mode of collaborators
...
Collaborators have write access as default, and can be changed via repository
collaboration settings page to change between read, write and admin.
9 years ago
Unknwon
260723e2cc
Minor fixes for #2745
9 years ago
Josh Frye
f3358f5927
Repo setting to delete and disable wiki
9 years ago
Unknwon
7140dbac95
Fix #857
9 years ago
Unknwon
632c27802c
Minor fix for #2624
9 years ago
Martin Hartkorn
bb595666ac
Moved UpdateRepository() to CleanUpMigrateInfo() and correctly delete mirror from database
9 years ago
Martin Hartkorn
15d37b7a95
Refactored according to suggestions
9 years ago
Martin Hartkorn
15394f613f
Add missing safety check
9 years ago
Martin Hartkorn
3650bd8528
Convert mirrors to regular repositories.
9 years ago