Ethan Koenig
68179dc676
Remove unnecessary function call ( #3109 )
2017-12-08 09:02:34 +08:00
kolaente
7e93434b1c
Merge branch 'master' into master
2017-12-07 10:25:20 +01:00
kolaente
f02fd333c7
Fixed import order
2017-12-07 10:23:49 +01:00
Ethan Koenig
5e4427e4e7
Fix repo indexer and submodule bug ( #3107 )
2017-12-07 15:18:04 +08:00
Sasha Varlamov
311c83ad17
Allow adding collaborators with (fullname) ( #3103 )
...
* Allow adding collaborators with (fullname)
Signed-off-by: Sasha Varlamov <sasha@sashavarlamov.com>
* Refactor username suffix to utils pkg
Signed-off-by: Sasha Varlamov <sasha@sashavarlamov.com>
2017-12-07 15:00:09 +08:00
Sasha Varlamov
7ec6cddd27
Add 'mark all read' option to notifications ( #3097 )
...
* Add 'mark all read' option to notifications
Signed-off-by: Sasha Varlamov <sasha@sashavarlamov.com>
* Fix exported comment
Signed-off-by: Sasha Varlamov <sasha@sashavarlamov.com>
* Format method comments
Signed-off-by: Sasha Varlamov <sasha@sashavarlamov.com>
* Fix exported comment
Signed-off-by: Sasha Varlamov <sasha@sashavarlamov.com>
Format method comments
Signed-off-by: Sasha Varlamov <sasha@sashavarlamov.com>
Tests for reactions (#3083 )
* Unit tests for reactions
* Fix import order
Signed-off-by: Lauris Bukšis-Haberkorns <lauris@nix.lv>
Fix reaction possition when there is attachments (#3099 )
Refactor notifications swap function
* Accept change to drop beforeupdate call
* Update purge notifications error message for consistency
* Drop unnecessary check for mark all as read button
* Remove debugging comment
2017-12-07 13:52:57 +08:00
silverwind
1ed7f18815
Rework button styles on repo and commit page ( #3104 )
2017-12-07 09:26:12 +08:00
Ethan Koenig
54907dfbd1
Fix legacy URL redirects ( #3100 )
2017-12-07 09:09:02 +08:00
Konrad
822c75cc87
Merge remote-tracking branch 'origin/master'
2017-12-06 18:53:00 +01:00
Konrad
e98f92d676
Merge branch 'master' of https://github.com/go-gitea/gitea
2017-12-06 18:51:18 +01:00
kolaente
cdd322f2e8
Merge branch 'master' into master
2017-12-06 18:50:36 +01:00
Konrad
13f0e17159
Fixed using xorm session
2017-12-06 17:22:19 +01:00
kolaente
01f9e6332e
Modified import order
2017-12-06 17:17:37 +01:00
Vlad Temian
469ab99e9a
Delete a user's public key via admin api ( closes #3014 ) ( #3059 )
...
* Delete a user's public key via admin api
* Test admin ssh endpoint for creating a new ssh key
* Adapt public ssh key test to also test the delete operation
* Test that deleting a missing key will result in a 404
* Test that a normal user can't delete another user's ssh key
* Make DeletePublicKey return err
* Update swagger doc
2017-12-06 12:27:10 +02:00
Lauris BH
c7fb6e3087
Fix reaction possition when there is attachments ( #3099 )
2017-12-06 11:17:50 +08:00
Lauris BH
f1d8dda5b4
Tests for reactions ( #3083 )
...
* Unit tests for reactions
* Fix import order
Signed-off-by: Lauris Bukšis-Haberkorns <lauris@nix.lv>
2017-12-05 22:57:01 +02:00
silverwind
3b89ee5501
fix button heights on commits page ( #3091 )
2017-12-05 14:31:33 +08:00
bibaijin
e2968b4c98
add quotation around ports in docker-compose.yml ( #3090 )
2017-12-05 14:03:40 +08:00
Ethan Koenig
03eb47b216
Fix repo links ( #3093 )
2017-12-05 13:52:53 +08:00
kolaente
66433a9549
gofmt
2017-12-04 19:31:45 +01:00
kolaente
25427aee25
Using "sess" instead of "x" when removing a depencency
2017-12-04 19:23:37 +01:00
kolaente
8bcb624b10
Added missing license header
2017-12-04 19:21:38 +01:00
Lunny Xiao
2738effddf
fix redis cache failed ( #3086 )
2017-12-04 23:00:14 +08:00
GiteaBot
0332b8fb18
[skip ci] Updated translations via Crowdin
2017-12-04 14:06:04 +00:00
znegva
f4445510ae
fixed in-page-link in CONTRIBUTING.md ( #3087 )
2017-12-04 16:05:12 +02:00
kolaente
fae44666ec
Merge branch 'master' of https://github.com/go-gitea/gitea
...
# Conflicts:
# models/migrations/migrations.go
# models/migrations/v50.go
2017-12-04 10:48:37 +01:00
Ethan Koenig
c0a7899416
Sort repos in issues dashboard sidebar ( #3072 )
...
* Sort repos in issues dashboard sidebar
* Sort repos by name
2017-12-04 12:39:01 +08:00
Ethan Koenig
3c1b1ca78e
Fix error message sanitiziation ( #3082 )
2017-12-04 03:48:03 +02:00
Lauris BH
5dc37b187c
Add reactions to issues/PR and comments ( #2856 )
2017-12-04 01:14:26 +02:00
Ethan Koenig
e59adcde65
Use httptest in integration tests ( #3080 )
2017-12-04 00:46:01 +02:00
techknowlogick
993b86628b
Minor copy changes ( #3074 )
...
* Minor copy changes
Fixes #3058
* Use TrN for translations that depend on count
Fix minor type with branches count
2017-12-03 22:52:30 +02:00
kolaente
9dd0cb18a7
Fixed misspell
2017-12-03 18:07:48 +01:00
kolaente
d0baadc9c3
gofmt
2017-12-03 18:04:22 +01:00
kolaente
f61ba0f403
gofmt
2017-12-03 17:56:59 +01:00
Konrad
9af3aae2f3
Merge branch 'master' of https://github.com/go-gitea/gitea
2017-12-03 17:45:55 +01:00
kolaente
3566e9e4a2
Added tests for issue dependencies
2017-12-03 17:45:43 +01:00
Ethan Koenig
ab62da283a
Fix avatar URLs ( #3069 )
...
* Fix avatar URLs
* import order
2017-12-03 19:55:13 +08:00
Piotr Orzechowski
7bab3d2fb1
Enable content trust when building image ( #2972 )
2017-12-03 18:21:10 +08:00
GiteaBot
6d99840d1f
[skip ci] Updated translations via Crowdin
2017-12-03 05:31:04 +00:00
Ethan Koenig
a0964775ab
Sanitize logs for mirror sync ( #3057 )
2017-12-03 13:29:41 +08:00
Ethan Koenig
3163abedd6
Fix ref parsing in commit messages ( #3067 )
2017-12-03 10:20:12 +08:00
techknowlogick
b0971ae37c
Reduce overhead of upgrades for users with custom stylesheets/JS ( #3051 )
2017-12-03 02:26:06 +02:00
silverwind
4947cfb7b0
Remove box-shadow from UI, fix dashboard issue ( #3065 )
2017-12-03 01:16:35 +02:00
Lunny Xiao
ef5364950b
fix issue list branch link broken ( #3061 )
2017-12-02 21:57:47 +02:00
silverwind
d44aa831f3
Convert tabs to spaces in .less files ( #3064 )
2017-12-02 21:48:43 +02:00
silverwind
f9db60e3bd
Adjust branch button size ( #3063 )
2017-12-02 19:57:51 +02:00
kolaente
1fded52044
Merge branch 'master' of https://github.com/go-gitea/gitea
...
# Conflicts:
# public/js/index.js
2017-12-02 18:29:32 +01:00
kolaente
78dd6c1583
Moved checking if dependencies are enabled to issue_dependency.go
2017-12-02 18:25:12 +01:00
silverwind
8cd616e977
Fix misalignment issue in repo header ( #3062 )
2017-12-02 19:20:52 +02:00
Lunny Xiao
b3d5ba6f90
Fix missing password length check when change password ( #3039 )
...
* fix missing password length check when change password
* add tests for change password
2017-12-02 19:11:22 +02:00