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
643c85e9c8
routes/home: minor code improve
8 years ago
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.
8 years ago
Unknwon
dc10594d7b
repo: fix cannot fork repository ( #4572 )
...
Should not load attributes if repository not found in HasForkedRepo.
8 years ago
Unknwon
e02fac4968
repo: fix panic on pull request submit ( #4572 )
8 years ago
Unknwon
11b1498a6e
api/repo: load attributes when listing user repositories ( #4565 )
8 years ago
Unknwon
0e6a6bf880
Refactoring: remove sessionRelease()
...
XORM supports automatic roll back in session Close() already.
8 years ago
Unknwon
ab2197bc75
random: some code simplify
8 years ago
Unknwon
a887e475e3
repo: change action visibility when repository visibility changed ( #4414 )
8 years ago
Unknwon
3efc0d8681
repo: load base repository for loadAttributes
8 years ago
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
8 years ago
Unknwon
c69fa18434
repo: expose more fields to API format ( #4484 )
8 years ago
Unknwon
ce6e8ed8fe
models: remove redundant tags for primary keys
8 years ago
Unknwon
65277e47c5
api/repo: add Mirror field ( #4392 )
8 years ago
Unknwon
9e3c83372f
api/repo: improve migration error handling
8 years ago
Unknwon
90b9f7e08c
pkg/setting: rename {AppUrl, AppSubUrl} -> {AppURL, AppSubURL}
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
c07899701a
vendor: update github.com/gogits/git-module
8 years ago
Unknwon
ab42671c63
repo: handle git.ErrUnsupportedVersion error type
8 years ago
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.
8 years ago
Pablo Saavedra
496e07c1c9
models/repo: avoid duplicated results in SearchRepositoryByName ( #4344 )
8 years ago
Unknwon
674106c7b6
repo: cleanup some code
8 years ago
Unknwon
8196430f47
repo: allow private repository to have public wiki or issues
...
Relates to #649 and #2157
8 years ago
Unknwon
7a99e56893
repo: update size after fork, migrate and mirror sync ( #4336 )
8 years ago
Unknwon
3144be5c81
repo: remove legacy sanitizer for repository description
...
Related to #4329 .
8 years ago
Unknwon
fdc7cb565d
repo: fix unable to propose pull request from secondary fork ( #4324 )
8 years ago
Unknwon
66c1e6b0e8
user/settings: complete repositories panel ( #4312 )
8 years ago
Unknwon
beee6e03b1
error: move ErrRepoNotExist -> errors.RepoNotExist
8 years ago
Unknwon
cac7af2c78
explore: able list and search for private but accessible repositories ( #3088 )
8 years ago
Unknwon
171f97868d
repo: allow issues and wiki for bare repository ( #4104 )
8 years ago
Unknwon
bc630cc52b
repo/commit: able to config default commits page size ( #4230 )
...
Added config option '[ui.user] COMMITS_PAGING_NUM'.
8 years ago
Unknwon
96ae0129ef
models/repo: minor code style and comment fix ( #4273 )
8 years ago
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
8 years ago
Unknwon
bb19bb601e
repo: able to view size ( #1158 )
8 years ago
Unknwon
05dbd3f7d7
refactoring: experimental with models/errors package
8 years ago
Unknwon
b06f299748
webhook: add fork event
8 years ago
Unknwon
70072e2842
dashboard: add delete branch and tag news feeds
8 years ago
Unknwon
87f0ce793d
repo: able to perform initial commit on behave of actual user
8 years ago
Unknwon
cd15a17970
models/repo: delete protect branch options when delete repository
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
b78e03934d
models/access: hasAccess only need userID not user object
8 years ago
Unknwon
d21dc0da78
migrate: fix unexpected removal of repository when wiki is detected
8 years ago
Unknwon
c5b85f2733
models/repo: fix repository files weren't cleaned up ( #4167 )
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
40fbe7fa8e
models/repo: handle deletion on Windows ( #4152 )
8 years ago
Unknwon
0a2f87f941
cron: add repository archive cleanup ( #4061 )
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