Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Changes from gitea:master #130

Merged
merged 137 commits into from
Jan 6, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
137 commits
Select commit Hold shift + click to select a range
7b5b517
Bug fix for edit-hook API endpoint
ethantkoenig Dec 7, 2016
cbcb436
Fixes issue #283
Bwko Dec 8, 2016
abcd39f
In the wiki title replace tab with a space (#371)
Bwko Dec 11, 2016
f0a989c
Correction LDAP validation (#342)
denji Dec 12, 2016
1d1c018
Autogenerate Version on build (#190)
bkcsoft Dec 13, 2016
73710c0
bug fixed branch name for pushupdate (#380)
lunny Dec 13, 2016
d771e97
Don't use custom PBKDF2 function (#382)
lunny Dec 15, 2016
b4c7940
fixed vulnerabilities (#392)
lunny Dec 15, 2016
1831ee2
Update example install url from try.gogs.io to try.gitea.io (#385)
strk Dec 15, 2016
c6b6a61
Fixing multiple docker issues (#386)
tboerger Dec 15, 2016
8aeeed0
Disable coverage report for now (#395)
tboerger Dec 15, 2016
15c3d14
fixed vulnerabilities on deleting release (#399)
lunny Dec 16, 2016
578a8e2
Revert "Disable coverage report for now" (#400)
andreynering Dec 16, 2016
b11843b
Update gitea/sdk vendor (#406)
martinhpedersen Dec 16, 2016
0d6e88b
Fix typo (#407)
RichieB2B Dec 16, 2016
44428fd
Remove fixed FIXME (#408)
RichieB2B Dec 16, 2016
7c46667
fixed vulnerabilities labels (#409)
lunny Dec 17, 2016
8559d6f
add ZH readme (#405)
lunny Dec 19, 2016
608a60f
Add support for using "libravatar" as the GravatarSource
strk Dec 19, 2016
6ade13e
serve video files using the HTML5 video tag (#418)
nmandery Dec 20, 2016
1d30457
change test mail subject and body to 'Gitea Test Mail!'
mjwwit Dec 20, 2016
952587d
Merge pull request #422 from mjwwit/master
andreynering Dec 20, 2016
380e32e
Fix random string generator (#384)
denji Dec 20, 2016
235eb4c
Merge pull request #412 from strk/libravatar-source
andreynering Dec 20, 2016
111c95e
Change default Android theme color meta tag (#389)
andreynering Dec 20, 2016
618407c
Do not override the binary version name from drone (#436)
tboerger Dec 21, 2016
ce21ed6
Remove remaining Gogs reference on locales and cmd (#430)
joubertredrat Dec 21, 2016
2197d29
Add Korean support (#437)
lunny Dec 21, 2016
f8d94cb
Update locales (#440)
lunny Dec 21, 2016
c46eb3f
Fix homepage docs link broken (#417)
lunny Dec 22, 2016
d5d21b6
Fix string format verbs (#3637)
alunegov Dec 21, 2016
df7fa4e
issue comment api fix (#449)
bkcsoft Dec 22, 2016
4c89a9c
Bug fixes and tests for modules/base (#442)
ethantkoenig Dec 22, 2016
0c5c34d
UpdateIssueUsersByMentions was calling database write operations whil…
lunny Dec 22, 2016
47a7529
update code.gitea.io/git (#450)
lunny Dec 22, 2016
11df7eb
init script gentoo (#447)
lunny Dec 22, 2016
65b1875
New settings option for a custom SSH host (#3763) (#446)
lunny Dec 22, 2016
e0ecd9f
fix bug #1122 log.smtp receiver configure error (#3602) (#451)
lunny Dec 22, 2016
0e13925
Check if file is a symlink with web editor (#3687) (#445)
lunny Dec 22, 2016
c21e2c4
fix tag webhook 404 error (#420)
lunny Dec 22, 2016
b33078f
Bindata is optional and over-writable on restart (#354)
tboerger Dec 22, 2016
a12da66
resolved #394 (#396)
lunny Dec 23, 2016
dfb5470
Change screenshoots to Gitea (#454)
joubertredrat Dec 23, 2016
ec1fe11
Fix race condition in unit test (#456)
ethantkoenig Dec 23, 2016
a822bba
Add default values for settings (#455)
lunny Dec 23, 2016
1e6dd98
Integrated an initial changelog (#457)
tboerger Dec 23, 2016
770e831
Simplified README and added a release badge (#460)
tboerger Dec 23, 2016
eaa7b3c
update zh readme (#462)
lunny Dec 23, 2016
b0c6217
Fix broken godoc link and add arch in English README (#463)
lunny Dec 23, 2016
7b67347
Fixed drone tagging
tboerger Dec 23, 2016
6aacf4d
Properly handle drone tags and release/* branches (#466)
tboerger Dec 23, 2016
f2ff0ee
Raised version to 1.1.0 (#468)
tboerger Dec 24, 2016
25b5ffb
Enables mssql support (#383)
btrepp Dec 24, 2016
8a4161c
API Endpoint for watching (#191)
ethantkoenig Dec 24, 2016
d0932ef
Bug fixes for Issues filters (#413)
ethantkoenig Dec 24, 2016
f27d87d
Added minimum password length to app.ini (#223)
Bwko Dec 24, 2016
a345a03
Added sorting to the labels & milestones page (#199)
Bwko Dec 24, 2016
c1e92ee
Simplified MinPasswordLength check (#475)
Bwko Dec 24, 2016
fa3abc2
Added sorting to organizations, repos & users page (#222)
Bwko Dec 24, 2016
9847b38
Organization webhook API endpoints
ethantkoenig Dec 7, 2016
8de8ec0
Update sdk
ethantkoenig Dec 24, 2016
d4924d4
Implement sendmail (#355)
couling Dec 25, 2016
4b7594d
Provide button to delete merged pull request (#441)
lunny Dec 25, 2016
2e7ccec
Git LFS support v2 (#122)
fabian-z Dec 26, 2016
2342df1
API Endpoints for collaborators (#375)
ethantkoenig Dec 26, 2016
7163445
Improve issue references in markdown (#471)
strk Dec 26, 2016
71dee6b
Improve the way how branches are deleted
Bwko Dec 25, 2016
6388761
Added Dutch translations to the landingpage
Bwko Dec 26, 2016
98b0688
At the locales replaced 6 with MIN_PASSWORD_LENGTH
Bwko Dec 26, 2016
59f736d
Merge pull request #492 from Bwko/password
andreynering Dec 27, 2016
ba134bd
fix 500 when delete orgnization and resolved #486
lunny Dec 27, 2016
7802699
fix installation page ssh domain unavilable
lunny Dec 27, 2016
ba85f68
Merge pull request #487 from Bwko/NL
andreynering Dec 27, 2016
a0f5471
Fix default cookie name
joubertredrat Dec 27, 2016
edfa76d
Merge pull request #508 from joubertredrat/fix-cookie-name
andreynering Dec 27, 2016
8f1c311
ignore static files statstics for linguist
lunny Dec 27, 2016
9fae9f0
Remove redundant query in collaborator API (#516)
ethantkoenig Dec 28, 2016
c463b1b
Optimization for user.GetRepositoryAccesses to reduce db query times …
lunny Dec 28, 2016
f686a32
API endpoints for organization teams (#370)
ethantkoenig Dec 28, 2016
3313168
Replace Gogs with Gitea (#520)
Bwko Dec 28, 2016
c22f911
Implementation of Folder Jumping
sriio Dec 28, 2016
35d9378
Permissions bug fix for webhooks
ethantkoenig Dec 27, 2016
22e1bd3
commithgraph / timeline (#428)
kjellkvinge Dec 28, 2016
799d0c2
slight optimization for GetUserRepositories (#498)
lunny Dec 29, 2016
ac51caa
add default values for SSH settings (#500)
lunny Dec 29, 2016
6f4ba68
Repo permission bug fixes (#513)
ethantkoenig Dec 29, 2016
2d1a1fc
Cache users on list releases (#527)
lunny Dec 29, 2016
b992858
Tab on user profile to show starred repos (#519)
andreynering Dec 29, 2016
937b4b5
Speed up conflict checking in pull request creation (#276)
typeless Dec 29, 2016
37eec6c
push + pull now works with reverse proxy + basic auth on apache 2.4
Dec 28, 2016
42904cb
Notification - Step 1 (#523)
andreynering Dec 30, 2016
aae960b
Fix URL link on CONTRIBUTING
thibaultmeyer Dec 30, 2016
d0490c1
Merge pull request #538 from 0xbaadf00d/feature/fix-contrib-link
andreynering Dec 30, 2016
6069abe
Notifications - Step 2
andreynering Dec 30, 2016
6510e57
fix gofmt error
appleboy Dec 30, 2016
cb18941
replcae go fmt with gofmt command.
appleboy Dec 30, 2016
fa60cf0
Updated Dutch translations
Bwko Dec 29, 2016
527c2dd
Support http service graceful restart (#416)
lunny Dec 31, 2016
b75450a
API endpoints for forks (#509)
ethantkoenig Dec 31, 2016
c0904f1
Restrict creating organisations by user (#193)
Schwobaland Dec 31, 2016
bf85c82
fix windows build broken by #416
lunny Dec 31, 2016
de8b73d
Unit tests for token and update models
ethantkoenig Dec 29, 2016
6e5fffb
resolved #485: when migrate empty wiki repo, then ignore (#541)
lunny Dec 31, 2016
9ccc369
Fix wrong anchors for non-latin headings (#3981) (#512)
Bwko Dec 31, 2016
96c2012
resolved #517: fix admin ui data row missing
lunny Dec 31, 2016
1f07792
Merge pull request #545 from lunny/lunny/fix_ui_data_row_missing
andreynering Dec 31, 2016
dc50c78
Replace pull request with issue at issue_template (#547)
Bwko Dec 31, 2016
a09a3dc
Apply dockerfile updates to raspberry dockerfile (#548)
memorion Jan 1, 2017
787fda5
UI config to toggle whether user email shows up in Explore Users (#336)
Jan 1, 2017
aea1b2b
Merge pull request #543 from lunny/lunny/fallback_graceful_windows
andreynering Jan 1, 2017
b7e1bcc
Makefile: on Windows, executable should have ".exe" (#550)
andreynering Jan 1, 2017
0c301f7
Release API endpoints
ethantkoenig Dec 31, 2016
05837a8
Provide description for the INSTALL_LOCK config option (#554)
alvaroaleman Jan 2, 2017
727675d
fix config session missing data row & resolved #517 (#549)
lunny Jan 2, 2017
341a3b5
Do not get count on /api routers
andreynering Jan 2, 2017
f59672a
More fine graned colors
andreynering Jan 2, 2017
545ba2e
Showing index in front of issue title
andreynering Jan 2, 2017
3c71163
change the default action when deleting a release to not delete tag
lunny Dec 31, 2016
7be02d9
Update maintainer list for LGTM
appleboy Jan 3, 2017
4b0974e
Fix benchmarktests (#557)
kjellkvinge Jan 3, 2017
5102158
build failed by deleting release by API (#562)
lunny Jan 3, 2017
70900bd
bug fixed for fork repos (#560)
lunny Jan 3, 2017
980dd0b
Update xorm and dependencies vendor for feature to dump to other data…
lunny Jan 3, 2017
09dabe2
fix bug #564 (#567)
lunny Jan 3, 2017
b354cf3
Add pagination for notifications
andreynering Jan 3, 2017
467202d
fix: Remove call to set GOMAXPROCS (#577)
appleboy Jan 4, 2017
dc3ff9f
Rename .gogs to .gitea and comply with github template guidelines (#5…
mkuhlmann Jan 5, 2017
1207bda
Fix typos in models/ (#576)
ethantkoenig Jan 5, 2017
bdad3b2
Check primary email address fields on CreateUser (#556)
Jan 5, 2017
c5f0d4b
Fix SQL bug in models/access (#583)
ethantkoenig Jan 5, 2017
a5e07da
Fix diff split view coloring (#553) (#584)
mkuhlmann Jan 5, 2017
eb9ce39
Fix unified diff view styling (#585)
mkuhlmann Jan 5, 2017
6efa80a
Add the note forked from gogs (#590)
lunny Jan 5, 2017
2d17d6b
Clone tags within drone for proper version generation (#591)
tboerger Jan 5, 2017
9d1bc9a
Added 1.0.1 to changelog (#594)
tboerger Jan 5, 2017
79d5271
Merge pull request #539 from andreynering/notifications-step-2
andreynering Jan 5, 2017
03a6d70
Merge branch 'master' into ufw_develop
ethantkoenig Jan 5, 2017
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
36 changes: 29 additions & 7 deletions .drone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@ workspace:
path: src/code.gitea.io/gitea

pipeline:
clone:
image: plugins/git
tags: true

test:
image: webhippie/golang:edge
pull: true
Expand Down Expand Up @@ -56,7 +60,7 @@ pipeline:
- make release
when:
event: [ push, tag ]
branch: [ master, refs/tags/* ]
branch: [ master, release/*, refs/tags/* ]

coverage:
image: plugins/coverage
Expand All @@ -67,11 +71,19 @@ pipeline:
docker:
image: plugins/docker
repo: gitea/gitea
tags: [ '${TAG}' ]
tags: [ '${DRONE_TAG##v}' ]
when:
event: [ tag ]
branch: [ refs/tags/* ]

docker:
image: plugins/docker
repo: gitea/gitea
tags: [ '${DRONE_BRANCH##release/v}' ]
when:
event: [ push ]
branch: [ release/* ]

docker:
image: plugins/docker
repo: gitea/gitea
Expand All @@ -85,20 +97,30 @@ pipeline:
path_style: true
strip_prefix: dist/release/
source: dist/release/*
target: /gitea/master
target: /gitea/${DRONE_TAG##v}
when:
event: [ tag ]
branch: [ refs/tags/* ]

release:
image: plugins/s3
path_style: true
strip_prefix: dist/release/
source: dist/release/*
target: /gitea/${DRONE_BRANCH##release/v}
when:
event: [ push ]
branch: [ master ]
branch: [ release/* ]

release:
image: plugins/s3
path_style: true
strip_prefix: dist/release/
source: dist/release/*
target: /gitea/$$TAG
target: /gitea/master
when:
event: [ tag ]
branch: [ refs/tags/* ]
event: [ push ]
branch: [ master ]

github:
image: plugins/github-release
Expand Down
2 changes: 1 addition & 1 deletion .drone.yml.sig
Original file line number Diff line number Diff line change
@@ -1 +1 @@
eyJhbGciOiJIUzI1NiJ9.d29ya3NwYWNlOgogIGJhc2U6IC9zcnYvYXBwCiAgcGF0aDogc3JjL2NvZGUuZ2l0ZWEuaW8vZ2l0ZWEKCnBpcGVsaW5lOgogIHRlc3Q6CiAgICBpbWFnZTogd2ViaGlwcGllL2dvbGFuZzplZGdlCiAgICBwdWxsOiB0cnVlCiAgICBlbnZpcm9ubWVudDoKICAgICAgQ0dPX0VOQUJMRUQ6IDEKICAgICAgVEFHUzogc3FsaXRlIGJpbmRhdGEKICAgICAgR09QQVRIOiAvc3J2L2FwcAogICAgY29tbWFuZHM6CiAgICAgIC0gYXBrIC1VIGFkZCBvcGVuc3NoLWNsaWVudAogICAgICAtIG1ha2UgY2xlYW4KICAgICAgLSBtYWtlIGdlbmVyYXRlCiAgICAgIC0gbWFrZSB2ZXQKICAgICAgLSBtYWtlIGxpbnQKICAgICAgLSBtYWtlIHRlc3QKICAgICAgLSBtYWtlIGJ1aWxkCiAgICB3aGVuOgogICAgICBldmVudDogWyBwdXNoLCB0YWcsIHB1bGxfcmVxdWVzdCBdCgogIHRlc3QtbXlzcWw6CiAgICBpbWFnZTogd2ViaGlwcGllL2dvbGFuZzplZGdlCiAgICBwdWxsOiB0cnVlCiAgICBlbnZpcm9ubWVudDoKICAgICAgQ0dPX0VOQUJMRUQ6IDEKICAgICAgVEFHUzogc3FsaXRlIGJpbmRhdGEKICAgICAgR09QQVRIOiAvc3J2L2FwcAogICAgY29tbWFuZHM6CiAgICAgIC0gbWFrZSB0ZXN0LW15c3FsCiAgICB3aGVuOgogICAgICBldmVudDogWyBwdXNoIF0KCiAgdGVzdC1wZ3NxbDoKICAgIGltYWdlOiB3ZWJoaXBwaWUvZ29sYW5nOmVkZ2UKICAgIHB1bGw6IHRydWUKICAgIGVudmlyb25tZW50OgogICAgICBDR09fRU5BQkxFRDogMQogICAgICBUQUdTOiBzcWxpdGUgYmluZGF0YQogICAgICBHT1BBVEg6IC9zcnYvYXBwCiAgICBjb21tYW5kczoKICAgICAgLSBtYWtlIHRlc3QtcGdzcWwKICAgIHdoZW46CiAgICAgIGV2ZW50OiBbIHB1c2ggXQoKICB1cGRhdGVyOgogICAgaW1hZ2U6IGthcmFsYWJlL3hnby1sYXRlc3Q6bGF0ZXN0CiAgICBwdWxsOiB0cnVlCiAgICBlbnZpcm9ubWVudDoKICAgICAgQ0dPX0VOQUJMRUQ6IDEKICAgICAgVEFHUzogc3FsaXRlIGJpbmRhdGEKICAgICAgR09QQVRIOiAvc3J2L2FwcAogICAgY29tbWFuZHM6CiAgICAgIC0gbWFrZSByZWxlYXNlCiAgICB3aGVuOgogICAgICBldmVudDogWyBwdXNoLCB0YWcgXQogICAgICBicmFuY2g6IFsgbWFzdGVyLCByZWZzL3RhZ3MvKiBdCgogIGNvdmVyYWdlOgogICAgaW1hZ2U6IHBsdWdpbnMvY292ZXJhZ2UKICAgIHNlcnZlcjogaHR0cHM6Ly9jb3ZlcmFnZS5naXRlYS5pbwogICAgd2hlbjoKICAgICAgZXZlbnQ6IFsgcHVzaCwgdGFnLCBwdWxsX3JlcXVlc3QgXQoKICBkb2NrZXI6CiAgICBpbWFnZTogcGx1Z2lucy9kb2NrZXIKICAgIHJlcG86IGdpdGVhL2dpdGVhCiAgICB0YWdzOiBbICcke1RBR30nIF0KICAgIHdoZW46CiAgICAgIGV2ZW50OiBbIHRhZyBdCiAgICAgIGJyYW5jaDogWyByZWZzL3RhZ3MvKiBdCgogIGRvY2tlcjoKICAgIGltYWdlOiBwbHVnaW5zL2RvY2tlcgogICAgcmVwbzogZ2l0ZWEvZ2l0ZWEKICAgIHRhZ3M6IFsgJ2xhdGVzdCcgXQogICAgd2hlbjoKICAgICAgZXZlbnQ6IFsgcHVzaCBdCiAgICAgIGJyYW5jaDogWyBtYXN0ZXIgXQoKICByZWxlYXNlOgogICAgaW1hZ2U6IHBsdWdpbnMvczMKICAgIHBhdGhfc3R5bGU6IHRydWUKICAgIHN0cmlwX3ByZWZpeDogZGlzdC9yZWxlYXNlLwogICAgc291cmNlOiBkaXN0L3JlbGVhc2UvKgogICAgdGFyZ2V0OiAvZ2l0ZWEvbWFzdGVyCiAgICB3aGVuOgogICAgICBldmVudDogWyBwdXNoIF0KICAgICAgYnJhbmNoOiBbIG1hc3RlciBdCgogIHJlbGVhc2U6CiAgICBpbWFnZTogcGx1Z2lucy9zMwogICAgcGF0aF9zdHlsZTogdHJ1ZQogICAgc3RyaXBfcHJlZml4OiBkaXN0L3JlbGVhc2UvCiAgICBzb3VyY2U6IGRpc3QvcmVsZWFzZS8qCiAgICB0YXJnZXQ6IC9naXRlYS8kJFRBRwogICAgd2hlbjoKICAgICAgZXZlbnQ6IFsgdGFnIF0KICAgICAgYnJhbmNoOiBbIHJlZnMvdGFncy8qIF0KCiAgZ2l0aHViOgogICAgaW1hZ2U6IHBsdWdpbnMvZ2l0aHViLXJlbGVhc2UKICAgIGZpbGVzOgogICAgICAtIGRpc3QvcmVsZWFzZS8qCiAgICB3aGVuOgogICAgICBldmVudDogWyB0YWcgXQogICAgICBicmFuY2g6IFsgcmVmcy90YWdzLyogXQoKICBnaXR0ZXI6CiAgICBpbWFnZTogcGx1Z2lucy9naXR0ZXIKCnNlcnZpY2VzOgogIG15c3FsOgogICAgaW1hZ2U6IG15c3FsOjUuNwogICAgZW52aXJvbm1lbnQ6CiAgICAgIC0gTVlTUUxfREFUQUJBU0U9dGVzdAogICAgICAtIE1ZU1FMX0FMTE9XX0VNUFRZX1BBU1NXT1JEPXllcwogICAgd2hlbjoKICAgICAgZXZlbnQ6IFsgcHVzaCBdCgogIHBnc3FsOgogICAgaW1hZ2U6IHBvc3RncmVzOjkuNQogICAgZW52aXJvbm1lbnQ6CiAgICAgIC0gUE9TVEdSRVNfREI9dGVzdAogICAgd2hlbjoKICAgICAgZXZlbnQ6IFsgcHVzaCBdCg.O00lMwJDnAI1CFYbrs1bAmspX4wA5ufdye66vq5lcWw
eyJhbGciOiJIUzI1NiJ9.d29ya3NwYWNlOgogIGJhc2U6IC9zcnYvYXBwCiAgcGF0aDogc3JjL2NvZGUuZ2l0ZWEuaW8vZ2l0ZWEKCnBpcGVsaW5lOgogIGNsb25lOgogICAgaW1hZ2U6IHBsdWdpbnMvZ2l0CiAgICB0YWdzOiB0cnVlCgogIHRlc3Q6CiAgICBpbWFnZTogd2ViaGlwcGllL2dvbGFuZzplZGdlCiAgICBwdWxsOiB0cnVlCiAgICBlbnZpcm9ubWVudDoKICAgICAgQ0dPX0VOQUJMRUQ6IDEKICAgICAgVEFHUzogc3FsaXRlIGJpbmRhdGEKICAgICAgR09QQVRIOiAvc3J2L2FwcAogICAgY29tbWFuZHM6CiAgICAgIC0gYXBrIC1VIGFkZCBvcGVuc3NoLWNsaWVudAogICAgICAtIG1ha2UgY2xlYW4KICAgICAgLSBtYWtlIGdlbmVyYXRlCiAgICAgIC0gbWFrZSB2ZXQKICAgICAgLSBtYWtlIGxpbnQKICAgICAgLSBtYWtlIHRlc3QKICAgICAgLSBtYWtlIGJ1aWxkCiAgICB3aGVuOgogICAgICBldmVudDogWyBwdXNoLCB0YWcsIHB1bGxfcmVxdWVzdCBdCgogIHRlc3QtbXlzcWw6CiAgICBpbWFnZTogd2ViaGlwcGllL2dvbGFuZzplZGdlCiAgICBwdWxsOiB0cnVlCiAgICBlbnZpcm9ubWVudDoKICAgICAgQ0dPX0VOQUJMRUQ6IDEKICAgICAgVEFHUzogc3FsaXRlIGJpbmRhdGEKICAgICAgR09QQVRIOiAvc3J2L2FwcAogICAgY29tbWFuZHM6CiAgICAgIC0gbWFrZSB0ZXN0LW15c3FsCiAgICB3aGVuOgogICAgICBldmVudDogWyBwdXNoIF0KCiAgdGVzdC1wZ3NxbDoKICAgIGltYWdlOiB3ZWJoaXBwaWUvZ29sYW5nOmVkZ2UKICAgIHB1bGw6IHRydWUKICAgIGVudmlyb25tZW50OgogICAgICBDR09fRU5BQkxFRDogMQogICAgICBUQUdTOiBzcWxpdGUgYmluZGF0YQogICAgICBHT1BBVEg6IC9zcnYvYXBwCiAgICBjb21tYW5kczoKICAgICAgLSBtYWtlIHRlc3QtcGdzcWwKICAgIHdoZW46CiAgICAgIGV2ZW50OiBbIHB1c2ggXQoKICB1cGRhdGVyOgogICAgaW1hZ2U6IGthcmFsYWJlL3hnby1sYXRlc3Q6bGF0ZXN0CiAgICBwdWxsOiB0cnVlCiAgICBlbnZpcm9ubWVudDoKICAgICAgQ0dPX0VOQUJMRUQ6IDEKICAgICAgVEFHUzogc3FsaXRlIGJpbmRhdGEKICAgICAgR09QQVRIOiAvc3J2L2FwcAogICAgY29tbWFuZHM6CiAgICAgIC0gbWFrZSByZWxlYXNlCiAgICB3aGVuOgogICAgICBldmVudDogWyBwdXNoLCB0YWcgXQogICAgICBicmFuY2g6IFsgbWFzdGVyLCByZWxlYXNlLyosIHJlZnMvdGFncy8qIF0KCiAgY292ZXJhZ2U6CiAgICBpbWFnZTogcGx1Z2lucy9jb3ZlcmFnZQogICAgc2VydmVyOiBodHRwczovL2NvdmVyYWdlLmdpdGVhLmlvCiAgICB3aGVuOgogICAgICBldmVudDogWyBwdXNoLCB0YWcsIHB1bGxfcmVxdWVzdCBdCgogIGRvY2tlcjoKICAgIGltYWdlOiBwbHVnaW5zL2RvY2tlcgogICAgcmVwbzogZ2l0ZWEvZ2l0ZWEKICAgIHRhZ3M6IFsgJyR7RFJPTkVfVEFHIyN2fScgXQogICAgd2hlbjoKICAgICAgZXZlbnQ6IFsgdGFnIF0KICAgICAgYnJhbmNoOiBbIHJlZnMvdGFncy8qIF0KCiAgZG9ja2VyOgogICAgaW1hZ2U6IHBsdWdpbnMvZG9ja2VyCiAgICByZXBvOiBnaXRlYS9naXRlYQogICAgdGFnczogWyAnJHtEUk9ORV9CUkFOQ0gjI3JlbGVhc2Uvdn0nIF0KICAgIHdoZW46CiAgICAgIGV2ZW50OiBbIHB1c2ggXQogICAgICBicmFuY2g6IFsgcmVsZWFzZS8qIF0KCiAgZG9ja2VyOgogICAgaW1hZ2U6IHBsdWdpbnMvZG9ja2VyCiAgICByZXBvOiBnaXRlYS9naXRlYQogICAgdGFnczogWyAnbGF0ZXN0JyBdCiAgICB3aGVuOgogICAgICBldmVudDogWyBwdXNoIF0KICAgICAgYnJhbmNoOiBbIG1hc3RlciBdCgogIHJlbGVhc2U6CiAgICBpbWFnZTogcGx1Z2lucy9zMwogICAgcGF0aF9zdHlsZTogdHJ1ZQogICAgc3RyaXBfcHJlZml4OiBkaXN0L3JlbGVhc2UvCiAgICBzb3VyY2U6IGRpc3QvcmVsZWFzZS8qCiAgICB0YXJnZXQ6IC9naXRlYS8ke0RST05FX1RBRyMjdn0KICAgIHdoZW46CiAgICAgIGV2ZW50OiBbIHRhZyBdCiAgICAgIGJyYW5jaDogWyByZWZzL3RhZ3MvKiBdCgogIHJlbGVhc2U6CiAgICBpbWFnZTogcGx1Z2lucy9zMwogICAgcGF0aF9zdHlsZTogdHJ1ZQogICAgc3RyaXBfcHJlZml4OiBkaXN0L3JlbGVhc2UvCiAgICBzb3VyY2U6IGRpc3QvcmVsZWFzZS8qCiAgICB0YXJnZXQ6IC9naXRlYS8ke0RST05FX0JSQU5DSCMjcmVsZWFzZS92fQogICAgd2hlbjoKICAgICAgZXZlbnQ6IFsgcHVzaCBdCiAgICAgIGJyYW5jaDogWyByZWxlYXNlLyogXQoKICByZWxlYXNlOgogICAgaW1hZ2U6IHBsdWdpbnMvczMKICAgIHBhdGhfc3R5bGU6IHRydWUKICAgIHN0cmlwX3ByZWZpeDogZGlzdC9yZWxlYXNlLwogICAgc291cmNlOiBkaXN0L3JlbGVhc2UvKgogICAgdGFyZ2V0OiAvZ2l0ZWEvbWFzdGVyCiAgICB3aGVuOgogICAgICBldmVudDogWyBwdXNoIF0KICAgICAgYnJhbmNoOiBbIG1hc3RlciBdCgogIGdpdGh1YjoKICAgIGltYWdlOiBwbHVnaW5zL2dpdGh1Yi1yZWxlYXNlCiAgICBmaWxlczoKICAgICAgLSBkaXN0L3JlbGVhc2UvKgogICAgd2hlbjoKICAgICAgZXZlbnQ6IFsgdGFnIF0KICAgICAgYnJhbmNoOiBbIHJlZnMvdGFncy8qIF0KCiAgZ2l0dGVyOgogICAgaW1hZ2U6IHBsdWdpbnMvZ2l0dGVyCgpzZXJ2aWNlczoKICBteXNxbDoKICAgIGltYWdlOiBteXNxbDo1LjcKICAgIGVudmlyb25tZW50OgogICAgICAtIE1ZU1FMX0RBVEFCQVNFPXRlc3QKICAgICAgLSBNWVNRTF9BTExPV19FTVBUWV9QQVNTV09SRD15ZXMKICAgIHdoZW46CiAgICAgIGV2ZW50OiBbIHB1c2ggXQoKICBwZ3NxbDoKICAgIGltYWdlOiBwb3N0Z3Jlczo5LjUKICAgIGVudmlyb25tZW50OgogICAgICAtIFBPU1RHUkVTX0RCPXRlc3QKICAgIHdoZW46CiAgICAgIGV2ZW50OiBbIHB1c2ggXQo.NGE3UiNBappXiPimJXv1DzgjT3k2hofGPsCPhw7KsSM
6 changes: 6 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
conf/* linguist-vendored
docker/* linguist-vendored
options/* linguist-vendored
public/* linguist-vendored
scripts/* linguist-vendored
templates/* linguist-vendored
6 changes: 5 additions & 1 deletion .github/issue_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
3. Please take a moment to search that an issue doesn't already exist.
4. Please give all relevant information below for bug reports, incomplete details will be handled as an invalid report.

**You MUST delete the content above including this line before posting, otherwise your pull request will be invalid.**
**You MUST delete the content above including this line before posting, otherwise your issue will be invalid.**

- Gitea version (or commit ref):
- Git version:
Expand All @@ -12,6 +12,10 @@
- [ ] PostgreSQL
- [ ] MySQL
- [ ] SQLite
- Can you reproduce the bug at https://try.gitea.io:
- [ ] Yes (provide example URL)
- [ ] No
- [ ] Not relevant
- Log gist:

## Description
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ _testmain.go

coverage.out

/modules/options/bindata.go
/modules/public/bindata.go
/modules/templates/bindata.go

Expand Down
56 changes: 56 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
# Changelog

## [1.0.1](https://github.com/go-gitea/gitea/releases/tag/v1.0.1) - 2017-01-05

* BUGFIXES
* Fixed localized MIN_PASSWORD_LENGTH [#501](https://github.com/go-gitea/gitea/pull/501)
* Fixed 500 error on organization delete [#507](https://github.com/go-gitea/gitea/pull/507)
* Ignore empty wiki repo on migrate [#544](https://github.com/go-gitea/gitea/pull/544)
* Proper check access for forking [#563](https://github.com/go-gitea/gitea/pull/563)
* Fix SSH domain on installer [#506](https://github.com/go-gitea/gitea/pull/506)
* Fix missing data rows on admin UI [#580](https://github.com/go-gitea/gitea/pull/580)
* Do not delete tags with releases by default [#579](https://github.com/go-gitea/gitea/pull/579)
* Fix missing session config data on admin UI [#578](https://github.com/go-gitea/gitea/pull/578)
* Properly show the version within footer on the UI [#593](https://github.com/go-gitea/gitea/pull/593)

## [1.0.0](https://github.com/go-gitea/gitea/releases/tag/v1.0.0) - 2016-12-23

* BREAKING
* We have various changes on the API, scripting against API must be updated
* FEATURE
* Show last login for admins [#121](https://github.com/go-gitea/gitea/pull/121)
* BUGFIXES
* Fixed sender of notifications [#2](https://github.com/go-gitea/gitea/pull/2)
* Fixed keyword hijacking vulnerability [#20](https://github.com/go-gitea/gitea/pull/20)
* Fixed non-markdown readme rendering [#95](https://github.com/go-gitea/gitea/pull/95)
* Allow updating draft releases [#169](https://github.com/go-gitea/gitea/pull/169)
* GitHub API compliance [#227](https://github.com/go-gitea/gitea/pull/227)
* Added commit SHA to tag webhook [#286](https://github.com/go-gitea/gitea/issues/286)
* Secured links via noopener [#315](https://github.com/go-gitea/gitea/issues/315)
* Replace tabs with spaces on wiki title [#371](https://github.com/go-gitea/gitea/pull/371)
* Fixed vulnerability on labels and releases [#409](https://github.com/go-gitea/gitea/pull/409)
* Fixed issue comment API [#449](https://github.com/go-gitea/gitea/pull/449)
* ENHANCEMENT
* Use proper import path for libravatar [#3](https://github.com/go-gitea/gitea/pull/3)
* Integrated DroneCI for tests and builds [#24](https://github.com/go-gitea/gitea/issues/24)
* Integrated dependency manager [#29](https://github.com/go-gitea/gitea/issues/29)
* Embedded bindata optionally [#30](https://github.com/go-gitea/gitea/issues/30)
* Integrated pagination for releases [#73](https://github.com/go-gitea/gitea/pull/73)
* Autogenerate version on every build [#91](https://github.com/go-gitea/gitea/issues/91)
* Refactored Docker container [#104](https://github.com/go-gitea/gitea/issues/104)
* Added short-hash support for downloads [#211](https://github.com/go-gitea/gitea/issues/211)
* Display tooltip for downloads [#221](https://github.com/go-gitea/gitea/issues/221)
* Improved HTTP headers for issue attachments [#270](https://github.com/go-gitea/gitea/pull/270)
* Integrate public as bindata optionally [#293](https://github.com/go-gitea/gitea/pull/293)
* Integrate templates as bindata optionally [#314](https://github.com/go-gitea/gitea/pull/314)
* Inject more ENV variables into custom hooks [#316](https://github.com/go-gitea/gitea/issues/316)
* Correct LDAP login validation [#342](https://github.com/go-gitea/gitea/pull/342)
* Integrate conf as bindata optionally [#354](https://github.com/go-gitea/gitea/pull/354)
* Serve video files in browser [#418](https://github.com/go-gitea/gitea/pull/418)
* Configurable SSH host binding [#431](https://github.com/go-gitea/gitea/issues/431)
* MISC
* Forked from Gogs and renamed to Gitea
* Catching more errors with logs
* Fixed all linting errors
* Made the go linter entirely happy
* Really integrated vendoring
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ Before sending code out for review, run all the tests for the whole tree to make

Changes to Gitea must be reviewed before they are accepted, no matter who makes the change even if it is an owner or a maintainer. We use GitHub's pull request workflow to do that and we also use [LGTM](http://lgtm.co) to ensure every PR is reviewed by at least 2 maintainers.

Please try to make your pull request easy to review for us. Please read the "[How to get faster PR reviews](https://github.com/kubernetes/kubernetes/blob/master/docs/devel/faster_reviews.md)" guide, it has lots of useful tips for any project you may want to contribute. Some of the key points:
Please try to make your pull request easy to review for us. Please read the "[How to get faster PR reviews](https://github.com/kubernetes/community/blob/master/contributors/devel/faster_reviews.md)" guide, it has lots of useful tips for any project you may want to contribute. Some of the key points:

* Make small pull requests. The smaller, the faster to review and the more likely it will be merged soon.
* Don't make changes unrelated to your PR. Maybe there are typos on some comments, maybe refactoring would be welcome on a function... but if that is not related to your PR, please make *another* PR for that.
Expand Down
6 changes: 2 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@ RUN apk update && \
-s /bin/bash \
-u 1000 \
-G git \
git
git && \
echo "git:$(date +%s | sha256sum | base64 | head -c 32)" | chpasswd

ENV USER git
ENV GITEA_CUSTOM /data/gitea
Expand All @@ -38,7 +39,4 @@ ENTRYPOINT ["/usr/bin/entrypoint"]
CMD ["/bin/s6-svscan", "/etc/s6"]

COPY docker /

COPY public /app/gitea/public
COPY templates /app/gitea/templates
COPY gitea /app/gitea/gitea
6 changes: 2 additions & 4 deletions Dockerfile.rpi
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@ RUN apk update && \
-s /bin/bash \
-u 1000 \
-G git \
git
git && \
echo "git:$(date +%s | sha256sum | base64 | head -c 32)" | chpasswd

ENV USER git
ENV GITEA_CUSTOM /data/gitea
Expand All @@ -38,7 +39,4 @@ ENTRYPOINT ["/usr/bin/entrypoint"]
CMD ["/bin/s6-svscan", "/etc/s6"]

COPY docker /

COPY public /app/gitea/public
COPY templates /app/gitea/templates
COPY gitea /app/gitea/gitea
1 change: 1 addition & 0 deletions MAINTAINERS
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
Alexey Makhov <amakhov@avito.ru> (@makhov)
Andrey Nering <andrey.nering@gmail.com> (@andreynering)
Bo-Yi Wu <appleboy.tw@gmail.com> (@appleboy)
Kees de Vries <bouwko@gmail.com> (@Bwko)
Kim Carlbäcker <kim.carlbacker@gmail.com> (@bkcsoft)
LefsFlare <nobody@nobody.tld> (@LefsFlarey)
Expand Down
41 changes: 17 additions & 24 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
DIST := dist
EXECUTABLE := gitea
IMPORT := code.gitea.io/gitea

SHA := $(shell git rev-parse --short HEAD)
DATE := $(shell date -u '+%Y-%m-%d %I:%M:%S %Z')
ifeq ($(OS), Windows_NT)
EXECUTABLE := gitea.exe
else
EXECUTABLE := gitea
endif

BINDATA := $(shell find conf | sed 's/ /\\ /g')
BINDATA := modules/{options,public,templates}/bindata.go
STYLESHEETS := $(wildcard public/less/index.less public/less/_*.less)
JAVASCRIPTS :=

LDFLAGS += -X "code.gitea.io/gitea/modules/setting.BuildTime=$(DATE)"
LDFLAGS += -X "code.gitea.io/gitea/modules/setting.BuildGitHash=$(SHA)"
LDFLAGS += -X "main.Version=$(shell git describe --tags --always | sed 's/-/+/' | sed 's/^v//')"

TARGETS ?= linux/*,darwin/*,windows/*
PACKAGES ?= $(shell go list ./... | grep -v /vendor/)
Expand All @@ -19,10 +20,10 @@ SOURCES ?= $(shell find . -name "*.go" -type f)
TAGS ?=

ifneq ($(DRONE_TAG),)
VERSION ?= $(DRONE_TAG)
VERSION ?= $(subst v,,$(DRONE_TAG))
else
ifneq ($(DRONE_BRANCH),)
VERSION ?= $(DRONE_BRANCH)
VERSION ?= $(subst release/v,,$(DRONE_BRANCH))
else
VERSION ?= master
endif
Expand All @@ -34,11 +35,11 @@ all: build
.PHONY: clean
clean:
go clean -i ./...
rm -rf $(EXECUTABLE) $(DIST)
rm -rf $(EXECUTABLE) $(DIST) $(BINDATA)

.PHONY: fmt
fmt:
go fmt $(PACKAGES)
find . -name "*.go" -type f -not -path "./vendor/*" | xargs gofmt -s -w

.PHONY: vet
vet:
Expand Down Expand Up @@ -91,6 +92,11 @@ build: $(EXECUTABLE)
$(EXECUTABLE): $(SOURCES)
go build -v -tags '$(TAGS)' -ldflags '-s -w $(LDFLAGS)' -o $@

.PHONY: docker
docker:
docker run -ti --rm -v $(CURDIR):/srv/app/src/code.gitea.io/gitea -w /srv/app/src/code.gitea.io/gitea -e TAGS="$(TAGS)" webhippie/golang:edge make clean generate build
docker build -t gitea/gitea:latest .

.PHONY: release
release: release-dirs release-build release-copy release-check

Expand All @@ -116,19 +122,6 @@ release-copy:
release-check:
cd $(DIST)/release; $(foreach file,$(wildcard $(DIST)/release/$(EXECUTABLE)-*),sha256sum $(notdir $(file)) > $(notdir $(file)).sha256;)

.PHONY: bindata
bindata: modules/bindata/bindata.go

.IGNORE: modules/bindata/bindata.go
modules/bindata/bindata.go: $(BINDATA)
@which go-bindata > /dev/null; if [ $$? -ne 0 ]; then \
go get -u github.com/jteeuwen/go-bindata/...; \
fi
go-bindata -o=$@ -ignore="\\.go|README.md|TRANSLATORS" -pkg=bindata conf/...
go fmt $@
sed -i.bak 's/confLocaleLocale_/confLocaleLocale/' $@
rm $@.bak

.PHONY: javascripts
javascripts: public/js/index.js

Expand All @@ -144,4 +137,4 @@ public/css/index.css: $(STYLESHEETS)
lessc $< $@

.PHONY: assets
assets: bindata javascripts stylesheets
assets: javascripts stylesheets
Loading