1566 Commits (252adc912dfdcfb4e4d235a020844db351556d84)

Author SHA1 Message Date
Lunny Xiao 73710c00a8 bug fixed branch name for pushupdate (#380) 8 years ago
Denis Denisov f0a989c1d0 Correction LDAP validation (#342)
* Correction LDAP username validation

As https://msdn.microsoft.com/en-us/library/aa366101(v=vs.85).aspx describe spaces should not be in start or at the end of username but they can be inside the username. So please check my solution for it.

* Check for zero length passwords in LDAP module.

According to https://tools.ietf.org/search/rfc4513#section-5.1.2 LDAP client should always check before bind whether a password is an empty value. There are at least one LDAP implementation which does not return error if you try to bind with DN set and empty password - AD.

* Clearing the login/email spaces at the [start/end]
8 years ago
Bwko abcd39f7d5 In the wiki title replace tab with a space (#371) 8 years ago
Bwko cbcb4361d5 Fixes issue #283
Delete old temp local copy before we create a new temp local copy
8 years ago
Ethan Koenig 401a8db0ed Remove stale comment in models/repo.go (#366) 8 years ago
Ethan Koenig 04b9a7e7a2 Bug fixes for repo permissions in API
Also move duplicated code into repo.APIFormat(..)
8 years ago
Thomas Boerger 83ed234472 Integrate templates into bindata optionally (#314)
Integrated optional bindata for the templates
8 years ago
Kim "BKC" Carlbäcker d07c955e2a Fix regression in PR-API #248 (#349)
* Fix #344 (regression in PR-API #248)
8 years ago
Bwko 0118b275b6 Fix for #320
Suppress the error when we're removing a file that may not exist
8 years ago
Denis Denisov c8f300b2cd Safe compare password (timing attack) (#338) 8 years ago
Kim "BKC" Carlbäcker 0f05470cb8 [API] Pull Requests (#248) 8 years ago
Kim "BKC" Carlbäcker e8e0539b45 Linting 8 years ago
Kim "BKC" Carlbäcker e6cfccdd40 GitHub API Compliance (& linting) 8 years ago
Bwko 4ff0db0246 Catch os... errors 8 years ago
Bwko 5ab85372da Added rel="noopener" to target="_blank" hrefs (#327)
* Added rel="noopener" to target="_blank" hrefs

* Replaced gogs.io/docs with docs.gitea.io
8 years ago
Lunny Xiao 646e02b521 typo 8 years ago
Thomas Boerger 6dd2c3b2db
Fixed linting errors for variable definitions 8 years ago
Kim "BKC" Carlbäcker 42ec5ce740 Fix breakage from vendor-update 8 years ago
Kim "BKC" Carlbäcker dad806d3ea CreateBranch-hook has shasum. Use the full ref for fetching shasum 8 years ago
Kim "BKC" Carlbäcker f364522468 Tag-webhooks are useless without shasums 8 years ago
Andrey Nering fd53028139 Merge pull request #294 from Bwko/Lint/user.go
Lint models/user.go
8 years ago
Bwko bad1bc6518 Lint models/repo.go 8 years ago
Bwko a5aae1c145 Lint models/repo_* 8 years ago
Bwko 9963d61233 Lint models/user.go 8 years ago
Lunny Xiao 27d66855eb golint fixed for models/migrations (#291) 8 years ago
Lunny Xiao 1d0f811399 golint fixed for models/pull.go (#292) 8 years ago
Lunny Xiao 9fc609ce17 golint fixed for models/issue_comment.go 8 years ago
Thomas Boerger 9948f0daaa Merge pull request #285 from lunny/lunny/golint_models_org_team
Golint for models/org_team.go
8 years ago
Lunny Xiao f215d78157 rename all uID -> userID on models/org_team.go 8 years ago
Lunny Xiao bf8d90c5cc golint fixed for models/models.go (#284) 8 years ago
Lunny Xiao 21846d16e5 golint for models/org_team.go 8 years ago
Lunny Xiao ec87a75c00 golint fixed for modules/auth 8 years ago
Bwko a4ece1f223 Fixes typos 8 years ago
Thomas Boerger 5efdccd1d8 Merge pull request #264 from Bwko/lint/org.go
Lint models/org.go
8 years ago
Thomas Boerger 9a984c0d49 Merge pull request #266 from Bwko/lint/repo_mirror
Lint models/repo_mirror.go
8 years ago
Thomas Boerger fe3908d099 Merge pull request #268 from Bwko/lint/repo_branch
Lint models/repo_branch.go
8 years ago
Thomas Boerger e23a9d22e5 Merge pull request #267 from Bwko/lint/ssh_key
Lint models/ssh_key.go
8 years ago
Thomas Boerger 93d527a0a4 Merge pull request #265 from Bwko/lint/access.go
Lint models/access.go
8 years ago
Thomas Boerger 8347a55cc2 Merge pull request #263 from Bwko/lint/user_email
Lint models/user_email.go
8 years ago
Lunny Xiao 94da472717 Golint fixed for modules/setting (#262)
* golint fixed for modules/setting

* typo fixed and renamed UNIXSOCKET to UnixSocket
8 years ago
Bwko 0b9cf10340 Lint models/org.go & models.go 8 years ago
Bwko 7bf7042013 Lint models/repo_mirror.go 8 years ago
Bwko ce8c9ef580 Lint models/repo_branch.go 8 years ago
Bwko 6cde041080 Lint models/ssh_key.go 8 years ago
Bwko 2bb1601d7c Lint models/access.go 8 years ago
Bwko 066f515a47 Lint models/user_email.go 8 years ago
Thomas Boerger 574e49c854 Merge pull request #241 from Bwko/lint/admin.go
Lint models/admin.go
8 years ago
Thomas Boerger 21b7d30174 Merge pull request #245 from Bwko/lint/update&slack
Lint models/update.go, release.go & webhook_slack.go
8 years ago
Thomas Boerger e9c6053b86 Merge pull request #246 from Bwko/fix/typo
Fix typos
8 years ago
Thomas Boerger 3e6f363471 Merge pull request #256 from lunny/lunny/golint_modules_avatar
Golint fixed for modules/avatar
8 years ago
Thomas Boerger 7c5de1e393 Merge pull request #250 from lunny/lunny/golint_modules_markdown
Golint fixed for modules/markdown
8 years ago
Lunny Xiao 3c87c57d96 golint fixed for modules/avatar 8 years ago
Bwko c0ca6644ad Lint/issue &mail (#243)
* Lint models/release.go

* Lint models/ issue_label, issue_mail & mail.go
8 years ago
Bwko 081c2a9395 Lint models/token.go (#244) 8 years ago
Lunny Xiao 76604d8f90 fixed test build error 8 years ago
Bwko 33a2ac3830 Lint models/update.go & webhook_slack.go 8 years ago
Lunny Xiao 304bbd3f25 golint fixed for modules/markdown 8 years ago
Bwko d8e11a8eaa Lint models/admin.go 8 years ago
Bwko ece19f4a5e Lint models/release.go 8 years ago
Lunny Xiao 450969c158 test database is connect OK after db config initialized (#239) 8 years ago
Sandro Santilli 1c3044b873 Lint models/login_source.go 8 years ago
Thomas Boerger 0a66c2a2d9 Merge pull request #234 from strk/issue-lint
Lint issue.go
8 years ago
Thomas Boerger e512411863 Merge pull request #233 from strk/git_diff-lint
Lint git_diff.go
8 years ago
Thomas Boerger 03b6880089 Merge pull request #232 from strk/error-lint
Lint error.go
8 years ago
Sandro Santilli 8aa960f129 Actually document the missing bits 8 years ago
Sandro Santilli 3fba29c571 Expand documentations 8 years ago
Sandro Santilli 0a61d54a9c Expand documentation a bit more 8 years ago
Sandro Santilli dd9d0f3732 Lint action.go 8 years ago
Sandro Santilli 170f2e98cc Lint error.go
This was done semi-programmatically, not really documenting anything
8 years ago
Sandro Santilli 6e644726d0 Lint git_diff.go
Semi-automatic linting (don't really document things)
8 years ago
Sandro Santilli 4dd1eb57bd Lint issue.go 8 years ago
stroucki 3a3782bb7f Handle ssh key import better (#224)
* Handle user ssh key input better

ssh_key: when user submitted keys had a newline at the end, strings.Split
would have created a slice with an empty last element, and the key type
check would be incorrect. Perhaps a better way is to look for 'ssh-rsa' or
'ssh-dsa' at the beginning of the string, but this is simple.

* ssh_key: correct indentation
8 years ago
Sandro Santilli c25063d834 Lint webhook.go, unexports simpleMarshalJSON (#198) 8 years ago
Bwko 2a449bd4b1 Fix typos 8 years ago
Ethan Koenig 0834e492c0 API endpoints for stars 8 years ago
Bo-Yi Wu d9ffe99972 fix variable assigned and not used.
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
8 years ago
Sandro Santilli 592a4ec4d3 Fix lint errors in models/wiki (just add methods docs)
See #70
8 years ago
Andrey Nering 739f07c98e Remember diff view style (#163) 8 years ago
LefsFlare 3ef022b071 Fixes possible vulnerabilities with keyword hijacking (#20)
- Added public entries to reserved keywords list
- Rename variables
- Derped comment
8 years ago
Lunny Xiao 3dedc027ac Bug fixed for issues (#156) 8 years ago
Lunny Xiao 0baaa7728a bug fixed caused by #153 (#154) 8 years ago
Lunny Xiao 30a37311f8 use in instead string join (#155) 8 years ago
Lunny Xiao 555d8b16cb fixed bug #151 caused Find should be Get (#153) 8 years ago
Lunny Xiao ade6d4a20f optimization on database IN 8 years ago
Lunny Xiao 9bf28a2799 bug fixed for 500 caused by get org users (#149) 8 years ago
Thibault Meyer ddee4c8b58
Normalize files with gofmt 8 years ago
Sandro Santilli a1c5f02444 Fix import path of go-sdk (#141)
From code.gitea.io/go-sdk/gitea
  To code.gitea.io/sdk/gitea
8 years ago
Thibault Meyer b12f2a5916
Remove unused import 8 years ago
Thibault Meyer b0ddced2b5
Merge remote-tracking branch 'upstream/master' into feature/rewrite-xorm-queries
# Conflicts:
#	models/git_diff.go
#	models/issue.go
#	models/org.go
#	models/pull.go
#	models/repo.go
8 years ago
Thibault Meyer a4454f5d0f
Rewrite XORM queries 8 years ago
Sandro Santilli 4247304f5a Update import paths from github.com/go-gitea to code.gitea.io (#135)
- Update import paths from github.com/go-gitea to code.gitea.io
- Fix import path for travis

See https://docs.travis-ci.com/user/languages/go#Go-Import-Path
8 years ago
Matthias Loibl 94b2747375 Remove go version from build tags (#133) 8 years ago
Lunny Xiao 1b238fe4d5 Merge pull request #121 from joubertredrat/feature-last-login
Last Login for admin manage your users
8 years ago
Lunny Xiao c6c840faf7 Merge pull request #129 from lunny/lunny/SQL_instead_Sql
use x.SQL instead of x.Sql
8 years ago
Thibault Meyer 3a10a0c1ca
Ordering organizations and users by name 8 years ago
Lunny Xiao 7dcc3bc3d7 use x.SQL instead of x.Sql 8 years ago
Joubert RedRat f91cbf0fed Support to last login feature 8 years ago
Lunny Xiao c511f1c6c3 Merge pull request #18 from LefsFlarey/issue/3675
Fix 500 error caused by deleted users on issues (#3675)
8 years ago
Flare a6c487f6ca
Fix err not being nil 8 years ago
Lunny Xiao 5667d4daae Merge pull request #73 from bkcsoft/gt/2164-release-pagination
Add Pagination to Releases-page (and de-duplicate pagination templates)
8 years ago
Sandro Santilli 864d1b1f9f Fix type in unused constant name (#111)
* Write LDAP, SMTP, PAM, DLDAP back to all uppercase

* Fix type in unused constant name

* Other MixCased fixes

* Complete MixerCasing of template constants

* Re uppercase LTS and LDAPS suffixes

* Uppercase JSON suffix in constant names

* Proper case LoginNoType

* Prefix unexported template path constants with "tpl"
8 years ago
Sandro Santilli aadd7dcdc3 And others 8 years ago
Sandro Santilli b3828e38a5 more 8 years ago
Sandro Santilli 05fd9d3f09 Security protocols 8 years ago
Sandro Santilli 7612b5ec40 More mixage 8 years ago
Sandro Santilli 64196d4036 More overlooks 8 years ago
Sandro Santilli f14232d2e9 This one I overlooked before 8 years ago
Sandro Santilli 60c82a8780 More... 8 years ago
Sandro Santilli f6a11e0de1 More MixedCase consts 8 years ago
Sandro Santilli f388661bda ACCESS_MODE_* -> AccessMode* 8 years ago
Sandro Santilli 0b62aeb495 More MixedCase consts 8 years ago
Sandro Santilli 80eea77953 Use MixedCase constant names
See https://github.com/golang/go/wiki/CodeReviewComments#mixed-caps
8 years ago
Thomas Boerger 5d430c9e68 Merge pull request #108 from go-gitea/go-sdk
Replaced gogits go-gogs-client with go-sdk
8 years ago
Sandro Santilli ee963f67c1 Merge pull request #103 from strk/GOGS_drop
Replace GOGS with GITEA in variable names
8 years ago
Joubert RedRat 28bee28102 Replace Gogs to Gitea in installation options 8 years ago
Thomas Boerger 4c6c16f358
Replaced go-gogs-client with go-sdk imports 8 years ago
Sandro Santilli 30be1f4826 Fix typo in unused constant name 8 years ago
Sandro Santilli b7263f31a5 Replace GOGS with GITEA in variable names
Still use GOGS_WORK_DIR and GOGS_CUSTOM env variables
as a fallback if the equivalent GITEA_* are not set,
warning user about the need for change.

Does not change "gogs" to "gitea" in webhook type name
Because "gogs" hook type is part of the API (routes) and used
in templates...

Closes #87
8 years ago
Kim "BKC" Carlbäcker 86fb1a0cb1 Add Pagination to Releases-page 8 years ago
Sandro Santilli 6e4252dad4 Replace gogits/git-module dependency with go-gitea/git (#94)
* Replace gogits/git-module dependency with go-gitea/git

Fixes #92

* Remove git alias for git module import (not needed)
8 years ago
LefsFlare 55a4d46f5d Adds checking of reserved keywords against team names (#22) 8 years ago
Thibault Meyer fe8bfa54de Ordering team by name ascending except for 'Owners' (#48) 8 years ago
Matthias Loibl 953c099428 Add missing version & gogs package 8 years ago
Matthias Loibl 1f44b01e2a Fix imports found by goimports. 8 years ago
Thomas Boerger 648c6fdd60
Vet complains about "should have signature MarshalJSON() ([]byte, error)", replaced with custom name 8 years ago
Flare fd6be0d17e
Still print error if user does not exist 8 years ago
Matthias Loibl a4fa889ced Run goimports on the whole project (#34)
Signed-off-by: Matthias Loibl <mail@matthiasloibl.com>
8 years ago
Rémy Boulanouar 8dc49dc114 Implementation of the feature to redirect to an external issue tracker 8 years ago
Rémy Boulanouar 2d68bd1ef9 Change import reference to match gitea instead of gogs (#37) 8 years ago
Sandro Santilli af03d00780 Fix sender of issue notifications
It is the FROM field in mailer configuration that needs be used,
not the USER field, which is for authentication.

Closes https://github.com/gogits/gogs/issues/3615
8 years ago
LefsFlare 2bec8a4f1e Changed interface (#3685) 8 years ago
Flare 1b59e6f910
Fix 500 error caused by deleted users on issues (#3675) 8 years ago
Unknwon 6da55159a2
#3589 LoadRepoConfig after ORM is initialized 8 years ago
Unknwon c50d59874d
#3577 incorrect URL produced by AvatarLink 8 years ago
Unknwon 7c1fbed057 Fix panic when attempt login with non-exist user 8 years ago
Unknwon c2afdf2192 Minor code fix [CI SKIP] 8 years ago
Unknwon 152e715999 models/login_source: code improvement 8 years ago
Unknwon 99c2ae7b35 #3515 use alert instead 500 for duplicated login source name 8 years ago
Unknwon 8516dfcb6c #2018 able to sync now for mirrors
- Refactor code to use sync.UniqueQueue
- Closes #3509
8 years ago
Unknwon c1ecb6c60a modules/sync: add UniqueQueue 8 years ago
Unknwon 43297148b2 modules/sync: rename SingleInstancePool to ExclusivePool 8 years ago
Unknwon 643142acab Web editor: support upload files 8 years ago
Unknwon 28cf0e6aaa #3459 code quality improvement 8 years ago
Thibault Meyer 92fb30c526 Load a set of predefined labels (#3459)
* Can use a predefined set of labels

* Change UI

* Fix HTML file indentation

* Avoid reading file from other directory (security issue)

* Apply a better fix

* Remove not used variable

* Merge upstream/develop

* Do modifications

* Raname

* remove binding + rename variable
8 years ago
LFlare 3738b6399e Fixed typo (#3533)
Git convention has it capitalised.
8 years ago
Unknwon 62b0dc4853 Web editor: fix cannot create new file in subdirectory 8 years ago
Unknwon 579e5e4fee Web editor: disallow edit mirror repository 8 years ago
Unknwon 0114fdcba4 Web editor: improve delete file process 8 years ago
Unknwon dad5c15520 #2901 allow setting preferred licenses
- Closes #3488
8 years ago
Unknwon c30b856d14 #3505 use user’s info for committer and author 8 years ago
Unknwon 13c106af77 label: adjust forecolor boundary 8 years ago
Unknwon ce1e4348da #3521 fix wiki HTTP/S clone URL does not have .wiki suffix 8 years ago
Unknwon 37305a59ca migrations: sync table first 8 years ago
Unknwon bb359a74f1 migrations: set comment updated as created 8 years ago
Unknwon 6b98d58906 #2966 code cleanup 8 years ago
Iwan Budi Kusnanto 8dca9f95fa issues comment API : list, create, edit (#2966)
add `since` query string support to list issue comment
8 years ago
Thibault Meyer f50e568fd1 Fix #3189: Sort labels by name (#3446)
* Fix #3189 #3445: Order labels by name

* Order labels by name on Issues view
8 years ago
Unknwon f8a48ffaad Web editor: improve code quality 8 years ago
Kurt Madel 67fb0fe6a5 added support to set pull_request event from api (#3513) 8 years ago
Unknwon 0b273ac4d5 #3383 code cleanup 8 years ago
Kim "BKC" Carlbäcker 06602a84ff Fix PR-webhook issue where Label-data is stale (#3486) (#3510)
* Fix PR-webhook issue where Label-data is stale

* Conventions \o/

* logs are nice if they're consistent...
8 years ago
Unknwon a00c932bbc General code quality improvement 8 years ago
Unknwon 6f9a95f830 #2246 add HTMLURL to webhook type
- Fill Milestone and Assignee field when available in webhook payload
8 years ago
Unknwon 8bf57be9ba Fix git diff tests 8 years ago
Unknwon b1504ed99a #3464 add diff signs which does not have inline diff 8 years ago
Unknwon 9349def72e #3464 reproduce diff signs
Commited wrong file.
8 years ago
Unknwon 2625193a48 models/repo_editor: improve code quality 8 years ago
Unknwon f3c3258921 Fix repository owner can assign self 8 years ago
Unknwon 4042d1f0c3 models/issue: improve quality and performance of NewIssue function 8 years ago
Unknwon 6c8fcb3af2 #3467 fix clone fail when wiki is empty 8 years ago
Unknwon 94392a7af3 Fix empty repository panic on send test webhook 8 years ago
Unknwon cc647ba9d5 #3461 fix security issue of REAMDE path in create repository 8 years ago
Unknwon 54e0ada9d5 Web editor: improve delete file 8 years ago
Unknwon cd89f6c502 Web editor: improve edit file and diff preview 8 years ago
Unknwon 660e7a178a modules/sync: move sync objects to independent module 8 years ago
Unknwon 15845cb287 Code clean up for new config options 8 years ago
Richard Mahn d0a0239bac Squashed commit of the following:
commit 0afcb843d7ffd596991c4885cab768273a6eb42c
Author: Richard Mahn <richard_mahn@wycliffeassociates.org>
Date:   Sun Jul 31 17:13:29 2016 -0600

    Removed Upload stats as the upload table is just a temporary table

commit 7ecd73ff5535612d79d471409173ee7f1fcfa157
Author: Richard Mahn <richard_mahn@wycliffeassociates.org>
Date:   Sun Jul 31 08:42:41 2016 -0600

    Fix for CodeMirror mode

commit c29b9ab531e2e7af0fb5db24dc17e51027dd1174
Author: Richard Mahn <richard_mahn@wycliffeassociates.org>
Date:   Sun Jul 31 08:03:33 2016 -0600

    Made tabbing in editor use spaces

commit 23af384c53206a8a40e11e45bf49d7a149c4adcd
Author: Richard Mahn <richard_mahn@wycliffeassociates.org>
Date:   Sun Jul 31 07:56:46 2016 -0600

    Fix for data-url

commit cfb8a97591cb6fc0a92e49563b7b764c524db0e9
Merge: 7fc8a89 991ce42
Author: Richard Mahn <richard_mahn@wycliffeassociates.org>
Date:   Sun Jul 31 07:42:53 2016 -0600

    Merge remote-tracking branch 'gogits/develop' into feature-create-and-edit-repo-file

    Conflicts:
    	modules/bindata/bindata.go
    	public/js/gogs.js

commit 7fc8a89cb495478225b02d613e647f99a1489634
Merge: fd3d86c c03d040
Author: Richard Mahn <richard_mahn@wycliffeassociates.org>
Date:   Sun Jul 31 07:40:00 2016 -0600

    Merge branch 'feature-create-and-edit-repo-file' of github.com:richmahn/gogs into feature-create-and-edit-repo-file

commit fd3d86ca6bbc02cfda566a504ffd6b03db4f75ef
Author: Richard Mahn <richard_mahn@wycliffeassociates.org>
Date:   Sun Jul 31 07:39:44 2016 -0600

    Code cleanup

commit c03d0401c1049eeeccc32ab1f9c3303c130be5ee
Author: Richard Mahn <richard_mahn@wycliffeassociates.org>
Date:   Fri Jul 29 15:38:23 2016 -0600

    Code cleanup

commit 98e1206ccf9f9a4503c020e3a7830cf9f861dfae
Author: Richard Mahn <richard_mahn@wycliffeassociates.org>
Date:   Thu Jul 28 18:36:01 2016 -0600

    Code cleanup and fixes

commit c2895dc742f25f8412879c9fa15e18f27f42f194
Author: Richard Mahn <richard_mahn@wycliffeassociates.org>
Date:   Thu Jul 28 18:24:04 2016 -0600

    Fixes per Unknwon's requests

commit 6aa7e46b21ad4c96e562daa2eac26a8fb408f8ef
Merge: 889e9fa ad7ea88
Author: Richard Mahn <richard_mahn@wycliffeassociates.org>
Date:   Thu Jul 28 17:13:43 2016 -0600

    Merge remote-tracking branch 'gogits/develop' into feature-create-and-edit-repo-file

    Conflicts:
    	modules/bindata/bindata.go
    	modules/setting/setting.go

commit 889e9faf1bd8559a4979c8f46005d488c1a234d4
Author: Richard Mahn <richard_mahn@wycliffeassociates.org>
Date:   Fri Jul 22 14:09:18 2016 -0600

    Fix in gogs.js

commit 47603edf223f147b114be65f3bd27bc1e88827a5
Merge: bb57912 cf85e9e
Author: Richard Mahn <richard_mahn@wycliffeassociates.org>
Date:   Fri Jul 22 14:07:36 2016 -0600

    Merge remote-tracking branch 'gogits/develop' into feature-create-and-edit-repo-file

    Conflicts:
    	modules/bindata/bindata.go
    	public/js/gogs.js

commit bb5791255867a71c11a77b639db050ad09c597a4
Author: Richard Mahn <richard_mahn@wycliffeassociates.org>
Date:   Fri Jul 22 14:02:18 2016 -0600

    Update for using CodeMirror mode addon

commit d10d128c51039be19e2af9c66c63db66a9f2ec6d
Author: Richard Mahn <richard_mahn@wycliffeassociates.org>
Date:   Tue Jul 19 16:12:57 2016 -0600

    Update for Edit

commit 34a34982025144e3225e389f7849eb6273c1d576
Merge: fa1b752 1c7dcdd
Author: Richard Mahn <richard_mahn@wycliffeassociates.org>
Date:   Tue Jul 19 11:52:02 2016 -0600

    Merge remote-tracking branch 'gogits/develop' into feature-create-and-edit-repo-file

    Conflicts:
    	modules/bindata/bindata.go

commit fa1b752be29cd455c5184ddac2ffe80b3489763e
Author: Richard Mahn <richard_mahn@wycliffeassociates.org>
Date:   Fri Jul 15 18:35:42 2016 -0600

    Feature for editing, creating, uploading and deleting files
8 years ago
Unknwon dccb0c15b9 Replace convert.To with APIFormat calls 8 years ago
Unknwon 3f7f4852ef #2246 fully support of webhooks for pull request 8 years ago
Unknwon f59d2dd034 Code clean up 8 years ago
Unknwon 5be881756b #3442 add test suites 8 years ago
Thibault Meyer 4296427214 Fix #3437: Cannot connect to PostgreSQL via IPv6 address (#3442)
* Change PostgreSQL connstring parsing to handle IPv6

* Fix used variable

* Remove redundant code + use variable
8 years ago
Unknwon 96f92e6105 Fix email FROM 8 years ago
Unknwon 70fbcd2f27 models: rename EnableTidb to EnableTiDB 8 years ago
Unknwon 5850308a37 #3013 support connect PostgreSQL via unix socket 8 years ago
Unknwon 7e9b42c87d #2780 code clean up 8 years ago
Unknwon 5077408d78 #3233 code cleanup and minor issue fix 8 years ago
Andrew 0885784f13 Wiki mirroring implementation (#3233)
* Implement wiki mirroring, add Update mirrors operation to admin dashboard

* bindata.go update after merge

* Implement checking Git repo endpoint existence, support for BB included

* Remove admin dashboard operation
Fix bindata.go

* Apply gofmt to repo model file

* Try to remove bindata from PR

* Revert accepted wiki names change in favor of better system

* Remove unused imports
8 years ago
Unknwon 0f26f3678a #3279 use doer email for FROM field of issues 8 years ago
Kim Carlbäcker b756806ee9 Add "support" for git-daemon-export-ok (#2940) (#3046)
* add git-daemon-export-ok "support"

* Slight fix to git-daemon-export-ok

* Add error-checking for git-demon-export-ok

* Remove old comments and fixed logging-issues

* Check if git-daemon-export-ok exists or not
8 years ago
lstahlman ea192147ea Add test pull request task on merging a PR. Fixes #3396 (#3425) 8 years ago
Thibault Meyer 8ad92bb8a4 Verify list len before use it with IN (#3423) 8 years ago
Thibault Meyer fc68fb951c Feature #3398: Redefine global mirror interval (#3409)
* add mirror::GLOBAL_INTERVAL on app.ini

* rename key to DEFAULT_INTERVAL

* add key on default app.ini + move code
8 years ago
Unknwon 5448d29b2e #3417 wrong dashboard issue count for create by you 8 years ago
lstahlman 89f71b44f7 Add committer information to API and Webhooks. Also fixes #3271 (#3414) 8 years ago
Unknwon c5d4a9e046 #2907 Add commit timestamp to webhook 8 years ago
Unknwon b0b88d9bc5 #3091 add config option for Git GC 8 years ago
lstahlman 699c71d319 Fix for #3401 Links of pull request comment email should use pulls URL (#3403) 8 years ago
Unknwon e5bf4281b5 #2825 early response 200 when ?go-get=1 8 years ago
Sandro Santilli 90dd0657b5 Add support for federated avatars (#3320)
* Add support for federated avatars

Fixes #3105

Removes avatar fetching duplication code
Adds an "Enable Federated Avatar" checkbox in user settings
(defaults to unchecked)

Moves avatar settings all in the same form, making
local and remote avatars mutually exclusive

Renames UploadAvatarForm to AvatarForm
as it's not anymore only for uploading

* Run gofmt on all modified files

* Move Avatar form in its own page

* Add go-libravatar dependency to vendor/ dir

Hopefully helps with accepting the contribution.
See also #3214

* Revert "Add go-libravatar dependency to vendor/ dir"

This reverts commit a8cb93ae640bbb90f7d25012fc257bda9fae9b82.

* Make federated avatar setting a global configuration

Removes the per-user setting

* Move avatar handling back to base tool, disable federated avatar in offline mode

* Format, handle error

* Properly set fallback host

* Use unsupported github.com mirror for importing go-libravatar

* Remove comment showing life exists outside of github.com

... pity, but contribution would not be accepted otherwise

* Use Combo for Get and Post methods over /avatar

* FEDERATED_AVATAR -> ENABLE_FEDERATED_AVATAR

* Fix persistance of federated avatar lookup checkbox at install time

* Federated Avatars -> Enable Federated Avatars

* Use len(string) == 0 instead of string == ""

* Move import line where it belong

See
https://github.com/Unknwon/go-code-convention/blob/master/en-US/import_packages.md

Pity the import url is still the unofficial one, but oh well...

* Save a line (and waste much more expensive time)

* Remove redundant parens

* Remove an empty line

* Remove empty lines

* Reorder lines to make diff smaller

* Remove another newline

Unknwon review got me start a fight against newlines

* Move DISABLE_GRAVATAR and ENABLE_FEDERATED_AVATAR after OFFLINE_MODE

On re-reading the diff I figured what Unknwon meant here:
https://github.com/gogits/gogs/pull/3320/files#r73741106

* Remove newlines that weren't there before my intervention
8 years ago