5410 Commits

Author SHA1 Message Date
Kim "BKC" Carlbäcker
cc6b3f60c6 Fix displaying commits and files of PR created from now deleted fork ()
Fix displaying commits and files of PR created from now deleted fork
2017-06-22 19:40:47 +02:00
Lunny Xiao
228247511a repo/editor: fix breadcrumb path cuts parent dirs () () 2017-06-22 23:30:47 +08:00
Lunny Xiao
75b5be236a Display config file path on admin panel () 2017-06-22 08:21:56 -05:00
Mike Fellows
32f1c41f28 ROOT_URL setting use the default as shown in conf/app.ini ()
The well commented conf/app.ini file that comes with the code shows the
ROOT_URL (i.e. setting.AppURL) as:

    ROOT_URL = %(PROTOCOL)s://%(DOMAIN)s:%(HTTP_PORT)s/

However the installed custom/conf/app.ini file does not include this setting as
shown, and the default in the setting module was hard coded to
http://localhost:3000/ instead of what is shown above.

With this change the ROOT_URL will default to what is shown above if it is not
set in the custom/conf/app.ini.

Of course it is still possible to override the default by adding the ROOT_URL
setting to your custom/conf/app.ini file as usual.

Signed-off-by: Mike Fellows <mike.fellows@shaw.ca>
2017-06-22 15:35:14 +08:00
Jonas Östanbäck
2852cca99e Add discourse link () 2017-06-22 09:07:13 +08:00
Ethan Koenig
902a749fd9 Fix fast-forward PR bug () 2017-06-22 09:06:57 +08:00
iszla
826c606952 Keep sort when switching page () 2017-06-22 09:06:21 +08:00
Lunny Xiao
d71fad2ab7 Fix and fix issue comments hidden ()
* revert  and fix issue comments hidden

* fix 

* fix import

* improve comment type

* reduce unnecessary join

* fix comment on FindCommentsOptions
2017-06-21 09:00:44 +08:00
Lauris BH
0a5dc640a1 Make branch deletion URL more like GitHub's, fixes ()
* Make branch deletion URL more like GitHub's, fixes 

* Add PR branch deletion integration test

* Do not allow deleting protected branch

* Change http error code to 403 if user has no write rights to repository

* Add check to not panic if forked repository has alrady been deleted
2017-06-21 09:00:03 +08:00
Lauris BH
6db387a21e Refactor session close as xorm already does everything needed internally () 2017-06-21 08:57:05 +08:00
Lauris Bukšis-Haberkorns
63504bf132
Fix displaying commits and files of PR created from now deleted forked repository 2017-06-21 01:25:38 +03:00
Mura Li
754482bf5d Add integration test for repository migration () 2017-06-20 19:23:16 +08:00
Ethan Koenig
75f166b6b9 Update code.gitea.io/git () 2017-06-20 13:05:32 +08:00
Lauris BH
165cf33771 Wrong PR merge commit ID saved () 2017-06-19 17:37:11 +08:00
Mura Li
4d2ea7dc41 Add integration test for issue creating () 2017-06-18 21:25:58 +08:00
Ethan Koenig
255adc40ae Don't show non-comments in comments API () 2017-06-18 17:06:17 +08:00
Ethan Koenig
4df1a24096 Let not-logged-in users view releases () 2017-06-18 11:38:24 +08:00
Ethan Koenig
6e452c4da7 Update code.gitea.io/git () 2017-06-18 08:30:23 +08:00
Bo-Yi Wu
b7812be33a fix misspell ()
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
2017-06-18 08:30:04 +08:00
Bo-Yi Wu
90f9bb12c6 fix golint error and rename func for suggestion. ()
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
2017-06-17 11:29:59 -05:00
Antoine GIRARD
6233e88f7f Use testing benchmark interface () 2017-06-17 23:01:03 +08:00
Bo-Yi Wu
d7570895cc update drone discord plugin to 0.0.4 version ()
* update drone discord plugin to 0.0.3 version

Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>

* update to 0.0.4

Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>

* update sig file.

Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
2017-06-17 19:12:43 +08:00
Lauris BH
1a906f800d Fix GPG email checking to be case insensitive () 2017-06-17 18:56:40 +08:00
Trolli Schmittlauch
6678593b3c fix typo () 2017-06-17 12:54:37 +08:00
Lunny Xiao
e2ec4b7c23 fix bu ong normal user visit public repo () 2017-06-17 12:53:51 +08:00
Ethan Koenig
8fc64741d9 Fix deleted milestone bug ()
* Fix deleted milestone bug

