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
af3911b833
MISC: update README and migration comment
2017-10-22 19:29:29 -04:00
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
2017-09-21 14:32:48 -04:00
Sb
ab2c6cb008
models: fix #4692 and typo in comments ( #4695 )
2017-08-13 02:11:48 -04:00
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.
2017-07-27 16:53:02 -04: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
13cca8a66a
models/comment: remove unused SQL parameter ( #4586 )
2017-06-27 20:39:59 -04:00
Unknwon
8ed2330d6e
issue_comment: fix pg syntax ambiguous ( #4586 )
...
Also handle error related to time parsing.
2017-06-27 20:21:36 -04:00
Andy Hochhaus
261237745f
api: fix ListIssueComments API ( #4587 )
2017-06-27 19:59:41 -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
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
2017-06-11 02:28:08 -04:00
Unknwon
e16196124e
setting: disable SSH minimum key size check when not eligible ( #4507 )
2017-06-11 02:06:26 -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
无闻
51d7f1264b
api: GitHub compliance ( #4549 )
...
* Add undocumented endpoint for /repositories/:id
* GitHub API Compliance
2017-06-05 15:34:11 -04:00
Unknwon
6bb9c442b2
issue: fix updated_unix is not updated for new comments ( #4462 )
2017-06-02 17:30:15 -04:00
Unknwon
c69fa18434
repo: expose more fields to API format ( #4484 )
2017-06-02 14:26:34 -04:00
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.
2017-05-29 23:24:37 -04:00
Unknwon
4e87e62d5c
models/repo_collaboration: cannot change permissions of collaborators ( #4512 )
2017-05-29 16:33:18 -04:00
Unknwon
b17995a332
restore: reset table sequences for PostgreSQL ( #4357 )
2017-05-21 04:37:37 -04:00
Unknwon
ce6e8ed8fe
models: remove redundant tags for primary keys
2017-05-21 04:36:41 -04:00
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
2017-05-21 02:14:28 -04:00
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.
2017-05-20 08:41:57 -04:00
Unknwon
a11044f789
locale: sync from Crowdin
2017-05-17 18:37:25 -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
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.
2017-04-06 20:58:57 -04:00
Unknwon
90b9f7e08c
pkg/setting: rename {AppUrl, AppSubUrl} -> {AppURL, AppSubURL}
2017-04-06 17:27:57 -04:00
Unknwon
0e271799f2
Refactoring: rename and simplify pkg/tool functions
2017-04-06 17:13:53 -04:00
Unknwon
a617d52374
2fa: initial support ( #945 )
2017-04-06 00:14:30 -04:00
Unknwon
6fbb984ebf
Refactoring: rename pkg/base -> pkg/tool
2017-04-05 09:05:40 -04:00
Unknwon
c05717a5f0
models/mirror: feed git.IsRepoURLAccessible with raw mirror address
2017-04-04 20:42:18 -04:00
Unknwon
5a488b6517
models/mirror: unescape credentials at read ( #4014 )
...
If we save credentials already escaped, 'url.QueryEscape' still
escapes it and makes the credentials become incorrect.
2017-04-04 20:21:35 -04:00
Unknwon
ae1d50d19a
models/mirror: escape credentials before write mirror address ( #4014 )
...
Special characters such as '@', ';', '#' and ':' could occur in
password portion of credentials, which breaks the interpretation
and saves 'config' file in with extra characters that are not
recognized by Git (due to INI library).
2017-04-04 19:40:46 -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
55afc1ad21
models/repo_diff: move core functions to gogits/git-module
2017-04-04 01:45:57 -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
52aade232d
modes: fix test compile error
2017-03-31 18:28:08 -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
Unknwon
4a67bb5806
migrations.v17: skip if table not exist
2017-03-30 11:37:27 -04:00
Kyle McCullough
09723ec0e5
migration.v17: handle mysql error ( #4361 )
2017-03-29 19:02:07 -04:00
Unknwon
abe7f7bc36
migration.v17: add nil error check
2017-03-28 16:38:16 -04:00
