Commit graph

5761 commits

Author SHA1 Message Date
Andrey Nering
635273cea6 Merge pull request #1829 from ethantkoenig/no_branches
Commitless repos should be bare
2017-06-12 11:05:01 -03:00
Kim "BKC" Carlbäcker
b5d2780b22 Merge pull request #1945 from appleboy/master
[ci skip] add 1.1.2 change log.
2017-06-12 15:26:18 +02:00
Jonas Östanbäck
00733b4468 Add myself as a maintainer (#1948) 2017-06-12 08:11:50 -05:00
Bo-Yi Wu
884c60480d
[ci skip] add 1.1.2 change log.
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
2017-06-12 17:07:52 +08:00
Jonas Östanbäck
ad70af1248 Add repo fork swagger (#1941) 2017-06-12 08:59:51 +08:00
Andrey Nering
91f27bf9bd Merge pull request #1940 from cez81/discord_links
Update links to Discord server
2017-06-11 19:41:08 -03:00
Jonas Östanbäck
cc5484de10 Update links to Discord server 2017-06-11 19:42:08 +02:00
Ethan Koenig
9fbdd7d787 Fix engine bug in getIssueByID (#1934) 2017-06-11 14:39:12 +08:00
Ethan Koenig
e0a63a20e0 Fix errors caused by force push (#1927) 2017-06-10 21:59:13 -05:00
Dennis Keitzel
96b4780727 Gracefully handle bare repositories on API operations. (#1932)
Signed-off-by: Dennis Keitzel <github@pinshot.net>
2017-06-10 21:57:28 -05:00
silverwind
f2fcd9dcd8 Support CRLF when splitting code lines for display (#1862)
* Support CRLF when splitting code lines for display

* refactor, fix mixed match

* fmt

* split on both LF and CRLF, use raw literals in regexes

* simplify
2017-06-10 23:20:25 +08:00
Bo-Yi Wu
446a41d595 [ci skip] update discord badge. (#1930)
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
2017-06-10 21:38:00 +08:00
Lunny Xiao
65b6301ea2 Change join chat from gitter to discord (#1929) 2017-06-10 07:40:56 -05:00
Ethan Koenig
23d0735f90 Absolute path for setting.CustomConf 2017-06-09 22:27:13 -04:00
Kim "BKC" Carlbäcker
d3efca3982 Merge pull request #1926 from go-gitea/bkcsoft-update-changelog
Update changelog with v1.1.1
2017-06-10 03:07:09 +02:00
Ethan Koenig
61716bd8f7 Display URLs in integration test logs (#1924) 2017-06-09 19:41:36 -05:00
Ethan Koenig
6d613fb28e No highlighting for .txt files (#1922) 2017-06-09 19:39:16 -05:00
Kim "BKC" Carlbäcker
a5444fb3db Update changelog with v1.1.1 2017-06-10 02:10:25 +02:00
Ethan Koenig
e9b1b908ee Fix setting.AppPath for integration tests 2017-06-09 15:42:48 -04:00
Kim "BKC" Carlbäcker
4a3f40460b Don't run 'make release' on PRs (#1908) 2017-06-09 09:52:23 +08:00
Ethan Koenig
73836ce8c4 Fix ghost user bug (#1913)
Fix bug where unassigned issues would appear to be assigned to a ghost user
2017-06-09 09:51:31 +08:00
Jonas Östanbäck
b1b8c5e9f4 Set TMPDIR enviroment variable for dump command (#1915) 2017-06-08 19:24:15 -05:00
Mura Li
662b8bc2a2 Add integration test for file editing (#1907) 2017-06-08 19:15:41 +08:00
Ethan Koenig
afe1f1c4af Fix 500 in public activity page (#1901) 2017-06-08 03:48:49 -05:00
Ethan Koenig
9ddc35e343 Cache ctx.User in retrieveFeeds (#1902) 2017-06-08 10:11:41 +08:00
Dan Magnus Lindvall
ff7424179e Delete Public SSH Key tmp file after calculating fingerprint (#1855)
* Delete public key tmp file after calculating fingerprint

Signed-off-by: Magnus Lindvall <magnus@dnmgns.com>

* Move line

Signed-off-by: Magnus Lindvall <magnus@dnmgns.com>

* Remove defer statement

Signed-off-by: Magnus Lindvall <magnus@dnmgns.com>

* Readd defer statement and move remove

Signed-off-by: Magnus Lindvall <magnus@dnmgns.com>

* Delete space

Signed-off-by: Magnus Lindvall <magnus@dnmgns.com>
2017-06-08 10:08:22 +08:00
Andrey Nering
65cf6cc848 Merge pull request #1905 from ethantkoenig/fix/org_api_auth
Require token before checking membership/ownership
2017-06-07 16:49:52 -03:00
Andrey Nering
a70073e768 Merge pull request #1904 from ethantkoenig/fix/org_api
Bug fixes for org member API
2017-06-07 16:49:33 -03:00
Andrey Nering
815715e5a2 Merge pull request #1896 from typeless/add-integration-test-for-forking
Add integration test for repository forking
2017-06-07 15:55:12 -03:00
Andrey Nering
4bc7240eee Merge pull request #1903 from camlafit/patch-1
A missing / to provide a correct endpoint
2017-06-07 15:50:13 -03:00
Ethan Koenig
971e3a35c1 Require token before checking membership/ownership 2017-06-07 12:20:32 -04:00
Ethan Koenig
f38842320e Bug fixes for org member API 2017-06-07 12:10:35 -04:00
camlafit
952cb8046f A missing / to provide a correct endpoint
solve #1899
2017-06-07 17:57:28 +02:00
Mura Li
30a831698e Add integration test for repository forking 2017-06-07 20:02:37 +08:00
Jonas Östanbäck
d9a8eff2de Send mails as HTML as default. Setting for send as plain text. (#1648)
* Send mails as HTML as default. Setting for send as plain text.
 * Add new option SendAsPlainText. remove EnableHTMLAlternative
 * Send HTML mails as default
 * Add html check if html2text should be performed

* Send only multipart or plain. Add deprication warning for ENABLE_HTML_ALTERNATIVE

* Still use ENABLE_HTML_ALTERNATIVE for backward compatibility

* Changed to not ignore html2text errors
2017-06-07 09:14:31 +08:00
Andrey Nering
295f560a12 Merge pull request #1892 from sapk-fork/update-git
Update code.gitea.io/git
2017-06-06 16:35:05 -03:00
Antoine GIRARD
0cf89a83c1
Update code.gitea.io/git 2017-06-06 19:36:48 +02:00
Sandro Santilli
f6b58964d7 Include formatting check to the make test (and thus also check) rule (#1366)
* Include formatting check to the `make check` rule

... and give it its own standalone target too (make fmt-check)

Show diff on fmt-check failure
Do not allow running "fmt-check" with incompatible go version
Also simplify the `fmt` rule

* Forbid running "make fmt" with Go version != 1.7 or 1.8

* Ignore bindata.go for spelling and formatting checks

also remove duplicated variable assignment for GOFILES

* Run `make fmt`
2017-06-06 08:53:16 -05:00
Phil Hopper
6ec07a6bd7 Make LocalCopyPath a setting instead of a hard-coded path (#1881) 2017-06-06 04:09:54 -05:00
Ethan Koenig
cbdd5f787c Center-aligned login topbar (#1880)
* Center-aligned login topbar

* Center-align OpenID login
2017-06-06 15:05:06 +08:00
Ethan Koenig
ca9169fbe9 Migration to fix existing owner team units (#1873) 2017-06-05 05:40:25 -05:00
silverwind
ae922afa2d Prevent accidential selection of line numbers in code view (#1860) 2017-06-05 02:52:35 -05:00
Bo-Yi Wu
703d18e50d feat: add check misspelling (#1877) 2017-06-05 02:49:46 -05:00
Andrey Nering
ed31dff5ab Merge pull request #1874 from ethantkoenig/typo/issue_test
Fix misspelled variables
2017-06-04 17:10:40 -03:00
Andrey Nering
858126bca1 Merge pull request #1875 from ethantkoenig/test/unused
Run unused test
2017-06-04 17:10:10 -03:00
Ethan Koenig
9f9289fc68 Run unused test 2017-06-04 14:28:17 -04:00
Ethan Koenig
1a09afc729 Fix misspelled variables 2017-06-04 13:39:08 -04:00
Bo-Yi Wu
e7ae13deef fix: error from mktemp command in MacOS. (#1837)
* fix: error from mktemp command in MacOS.

* [ci skip] udpate temp name.

Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
2017-06-04 03:48:18 -05:00
Ethan Koenig
023cad4461 gofmt (#1868) 2017-06-04 11:10:16 +08:00
Ethan Koenig
3e74b5cf51 Rename misnamed migration (#1867) 2017-06-04 11:09:50 +08:00