Unknwon
75555585e8
models/pull: fix rebase merging no effect ( #5051 )
7 years ago
Unknwon
52ee796d6d
repo_branch: fix SQL builder ( #5054 )
7 years ago
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>
7 years ago
m2nlight
aa53d0978c
models: add ROW_FORMAT=DYNAMIC when creating table for supports mysql 5.6 ( #4913 )
...
* Add ROW_FORMAT=DYNAMIC when creating table for supports mysql 5.6 (fix #4894 )
* Update models.go
Rename NewEngine2 to NewEngineWithParams
* Rename NewEngine2 to NewEngineWithParams
Please update vendor when https://github.com/go-xorm/xorm/pull/798 closed.
* Update dialect_mysql.go
* Update dialect_mysql.go
* Update models.go
7 years ago
Unknwon
86d249eb16
migrations: remove unused function and fix compile error
7 years ago
Unknwon
1f7983059a
models: move ErrBranchNotExist to errors package
7 years ago
Wendell Sun
e4f187cd3d
models: bug fix for query protected branches ( #5054 )
...
Signed-off-by: Wendell Sun <iwendellsun@gmail.com>
7 years ago
Unknwon
dd245fe8bd
pull_request: fix changes not pushed to upstream if between two repositories ( #4890 )
7 years ago
m2nlight
f12c058b78
models: update mySQL charset=utf8mb4 ( #4880 )
...
* Add utf8mb4 to connStr for mysql. fix #4131
* Update models.go. charset=utf8mb4 for mysql.
charset=utf8mb4 for mysql.
7 years ago
m2nlight
67d67289c7
models: add utf8mb4 to connStr for mysql ( #4878 )
7 years ago
Unknwon
0f14b92bce
MISC: minor fixes in webhook
7 years ago
Unknwon
43d6ad5fda
pull: fix after commit ID is not latest commit in the base branch ( #4442 )
7 years ago
Unknwon
3b8b8a2ee3
pull_request: able to ignore whitespace when check conflict ( #4834 )
7 years ago
Unknwon
181dc5d75e
editor: remove out of sync branch before checkout again
...
If a branch was deleted from server, sometimes it is not reflected
on local copy. Therefore, we need to remove the branch with same
name if it is out of sync and then checkout to correct version.
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
af3911b833
MISC: update README and migration comment
7 years ago
Athurg Feng
52f3833811
Add Dingtalk webhook support ( #4773 )
...
* Add dingtalk webhook into html template
* Add Dingtalk's icon
* Insert dingtalk into repo's webhook page template
* Insert dingtalk into org's webhook page
* Add dingtalk into default webhook config
* Add locale string for add_dingtalk_hook_desc
* Update bindata
* Add dingtalk webhook form validator
* Add dingtalk hook task
* Add dingtalk hook create handler
* Add dingtalk hook edit handler
* Add dingtalk router
* Add dingtalk webhook task skeleton
* Add markdown link formatter
* Add Dingtalk ActionCard create wrapper
* Add support for dingtalk create event payload
* Add support for dingtalk delete event payload
* Add support for dingtalk fork event payload
* Add support for dingtalk push event payload
* Add support for dingtalk issue event payload
* Add support for dingtalk issue comment payload
* Add support for dingtalk pull event payload
* Add support for dingtalk release event payload
7 years ago
Sb
ab2c6cb008
models: fix #4692 and typo in comments ( #4695 )
7 years ago
Unknwon
6bc11c4450
hook: fix email not sent after push ( #4430 )
...
Turns out mail service was not initialized at all, also mail must
be sent in sync in hook mode before program exits.
8 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
13cca8a66a
models/comment: remove unused SQL parameter ( #4586 )
8 years ago
Unknwon
8ed2330d6e
issue_comment: fix pg syntax ambiguous ( #4586 )
...
Also handle error related to time parsing.
8 years ago
Andy Hochhaus
261237745f
api: fix ListIssueComments API ( #4587 )
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
23b83cb736
pkg/process: fix potential race condition
...
Following conditions were not protected:
1. Use and increase next pid
2. Append and remove process from the list
8 years ago
Unknwon
e16196124e
setting: disable SSH minimum key size check when not eligible ( #4507 )
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
无闻
51d7f1264b
api: GitHub compliance ( #4549 )
...
* Add undocumented endpoint for /repositories/:id
* GitHub API Compliance
8 years ago
Unknwon
6bb9c442b2
issue: fix updated_unix is not updated for new comments ( #4462 )
8 years ago
Unknwon
c69fa18434
repo: expose more fields to API format ( #4484 )
8 years ago
Pablo Saavedra
5906268917
models/org_team: getUserTeams uses includes always -1 in the IN statement ( #4412 )
...
Ensure that the IN clause contains one value at least. The idea is avoid a
syntax error in the SQL sentence and rollbacks in the transactions.
For example:
ERROR: syntax error at or near ")"
LINE 1: ...RE ... and team.id IN ();
We will always add the -1 value in the IN list.
8 years ago
Unknwon
4e87e62d5c
models/repo_collaboration: cannot change permissions of collaborators ( #4512 )
8 years ago
Unknwon
b17995a332
restore: reset table sequences for PostgreSQL ( #4357 )
8 years ago
Unknwon
ce6e8ed8fe
models: remove redundant tags for primary keys
8 years ago
Jon Lundy
1755025e7f
models/login_source: add check for user for create/update on LDAP ( #4405 )
...
* Add check for user for create/update
* Update login_source.go
* Update login_source.go
8 years ago
Gibheer
1a4ba4c390
models/ssh_key: don't run ssh-keygen check if disabled ( #4519 )
...
* don't load key when key size should not be checked
This makes it possible for users with incompatible ssh-keygen versions
to just disable the check completely without running into errors.
* add proper ed25519 constant
The x/crypto/ssh library has support for ed25519 now, so it is possible
to support it.
8 years ago
Unknwon
a11044f789
locale: sync from Crowdin
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
8d0417497b
modes/mirror: make Updated unchanged if no new commits fetched ( #4341 )
...
After sync mirror, get latest commit date and compare to current
repository updated time, only update it if the commit date is newer.
8 years ago
Unknwon
90b9f7e08c
pkg/setting: rename {AppUrl, AppSubUrl} -> {AppURL, AppSubURL}
8 years ago
Unknwon
0e271799f2
Refactoring: rename and simplify pkg/tool functions
8 years ago