* Use locale for ghost milestone name

* Fix pointer bug
2017-06-17 12:51:28 +08:00
Ethan Koenig
ce9b86082c Consolidate boilerplate in integration tests () 2017-06-17 12:49:45 +08:00
Bo-Yi Wu
a3868ef536 update drone sig file ()
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
2017-06-15 21:32:14 -05:00
Andrey Nering
b7d597e40c Merge pull request from ethantkoenig/log/integration_test
Set console to debug for integration tests
2017-06-15 14:57:29 -03:00
Antoine GIRARD
2bcd9471c9 Separate generate swagger + fix sed os specific ()
* Separate generate-swagger

* Remove go generate rules

* Add missing definition replacement + remove use of -i sed flag

for compatibility with mac os default sed version.
This is a little hacky a better solution could be use.

* Use custom SED_INPLACE

depending of platform detection

* Use SED_INPLACE for swagger-ui also
2017-06-15 08:51:23 -05:00
Ethan Koenig
d1e4af66c1 Set console to debug for integration tests 2017-06-15 08:12:30 -04:00
Mura Li
01322af2e8 Add integration test for pull-request merge () 2017-06-15 19:20:39 +08:00
Shuanglei Tao
13f0e1255a Fix typo () 2017-06-15 17:38:54 +08:00
Ethan Koenig
792cde7081 Coverage reports for integration tests () 2017-06-15 17:38:33 +08:00
Mura Li
033aaf4b38 Add pull-create integration test () 2017-06-15 02:01:51 -05:00
Kim "BKC" Carlbäcker
2691673588 send notification if status changed ()
send notification if status changed
2017-06-15 08:56:23 +02:00
Bo-Yi Wu
0d560f3441
send notification if status changed
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
2017-06-15 14:46:08 +08:00
Ethan Koenig
8fcda0442e Fix search by issue type ()
* Fix search by issue type
2017-06-15 05:09:03 +02:00
Kim "BKC" Carlbäcker
bf48c8ebdd SQLite has a query timeout. Hopefully fixes most 'database locked' errors ()
* SQLite has a query timeout. Fixes 'database locked' errors
2017-06-15 04:51:17 +02:00
Lunny Xiao
31b5e9177f fix collborators lack of units on orgnization repositories ()
* fix collborators lack of units on orgnization repositories

* also change log level to debug
2017-06-15 04:50:12 +02:00
Bo-Yi Wu
5b0cbf3788 switch gitter to discord for drone. ()
* switch gitter to discord for drone.

Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>

* add event

Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>

* only notify build fail message.

Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
2017-06-15 10:47:42 +08:00
Ethan Koenig
57cabb3ad3 Fix diff of renamed and modified file () 2017-06-14 04:07:09 -05:00
Antoine GIRARD
274149dd14 Switch to keybase go-crypto (for some elliptic curve key) + test ()
* Switch to keybase go-crypto (for some elliptic curve key) + test

* Use assert.NoError 

and add a little more context to failing test description

* Use assert.(No)Error everywhere 🌈

and assert.Error in place of .Nil/.NotNil
2017-06-14 08:43:43 +08:00
Ethan Koenig
5e92b82ac6 Fix uppercase default branch bug () 2017-06-14 08:42:36 +08:00
Ethan Koenig
96152c38b1 Fix bug in Action.loadRepo() () 2017-06-14 08:37:50 +08:00
silverwind
0168b7073d Use monospace font in githook editor () 2017-06-13 10:48:49 +08:00
Kim "BKC" Carlbäcker
889409ba31 Fix setting.AppPath for integration tests ()
Fix setting.AppPath for integration tests
2017-06-13 04:20:32 +02:00
shakeme
e8c63e21af Fix missing backslash in Dockerfile.rpi () 2017-06-13 10:07:11 +08:00
Ethan Koenig
b38b61bbc1 Fix import order () 2017-06-12 10:01:09 -05:00
Andrey Nering
635273cea6 Merge pull request from ethantkoenig/no_branches
Commitless repos should be bare
2017-06-12 11:05:01 -03:00