Commit Graph

4821 Commits (b752fe680811119954ccef051e6f3b3e2a04c2e8)

Author SHA1 Message Date
Unknwon b752fe6808
MISC: bump version 2017-11-19 13:29:06 -05:00
Unknwon 114677b747
bindata: update 2017-11-19 12:49:46 -05:00
无闻 9362b9fdfe cmd/hook: fix custom hook cannot be executed on Windows (#4255)
This solution still requires the server installed git-bash.
2017-11-18 21:45:29 -05:00
Unknwon f48921c256
README: update numer of language supported
[CI SKIP]
2017-11-18 01:51:43 -05:00
Unknwon 51e0eef11e
locale: sync from Crowdin 2017-11-18 01:27:56 -05:00
Ross Williams 925c2a2ca2 docker: symlink fixes (#4747)
* Prevent circular links (symlinks) from being created:
	* /data/gogs/log/log -> /data/gogs/log
	* /data/gogs/data/data -> /data/gogs/data
	* /data/git/git -> /data/git
2017-11-18 00:50:07 -05:00
Yen Chi Hsuan f1465b6847 locale: fix the language name for zh_TW (#4807) 2017-11-18 00:48:07 -05:00
Ryan Chang 5260d70b19 templates: fix typo in repo/home.tmpl (#4845) 2017-11-18 00:47:48 -05:00
33MHz 339fd9c5a4 locale: fix English grammar for delete repository dialog (#4862)
* fix typo in en-US delete dialog

* fix typo in en-GB delete dialog

* improve en-GB delete dialog language

* improve en-US delete dialog language
2017-11-18 00:47:20 -05:00
Unknwon 0f14b92bce
MISC: minor fixes in webhook 2017-11-18 00:38:46 -05:00
Unknwon 43d6ad5fda
pull: fix after commit ID is not latest commit in the base branch (#4442) 2017-11-18 00:38:06 -05:00
Unknwon 667c40c3de
css: fix minor table issue 2017-11-17 00:12:59 -05:00
Unknwon 3b8b8a2ee3
pull_request: able to ignore whitespace when check conflict (#4834) 2017-11-16 22:22:38 -05:00
Unknwon 6f04ee879c
auth/ldap: allow placeholder %s for BindDN (#2526) 2017-11-16 19:32:33 -05:00
Unknwon e1e76d3f88
admin/config: add UI for [http] section (#3987) 2017-11-16 19:03:46 -05:00
Unknwon 221aa8968a
CI: add go 1.9.x 2017-11-16 18:44:54 -05:00
Unknwon 86931f546f
repo: fix go-get meta tags (#4832)
The first part in go-import should be the root import path. It
included subpath when 'go get' with a subpath and was not correct.
2017-11-16 18:43:03 -05:00
Unknwon ae40bb00b3
vendor: update github.com/gogits/git-module (#4855) 2017-11-16 13:13:28 -05:00
Unknwon 3dd93f5533
vendor: update github.com/gogits/git-module 2017-11-16 00:04:07 -05:00
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.
2017-11-16 00:03:35 -05:00
Mohammad Gholami ae4c4708ad locale: update TRANSLATORS (#4866)
Crowdin contributor
2017-11-15 23:45:24 -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 dbe6de313e
public: update Semantic UI 2.2.10 -> 2.2.13 2017-11-15 21:59:47 -05:00
Anton Antonov 77c77fbd42 api: add endpoint /api/v1/user/orgs (#4835)
* Add API endpoint /api/v1/user/orgs

The difference between this endpoint and
/api/v1/admin/users/<username>/orgs,
is that here you're creating a repo with the `user`
that corresponds to the API token you're using.

* Extract duplicate API org creation
2017-11-13 22:27:30 -05:00
Unknwon 9b4054f1fc
locale: sync from Crowdin 2017-11-05 23:59:12 -05:00
Unknwon af3911b833
MISC: update README and migration comment 2017-10-22 19:29:29 -04:00
Unknwon 4258bf3d54
user/auth: fix page not redirect after login 2017-10-22 19:29:17 -04:00
Unknwon 4d1d66d906
Bump version 2017-10-15 00:12:52 -04:00
Unknwon b727e0be71
SECURITY: fix branch name persistent XSS
Reported by Carl Hattenfels.
2017-10-15 00:07:46 -04:00
Unknwon ea313d0c1e
SECURITY: HTML injection in user search API
Reported by Tim Hawes.
2017-10-14 23:53:20 -04:00
Unknwon c1507eda45
locale: sync from Crowdin 2017-10-14 04:19:24 -04:00
Robert Beal ce7496aec9 docker: allow setting UID and GID when running a container (#4776)
* Allow setting the UID and GID when running a docker container via shadow

* Disable password login via usermod (fix leaving user in insecure state)
2017-10-13 16:26:39 -04:00
Josef Kemetmüller b16c12f67b cmd/admin: add subcommands for all admin dashboard actions (#4813) 2017-10-10 17:02:44 -04:00
Unknwon 1b24e6ed76
locale: sync from Crowdin 2017-09-25 20:29:10 -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
Unknwon b1100b5e34
locale: sync from Crowdin 2017-08-15 18:20:28 -04:00
Sb ab2c6cb008 models: fix #4692 and typo in comments (#4695) 2017-08-13 02:11:48 -04:00
Unknwon f2c3f4a944
locale: sync from Crowdin 2017-07-30 02:45:13 -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
Julian Xhokaxhiu 5a88546a80 docker: enable Automated builds for rpi (#4431)
* Enable Automated builds for rpi

* Rename the file to fit only for Docker Hub

* Update the binary to v2.9.0+resin1

* Restore default status

* Commit as new file

In order to avoid breaking native builds
2017-07-14 18:04:19 -04:00
Unknwon f67d6bbca3
repo/diff: fix line number in split view template (#4584) 2017-07-14 17:02:45 -04:00
Unknwon c970c4ee41
css: not include line numbers in diff selection (#4584)
Changed template file in order to make CSS work properly.
2017-07-14 16:50:49 -04:00
Unknwon 3a6623104f
Makefile: correct errors 2017-07-14 16:48:55 -04:00
Unknwon b18a2bdcd3
locale: sync from Crowdin 2017-07-14 16:48:41 -04:00
Unknwon d09eaef542
locale: sync from Crowdin 2017-07-09 21:38:11 -04:00