coolaj86
/
gitroast
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
6,164 Commits 12 Branches 0 Tags 118 MiB
Commit Graph

1958 Commits

Author SHA1 Message Date
Ethan Koenig 2eb15f4a61 Unit tests and remove unused functions in models/notification (#796) 
* Unit tests and remove unused functions in models/notification

* Read -> Unread
 2017-01-30 22:21:49 +08:00
Lunny Xiao f94869d2d1 Track labels changed on issue view & resolved #542 (#788) 
* track labels changed on issue view & resolved #542

* add missing head comment & sort & fix refresh
 2017-01-30 20:46:45 +08:00
Ethan Koenig 7765593018 Better settings for unit tests (#795) 2017-01-30 13:17:43 +08:00
Thomas Boerger 78535fb08e Allow custom public files (#782) 
* Allow custom public files

* Gofmt code, lots of places not related to this pr
 2017-01-28 23:14:56 +01:00
Andrey Nering cc31a21192 Merge pull request #781 from andreynering/notifications-step-5 
Notifications step 5
 2017-01-28 17:54:37 -02:00
Andrey Nering 5348e8b71a Fix color: closed PR was showing as purple instead of red 2017-01-28 14:01:07 -02:00
Andrey Nering 31c717f579 Merge pull request #777 from ethantkoenig/tests/wiki 
Unit tests for models/wiki
 2017-01-28 11:27:45 -02:00
Ethan Koenig bb76285762 Unit tests for models/wiki 2017-01-27 13:08:17 -05:00
Ethan Koenig a2412492da Unit tests and bug fix for models/org 2017-01-27 12:24:06 -05:00
Lunny Xiao bb5a6b7a07 fix xorm NewSession uncorrected usages (#774) 2017-01-28 00:11:41 +08:00
Bo-Yi Wu 25663b5816 refactor: Remove unnecessary type conversions (#772) 2017-01-27 23:03:32 +08:00
Ethan Koenig da1b6164fe Fix FIXME and remove superfluous queries in models/org (#749) 2017-01-25 23:41:38 +08:00
Bo-Yi Wu 691fbdf1d3 fix: delete attachment after remove comment. 2017-01-25 16:40:43 +01:00
Ethan Koenig 0934d1b1ea Bug fixes and unit tests for models/webhook (#751) 2017-01-25 18:37:35 +08:00
Ethan Koenig a6832c234d Unit tests for models/star (#752) 2017-01-25 18:37:10 +08:00
Lunny Xiao 8c2381103a bug fixed issues 500 resolved #754 (#756) 2017-01-25 16:28:03 +08:00
Ethan Koenig 8093b3372e Less boilerplate in models/ unit tests (#725) 2017-01-25 10:49:51 +08:00
Ethan Koenig 833f8b94c2 Search bar for issues/pulls (#530) 2017-01-25 10:43:02 +08:00
Andrey Nering 521d429b58 Fix link of some repos on stars page (#737) 
Link was wrong the repo was of another owner
 2017-01-24 10:39:58 +08:00
Bwko 74ed6dc3ad Add option to app.ini to enable local import paths (#724) 2017-01-23 09:19:50 +08:00
Bwko 1257d43e14 Add a reserved path check to the wiki (#720) 2017-01-22 23:08:54 +08:00
Lunny Xiao f8c2903484 fixed bugs on Wiki and resolved #667 (#674) 2017-01-21 20:50:51 +08:00
Philip Couling 1610b9f547 Spun attachments into seperate go file (#701) 
Moved attachments into seperate go file
 2017-01-20 07:58:46 +01:00
Ethan Koenig 74bbec3bf9 Fix permission bugs in team API (#647) 2017-01-20 13:16:10 +08:00
Ethan Koenig fcf02e4961 API Endpoints for organization members (#645) 2017-01-20 10:31:46 +08:00
Matthias Loibl d1006150fb Refactor process package and introduce ProcessManager{} with tests (#75) 
* Add a process.Manager singleton with process.GetManager()

* Use process.GetManager everywhere

* Fix godoc comments for process module

* Increment process counter id after locking the mutex
 2017-01-17 13:58:58 +08:00
Andrew 6dd096b7f0 Two factor authentication support (#630) 
* Initial commit for 2FA support

Signed-off-by: Andrew <write@imaginarycode.com>

* Add vendored files

* Add missing depends

* A few clean ups

* Added improvements, proper encryption

* Better encryption key

* Simplify "key" generation

* Make 2FA enrollment page more robust

* Fix typo

* Rename twofa/2FA to TwoFactor

* UNIQUE INDEX -> UNIQUE
 2017-01-16 10:14:29 +08:00
Philip Couling 64375d875b Attach to release (#673) 
* Moved attachaments POST url from /issues/attachments to /attachments

* Implemented attachment upload on release page

* Implemented downloading attachments on the release page

* Added zip and gzip files to default allowed attachments

* Implemented uploading attachments on edit release

* Renamed UploadIssueAttachment to UploadAttachment
 2017-01-15 22:57:00 +08:00
btrepp 302fa42980 Removes reliance on server specific SQL (#393) 
Breaks the retrieval of repositories into two queries
This fetches the paged ids in one go, then the
actual repository information in a second query

Some databases do not support SELECT with *
when group by is used.
 2017-01-14 22:32:36 +08:00
Ethan Koenig a6f5efa0bb Fix ambiguity bug in getCommentsByRepoIDSince (#665) 2017-01-14 10:21:30 +08:00
Ethan Koenig 27fcf8d30a Bug fixes for webhook API (#650) 2017-01-14 10:14:48 +08:00
Lunny Xiao 87ad4961f6 bug fixed for update repository (#664) 2017-01-14 10:07:04 +08:00
Andrey Nering 769e0a3ea6 Notifications: mark as read/unread and pin (#629) 
* Use relative URLs

* Notifications - Mark as read/unread

* Feature of pinning a notification

* On view issue, do not mark as read a pinned notification
 2017-01-12 12:27:09 +08:00
Bo-Yi Wu cbf2a967c5 refactor: Add new deleteOrg func. (#633) 2017-01-11 21:10:43 +08:00
Ethan Koenig b316b2e740 Unit tests for models/admin 2017-01-09 21:49:51 +01:00
Ethan Koenig 973282dae2 Better coverage in pull_test (#615) 2017-01-09 11:15:07 +08:00
Ethan Koenig 862948ab88 Better coverage and TODOs for update_test (#616) 2017-01-09 11:14:57 +08:00
Ethan Koenig 4b23e6a694 Unit tests for models/action (#619) 2017-01-09 11:08:36 +08:00
derSuessmann 51d578ff33 Add Keep email private (see issue #571). (#571) 
- Add site-wide option DEFAULT_KEEP_EMAIL_PRIVATE.
- Add the new option to the install and admin/config pages.
- Add the new option to app.ini in the service section.
- Add the new option to the settings struct.
- Add English text strings to i18n.
- Add field KeepEmailPrivate to user struct.
- Add field KeepEmailPrivate to user form.
- Add option to UI.
- Add using noreply email address if user has "Keep Email Private".
An email address <LowerName>@<NO_REPLY_ADDRESS> is now used in commit
messages (and hopefully all other git log relevant places). The
change relies on the fact that git commands should use
user.NetGitSig().
- Add hiding of email address in UI, if user has set "Keep Email Private".
- Add condition to show email address only on explore/users and user
pages, if user has not set "Keep Email Private".
- Add noreply email in API if set "Keep Email Private".
- Add a new service setting NO_REPLY_ADDRESS. The value of this
setting is used as the domain part for the user's email address in
git log, iff he decides to keep his email address private.
If the user decides to keep his email address private and this
option is not set 'noreply.example.org' is used, which no MTA
should send email to.

Add NO_REPLY_ADDRESS to conf/app.ini.
 2017-01-08 11:12:03 +08:00
Ethan Koenig 6072b03291 Unit tests for models/access.go (#606) 2017-01-08 11:10:53 +08:00
Ethan Koenig 8422ab542c API endpoint for subscribers (#598) 2017-01-07 11:13:02 +08:00
Andrey Nering 03b45284e1 Merge pull request #555 from ethantkoenig/tests/pull 
Unit tests for models/pull.go
 2017-01-06 19:19:18 -02:00
Andrey Nering 84b7d29d34 Create missing database indexes (#596) 2017-01-06 23:14:33 +08:00
Ethan Koenig 72bfabfada Unit tests for models/pull.go 2017-01-06 10:08:23 -05:00
Ethan Koenig 1a7fc53c98 API endpoint for stargazers (#597) 2017-01-06 15:05:09 +08:00
Lunny Xiao 61306fa737 Make releases faster than before and resolved #490 (#588) 
* make releases faster than before and resolved #490

* fix comment
 2017-01-06 09:51:15 +08:00
Andrey Nering 79d527195d Merge pull request #539 from andreynering/notifications-step-2 
Notifications - Step 2
 2017-01-05 11:53:01 -02:00
Ethan Koenig c5f0d4b1a0 Fix SQL bug in models/access (#583) 
Previously got a 'relation repo_access does not exist' error in User_GetRepositoryAccesses
 2017-01-05 08:57:54 +08:00
Berk Demirkır bdad3b259a Check primary email address fields on CreateUser (#556) 
* Check primary email address fields on CreateUser

As this check wasn't available, uid=1 (and possibly guests too, if registration is open) is able to register new users with existing email addresses. This leads to numerous 500 errors.

* Update user.go

* Lower the email first. Then check
 2017-01-05 08:52:20 +08:00
Ethan Koenig 1207bda94b Fix typos in models/ (#576) 2017-01-05 08:50:34 +08:00
Andrey Nering b354cf362e Add pagination for notifications 2017-01-03 17:09:36 -02:00
Lunny Xiao 09dabe2ff2 fix bug #564 (#567) 2017-01-03 16:27:11 +08:00
Lunny Xiao 980dd0bf51 Update xorm and dependencies vendor for feature to dump to other database (#565) 
* update xorm and dependencies vendor for feature to dump to other database

* fix golint
 2017-01-03 16:20:28 +08:00
Kjell Kvinge 4b0974ec10 Fix benchmarktests (#557) 2017-01-03 10:52:09 +08:00
Lunny Xiao 3c7116382f change the default action when deleting a release to not delete tag 2017-01-03 02:27:38 +01:00
Ethan Koenig 0c301f7b5c Release API endpoints 2017-01-02 00:10:52 +01:00
Lunny Xiao 6e5fffbd3f resolved #485: when migrate empty wiki repo, then ignore (#541) 2016-12-31 17:34:34 +08:00
Ethan Koenig de8b73dd92 Unit tests for token and update models 2016-12-31 10:17:45 +01:00
Schwobaland c0904f1942 Restrict creating organisations by user (#193) 
* restrict creating organizations based on right on user

* revert bindata.go

* reverse vendor lib

* revert goimports change

* set AllowCreateOrganization default value to true

* revert locale

* added default value for AllowCreateOrganization

* fix typo in migration-comment

* fix comment

* add coments in migration
 2016-12-31 10:33:30 +08:00
Bo-Yi Wu 6510e57758 fix gofmt error 
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
 2016-12-30 20:41:10 +01:00
Andrey Nering 42904cb98a Notification - Step 1 (#523) 
* Notification - Step 1

* Add copyright headers

* Cache issue and repository on notification model
 2016-12-31 00:44:54 +08:00
typeless 937b4b5aa1 Speed up conflict checking in pull request creation (#276) 
* Speed up conflict checking in pull request creation

In order to check conflicts of a PR, we set up a working tree by
cloning the base branch, which is quite time-consuming when the repository is huge.
Instead, this PR uses `git read-tree` and `git apply --check --cached` to check conflicts.

For #258

* Use $GIT_INDEX_FILE instead of --index-output to avoid lockfile problem

The lockfile gets renamed to the final destination after the operation
finishes. But it must be located in the same filesystem, which prevents
us from using /tmp.

* Temporary file names should not prefixed with '-'
 2016-12-29 22:59:52 +08:00
Andrey Nering b992858883 Tab on user profile to show starred repos (#519) 
* Tab on user profile to show starred repos

* Make golint happy and use transactions on StarRepo function

* x -> sess

* Use sess.Close() instead of sess.Rollback()

* Add copyright

* Fix lint
 2016-12-29 22:58:24 +08:00
Lunny Xiao 799d0c2030 slight optimization for GetUserRepositories (#498) 2016-12-29 02:53:33 -06:00
Kjell Kvinge 22e1bd31c6 commithgraph / timeline (#428) 
* Add model and tests for graph

* Add route and router for graph

* Add assets for graph

* Add template for graph
 2016-12-29 07:44:32 +08:00
Bwko 331316894e Replace Gogs with Gitea (#520) 2016-12-28 16:33:21 +08:00
Lunny Xiao c463b1b8cb Optimization for user.GetRepositoryAccesses to reduce db query times (#495) 
* optimization for user.GetRepositoryAccesses to reduce db query times

* fix missing cache
 2016-12-28 09:34:35 +08:00
Lunny Xiao ba134bd27a fix 500 when delete orgnization and resolved #486 2016-12-27 12:00:12 +01:00
Ethan Koenig 2342df183b API Endpoints for collaborators (#375) 2016-12-26 15:37:01 +08:00
Fabian Zaremba 2e7ccecfe6 Git LFS support v2 (#122) 
* Import github.com/git-lfs/lfs-test-server as lfs module base

Imported commit is 3968aac269a77b73924649b9412ae03f7ccd3198

Removed:

Dockerfile CONTRIBUTING.md mgmt* script/ vendor/ kvlogger.go
.dockerignore .gitignore README.md

* Remove config, add JWT support from github.com/mgit-at/lfs-test-server

Imported commit f0cdcc5a01599c5a955dc1bbf683bb4acecdba83

* Add LFS settings

* Add LFS meta object model

* Add LFS routes and initialization

* Import github.com/dgrijalva/jwt-go into vendor/

* Adapt LFS module: handlers, routing, meta store

* Move LFS routes to /user/repo/info/lfs/*

* Add request header checks to LFS BatchHandler / PostHandler

* Implement LFS basic authentication

* Rework JWT secret generation / load

* Implement LFS SSH token authentication with JWT

Specification: https://github.com/github/git-lfs/tree/master/docs/api

* Integrate LFS settings into install process

* Remove LFS objects when repository is deleted

Only removes objects from content store when deleted repo is the only
referencing repository

* Make LFS module stateless

Fixes bug where LFS would not work after installation without
restarting Gitea

* Change 500 'Internal Server Error' to 400 'Bad Request'

* Change sql query to xorm call

* Remove unneeded type from LFS module

* Change internal imports to code.gitea.io/gitea/

* Add Gitea authors copyright

* Change basic auth realm to "gitea-lfs"

* Add unique indexes to LFS model

* Use xorm count function in LFS check on repository delete

* Return io.ReadCloser from content store and close after usage

* Add LFS info to runWeb()

* Export LFS content store base path

* LFS file download from UI

* Work around git-lfs client issue with unauthenticated requests

Returning a dummy Authorization header for unauthenticated requests
lets git-lfs client skip asking for auth credentials
See: https://github.com/github/git-lfs/issues/1088

* Fix unauthenticated UI downloads from public repositories

* Authentication check order, Finish LFS file view logic

* Ignore LFS hooks if installed for current OS user

Fixes Gitea UI actions for repositories tracking LFS files.
Checks for minimum needed git version by parsing the semantic version
string.

* Hide LFS metafile diff from commit view, marking as binary

* Show LFS notice if file in commit view is tracked

* Add notbefore/nbf JWT claim

* Correct lint suggestions - comments for structs and functions

- Add comments to LFS model
- Function comment for GetRandomBytesAsBase64
- LFS server function comments and lint variable suggestion

* Move secret generation code out of conditional

Ensures no LFS code may run with an empty secret

* Do not hand out JWT tokens if LFS server support is disabled
 2016-12-26 09:16:37 +08:00
Philip Couling d4924d45d6 Implement sendmail (#355) 
* Implemented sendmail. This piggybacks on existing configuration to keep the change simple

* Changed privicy of new sendSMTP and sendSendmail functions

* Fixed Lint errors

* Seperated SMTP and sendmail into their own senders

* Making new structs private as they should not be used externally now

* Added sendmail setting to ini file

* Minor code cleanup
 2016-12-25 14:55:22 +01:00
Bwko fa3abc22c0 Added sorting to organizations, repos & users page (#222) 2016-12-24 22:42:26 +08:00
Bwko a345a03d99 Added sorting to the labels & milestones page (#199) 2016-12-24 22:41:09 +08:00
Ethan Koenig d0932ef147 Bug fixes for Issues filters (#413) 
Correctly handle simultaneous assignee/poster filters, and conflicting assignee filters
 2016-12-24 18:33:21 +08:00
Ethan Koenig 8a4161c723 API Endpoint for watching (#191) 2016-12-24 09:53:11 +08:00
btrepp 25b5ffb6af Enables mssql support (#383) 
* Enables mssql support

Port of dlobs work in gogs.
Enables options in index.js
Enables MSSQL as a database option in go.
Sets ID to 0 on initial migration. Required for
MSSQL insert statements.

Signed-off-by: Beau Trepp <beautrepp@gmail.com>

* Vendors in denisenkom/go-mssqldb

Includes golang.org/x/crypto/md4
as this is required by go-msssqldb

Signed-off-by: Beau Trepp <beautrepp@gmail.com>
 2016-12-24 09:37:35 +08:00
Lunny Xiao a822bba3e1 Add default values for settings (#455) 
* add default values for settings

* more default values

* more default settings and labels resource

* mv locale to options
 2016-12-23 15:18:05 +08:00
Thomas Boerger b33078fa33 Bindata is optional and over-writable on restart (#354) 
* Moved conf assets into options folder

* Dropped old bindata

* Started to integrate options bindata and accessors

* Do not enforce a builtin app.ini

* Replaced bindata calls with options

* Dropped bindata task from makefile, it's the generate task now

* Always embedd app.ini to provide sane config defaults

* Use sane defaults for the configuration

* Defined default value for SSH_KEYGEN_PATH

* Dropped "NEVER EVER MODIFY THIS FILE" header from app.ini

* Fixed new paths in latest test additions

* Drop bindata with make clean task

* Set more proper default values
 2016-12-22 19:12:23 +01:00
Lunny Xiao c21e2c4151 fix tag webhook 404 error (#420) 2016-12-22 22:57:48 +08:00
Lunny Xiao 47a7529d96 update code.gitea.io/git (#450) 2016-12-22 10:30:52 +01:00
Lunny Xiao 0c5c34d7dd UpdateIssueUsersByMentions was calling database write operations while (#443) 
a transaction session was in progress. MailParticipants was failing
silently because of the SQLITE_LOCKED error. Make sure failures in
MailParticipants enter the log, and pass on the transaction context.

issue: let caller pass in database context, and use it
issue_comment: obtain database context to pass to UpdateIssueMentions
issue_comment: log any error from call to MailParticipants
issue_mail: pass on database context to UpdateIssueMentions
 2016-12-22 17:00:39 +08:00
Ethan Koenig 4c89a9c33c Bug fixes and tests for modules/base (#442) 
Also address other TODOs
 2016-12-22 16:58:04 +08:00
Kim "BKC" Carlbäcker df7fa4e995 issue comment api fix (#449) 
* ListAllInRepo & Delete Issue-Comments

* Moar data in issue-comments
 2016-12-22 16:29:26 +08:00
Alexander Lunegov d5d21b67d2 Fix string format verbs (#3637) 2016-12-22 08:18:41 +01:00
Denis Denisov 380e32e129 Fix random string generator (#384) 
* Remove unused custom-alphabet feature of random string generator

Fix random string generator

Random string generator should return error if it fails to read random data via crypto/rand

* Fixes variable (un)initialization mixed assign
Update test GetRandomString
 2016-12-20 13:32:02 +01:00
Michael de Wit 1d30457a94 change test mail subject and body to 'Gitea Test Mail!' 
Signed-off-by: Michael de Wit <mjwwit@gmail.com>
 2016-12-20 09:34:50 +01:00
Lunny Xiao 7c46667e71 fixed vulnerabilities labels (#409) 2016-12-17 19:49:17 +08:00
Richie B2B 44428fdc38 Remove fixed FIXME (#408) 2016-12-16 17:00:30 +01:00
Richie B2B 0d6e88baef Fix typo (#407) 2016-12-16 17:00:15 +01:00
Lunny Xiao 15c3d14d55 fixed vulnerabilities on deleting release (#399) 2016-12-16 19:42:39 +08:00
Lunny Xiao b4c794058a fixed vulnerabilities (#392) 2016-12-15 16:49:06 +08:00
Lunny Xiao d771e978a1 Don't use custom PBKDF2 function (#382) 2016-12-15 09:24:27 +08:00
Lunny Xiao 73710c00a8 bug fixed branch name for pushupdate (#380) 2016-12-13 15:19:42 +08:00
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]
 2016-12-12 08:46:51 +08:00
Bwko abcd39f7d5 In the wiki title replace tab with a space (#371) 2016-12-11 11:01:26 +08:00
Bwko cbcb4361d5 Fixes issue #283 
Delete old temp local copy before we create a new temp local copy
 2016-12-09 20:13:48 +01:00
Ethan Koenig 401a8db0ed Remove stale comment in models/repo.go (#366) 2016-12-08 00:04:12 +01:00
Ethan Koenig 04b9a7e7a2 Bug fixes for repo permissions in API 
Also move duplicated code into repo.APIFormat(..)
 2016-12-07 12:55:24 +01:00
Thomas Boerger 83ed234472 Integrate templates into bindata optionally (#314) 
Integrated optional bindata for the templates
 2016-12-06 18:58:31 +01:00
Kim "BKC" Carlbäcker d07c955e2a Fix regression in PR-API #248 (#349) 
* Fix #344 (regression in PR-API #248)
 2016-12-05 12:17:39 +01:00
Bwko 0118b275b6 Fix for #320 
Suppress the error when we're removing a file that may not exist
 2016-12-03 22:31:54 +01:00
Denis Denisov c8f300b2cd Safe compare password (timing attack) (#338) 2016-12-03 13:49:17 +08:00
Kim "BKC" Carlbäcker 0f05470cb8 [API] Pull Requests (#248) 2016-12-02 12:10:39 +01:00
Kim "BKC" Carlbäcker e8e0539b45 Linting 2016-12-02 09:31:44 +01:00
Kim "BKC" Carlbäcker e6cfccdd40 GitHub API Compliance (& linting) 2016-12-02 09:18:15 +01:00
Bwko 4ff0db0246 Catch os... errors 2016-12-02 07:41:19 +01:00
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
 2016-12-02 09:12:16 +08:00
Lunny Xiao 646e02b521 typo 2016-12-01 09:05:32 +08:00
Thomas Boerger 6dd2c3b2db
Fixed linting errors for variable definitions 2016-11-29 14:05:26 +01:00
Kim "BKC" Carlbäcker 42ec5ce740 Fix breakage from vendor-update 2016-11-29 11:50:22 +01:00
Kim "BKC" Carlbäcker dad806d3ea CreateBranch-hook has shasum. Use the full ref for fetching shasum 2016-11-29 11:50:22 +01:00
Kim "BKC" Carlbäcker f364522468 Tag-webhooks are useless without shasums 2016-11-29 11:50:22 +01:00
Andrey Nering fd53028139 Merge pull request #294 from Bwko/Lint/user.go 
Lint models/user.go
 2016-11-28 20:30:02 -02:00
Bwko bad1bc6518 Lint models/repo.go 2016-11-28 18:27:55 +01:00
Bwko a5aae1c145 Lint models/repo_* 2016-11-28 17:58:59 +01:00
Bwko 9963d61233 Lint models/user.go 2016-11-28 17:47:46 +01:00
Lunny Xiao 27d66855eb golint fixed for models/migrations (#291) 2016-11-28 23:44:17 +08:00
Lunny Xiao 1d0f811399 golint fixed for models/pull.go (#292) 2016-11-28 23:31:06 +08:00
Lunny Xiao 9fc609ce17 golint fixed for models/issue_comment.go 2016-11-28 21:33:09 +08:00
Thomas Boerger 9948f0daaa Merge pull request #285 from lunny/lunny/golint_models_org_team 
Golint for models/org_team.go
 2016-11-28 09:42:53 +01:00
Lunny Xiao f215d78157 rename all uID -> userID on models/org_team.go 2016-11-28 16:33:08 +08:00
Lunny Xiao bf8d90c5cc golint fixed for models/models.go (#284) 2016-11-28 15:25:16 +08:00
Lunny Xiao 21846d16e5 golint for models/org_team.go 2016-11-28 09:30:08 +08:00
Lunny Xiao ec87a75c00 golint fixed for modules/auth 2016-11-27 21:39:06 +08:00
Bwko a4ece1f223 Fixes typos 2016-11-27 12:59:12 +01:00
Thomas Boerger 5efdccd1d8 Merge pull request #264 from Bwko/lint/org.go 
Lint models/org.go
 2016-11-27 12:18:20 +01:00
Thomas Boerger 9a984c0d49 Merge pull request #266 from Bwko/lint/repo_mirror 
Lint models/repo_mirror.go
 2016-11-27 12:15:01 +01:00
Thomas Boerger fe3908d099 Merge pull request #268 from Bwko/lint/repo_branch 
Lint models/repo_branch.go
 2016-11-27 12:14:25 +01:00
Thomas Boerger e23a9d22e5 Merge pull request #267 from Bwko/lint/ssh_key 
Lint models/ssh_key.go
 2016-11-27 12:13:43 +01:00
Thomas Boerger 93d527a0a4 Merge pull request #265 from Bwko/lint/access.go 
Lint models/access.go
 2016-11-27 12:12:56 +01:00
Thomas Boerger 8347a55cc2 Merge pull request #263 from Bwko/lint/user_email 
Lint models/user_email.go
 2016-11-27 12:12:02 +01:00
Lunny Xiao 94da472717 Golint fixed for modules/setting (#262) 
* golint fixed for modules/setting

* typo fixed and renamed UNIXSOCKET to UnixSocket
 2016-11-27 18:14:25 +08:00
Bwko 0b9cf10340 Lint models/org.go & models.go 2016-11-26 11:37:50 +01:00
Bwko 7bf7042013 Lint models/repo_mirror.go 2016-11-26 11:23:55 +01:00
Bwko ce8c9ef580 Lint models/repo_branch.go 2016-11-26 11:20:37 +01:00
Bwko 6cde041080 Lint models/ssh_key.go 2016-11-26 01:36:03 +01:00
Bwko 2bb1601d7c Lint models/access.go 2016-11-26 01:07:57 +01:00
Bwko 066f515a47 Lint models/user_email.go 2016-11-26 01:03:06 +01:00
Thomas Boerger 574e49c854 Merge pull request #241 from Bwko/lint/admin.go 
Lint models/admin.go
 2016-11-25 12:55:24 +01:00
Thomas Boerger 21b7d30174 Merge pull request #245 from Bwko/lint/update&slack 
Lint models/update.go, release.go & webhook_slack.go
 2016-11-25 12:55:14 +01:00
Thomas Boerger e9c6053b86 Merge pull request #246 from Bwko/fix/typo 
Fix typos
 2016-11-25 12:54:57 +01:00
Thomas Boerger 3e6f363471 Merge pull request #256 from lunny/lunny/golint_modules_avatar 
Golint fixed for modules/avatar
 2016-11-25 10:11:44 +01:00
Thomas Boerger 7c5de1e393 Merge pull request #250 from lunny/lunny/golint_modules_markdown 
Golint fixed for modules/markdown
 2016-11-25 10:08:23 +01:00
Lunny Xiao 3c87c57d96 golint fixed for modules/avatar 2016-11-25 16:37:04 +08:00
Bwko c0ca6644ad Lint/issue &mail (#243) 
* Lint models/release.go

* Lint models/ issue_label, issue_mail & mail.go
 2016-11-25 16:11:12 +08:00
Bwko 081c2a9395 Lint models/token.go (#244) 2016-11-25 16:03:52 +08:00
Lunny Xiao 76604d8f90 fixed test build error 2016-11-25 16:02:10 +08:00
Bwko 33a2ac3830 Lint models/update.go & webhook_slack.go 2016-11-25 07:55:08 +01:00
Lunny Xiao 304bbd3f25 golint fixed for modules/markdown 2016-11-25 09:58:05 +08:00
Bwko d8e11a8eaa Lint models/admin.go 2016-11-24 23:42:07 +01:00
Bwko ece19f4a5e Lint models/release.go 2016-11-24 22:02:54 +01:00
Lunny Xiao 450969c158 test database is connect OK after db config initialized (#239) 2016-11-24 22:30:36 +08:00
Sandro Santilli 1c3044b873 Lint models/login_source.go 2016-11-24 12:34:38 +01:00
Thomas Boerger 0a66c2a2d9 Merge pull request #234 from strk/issue-lint 
Lint issue.go
 2016-11-24 11:30:39 +01:00
Thomas Boerger e512411863 Merge pull request #233 from strk/git_diff-lint 
Lint git_diff.go
 2016-11-24 11:29:51 +01:00
Thomas Boerger 03b6880089 Merge pull request #232 from strk/error-lint 
Lint error.go
 2016-11-24 11:29:15 +01:00
Sandro Santilli 8aa960f129 Actually document the missing bits 2016-11-24 09:41:11 +01:00
Sandro Santilli 3fba29c571 Expand documentations 2016-11-24 09:30:08 +01:00
Sandro Santilli 0a61d54a9c Expand documentation a bit more 2016-11-24 09:20:28 +01:00
Sandro Santilli dd9d0f3732 Lint action.go 2016-11-24 09:03:29 +01:00
Sandro Santilli 170f2e98cc Lint error.go 
This was done semi-programmatically, not really documenting anything
 2016-11-24 09:03:17 +01:00
Sandro Santilli 6e644726d0 Lint git_diff.go 
Semi-automatic linting (don't really document things)
 2016-11-24 09:02:58 +01:00
Sandro Santilli 4dd1eb57bd Lint issue.go 2016-11-24 09:02:44 +01:00
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
 2016-11-24 08:52:55 +08:00
Sandro Santilli c25063d834 Lint webhook.go, unexports simpleMarshalJSON (#198) 2016-11-22 14:42:52 +08:00
Bwko 2a449bd4b1 Fix typos 2016-11-21 20:08:21 +01:00
Ethan Koenig 0834e492c0 API endpoints for stars 2016-11-16 22:51:54 -05:00
Bo-Yi Wu d9ffe99972 fix variable assigned and not used. 
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
 2016-11-15 14:16:27 +08:00
Sandro Santilli 592a4ec4d3 Fix lint errors in models/wiki (just add methods docs) 
See #70
 2016-11-14 18:01:46 +01:00
Andrey Nering 739f07c98e Remember diff view style (#163) 2016-11-13 10:54:04 +08:00
LefsFlare 3ef022b071 Fixes possible vulnerabilities with keyword hijacking (#20) 
- Added public entries to reserved keywords list
- Rename variables
- Derped comment
 2016-11-12 13:26:45 +01:00
Lunny Xiao 3dedc027ac Bug fixed for issues (#156) 2016-11-12 13:06:33 +01:00
Lunny Xiao 0baaa7728a bug fixed caused by #153 (#154) 2016-11-12 09:30:46 +01:00
Lunny Xiao 30a37311f8 use in instead string join (#155) 2016-11-12 09:29:18 +01:00
Lunny Xiao 555d8b16cb fixed bug #151 caused Find should be Get (#153) 2016-11-12 00:01:09 +01:00
Lunny Xiao ade6d4a20f optimization on database IN 2016-11-12 01:31:37 +08:00
Lunny Xiao 9bf28a2799 bug fixed for 500 caused by get org users (#149) 2016-11-12 00:55:06 +08:00
Thibault Meyer ddee4c8b58
Normalize files with gofmt 2016-11-11 13:11:45 +01:00
Sandro Santilli a1c5f02444 Fix import path of go-sdk (#141) 
From code.gitea.io/go-sdk/gitea
  To code.gitea.io/sdk/gitea
 2016-11-11 17:39:44 +08:00
Thibault Meyer b12f2a5916
Remove unused import 2016-11-10 21:10:25 +01:00
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
 2016-11-10 21:05:52 +01:00
Thibault Meyer a4454f5d0f
Rewrite XORM queries 2016-11-10 20:59:51 +01:00
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
 2016-11-10 17:24:48 +01:00
Matthias Loibl 94b2747375 Remove go version from build tags (#133) 2016-11-10 08:43:49 -02:00
Lunny Xiao 1b238fe4d5 Merge pull request #121 from joubertredrat/feature-last-login 
Last Login for admin manage your users
 2016-11-10 17:20:55 +08:00
Lunny Xiao c6c840faf7 Merge pull request #129 from lunny/lunny/SQL_instead_Sql 
use x.SQL instead of x.Sql
 2016-11-10 17:12:14 +08:00
Thibault Meyer 3a10a0c1ca
Ordering organizations and users by name 2016-11-10 09:18:54 +01:00
Lunny Xiao 7dcc3bc3d7 use x.SQL instead of x.Sql 2016-11-10 15:20:48 +08:00
Joubert RedRat f91cbf0fed Support to last login feature 2016-11-09 08:53:45 -02:00
Lunny Xiao c511f1c6c3 Merge pull request #18 from LefsFlarey/issue/3675 
Fix 500 error caused by deleted users on issues (#3675)
 2016-11-09 15:14:18 +08:00
Flare a6c487f6ca
Fix err not being nil 2016-11-09 13:07:01 +08:00
Lunny Xiao 5667d4daae Merge pull request #73 from bkcsoft/gt/2164-release-pagination 
Add Pagination to Releases-page (and de-duplicate pagination templates)
 2016-11-08 10:39:03 +08:00
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"
 2016-11-07 18:58:22 -02:00
Sandro Santilli aadd7dcdc3 And others 2016-11-07 17:53:22 +01:00
Sandro Santilli b3828e38a5 more 2016-11-07 17:41:28 +01:00
Sandro Santilli 05fd9d3f09 Security protocols 2016-11-07 17:38:43 +01:00
Sandro Santilli 7612b5ec40 More mixage 2016-11-07 17:37:28 +01:00
Sandro Santilli 64196d4036 More overlooks 2016-11-07 17:35:34 +01:00
Sandro Santilli f14232d2e9 This one I overlooked before 2016-11-07 17:33:03 +01:00
Sandro Santilli 60c82a8780 More... 2016-11-07 17:30:04 +01:00
Sandro Santilli f6a11e0de1 More MixedCase consts 2016-11-07 17:24:59 +01:00
Sandro Santilli f388661bda ACCESS_MODE_* -> AccessMode* 2016-11-07 17:20:37 +01:00
Sandro Santilli 0b62aeb495 More MixedCase consts 2016-11-07 17:08:21 +01:00
Sandro Santilli 80eea77953 Use MixedCase constant names 
See https://github.com/golang/go/wiki/CodeReviewComments#mixed-caps
 2016-11-07 17:05:08 +01:00
Thomas Boerger 5d430c9e68 Merge pull request #108 from go-gitea/go-sdk 
Replaced gogits go-gogs-client with go-sdk
 2016-11-07 16:31:17 +01:00
Sandro Santilli ee963f67c1 Merge pull request #103 from strk/GOGS_drop 
Replace GOGS with GITEA in variable names
 2016-11-07 16:30:48 +01:00
Joubert RedRat 28bee28102 Replace Gogs to Gitea in installation options 2016-11-07 13:26:19 -02:00
Thomas Boerger 4c6c16f358
Replaced go-gogs-client with go-sdk imports 2016-11-07 16:10:32 +01:00
Sandro Santilli 30be1f4826 Fix typo in unused constant name 2016-11-07 16:06:21 +01:00
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
 2016-11-07 16:05:18 +01:00
Kim "BKC" Carlbäcker 86fb1a0cb1 Add Pagination to Releases-page 2016-11-07 11:41:09 +01:00
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)
 2016-11-06 11:18:34 -02:00
LefsFlare 55a4d46f5d Adds checking of reserved keywords against team names (#22) 2016-11-06 10:07:03 +01:00
Thibault Meyer fe8bfa54de Ordering team by name ascending except for 'Owners' (#48) 2016-11-06 09:59:21 +01:00
Matthias Loibl 953c099428 Add missing version & gogs package 2016-11-05 18:04:47 +01:00
Matthias Loibl 1f44b01e2a Fix imports found by goimports. 2016-11-05 17:56:35 +01:00
Thomas Boerger 648c6fdd60
Vet complains about "should have signature MarshalJSON() ([]byte, error)", replaced with custom name 2016-11-04 23:45:06 +01:00
Flare fd6be0d17e
Still print error if user does not exist 2016-11-05 02:47:54 +08:00
Matthias Loibl a4fa889ced Run goimports on the whole project (#34) 
Signed-off-by: Matthias Loibl <mail@matthiasloibl.com>
 2016-11-04 09:57:27 -02:00
Rémy Boulanouar 8dc49dc114 Implementation of the feature to redirect to an external issue tracker 2016-11-04 09:06:54 +01:00
Rémy Boulanouar 2d68bd1ef9 Change import reference to match gitea instead of gogs (#37) 2016-11-03 10:29:56 -02:00
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
 2016-11-02 21:00:54 +01:00
LefsFlare 2bec8a4f1e Changed interface (#3685) 2016-09-22 19:38:12 -04:00
Flare 1b59e6f910
Fix 500 error caused by deleted users on issues (#3675) 2016-09-20 18:13:57 +08:00
Unknwon 6da55159a2
#3589 LoadRepoConfig after ORM is initialized 2016-09-02 23:18:37 -04:00
Unknwon c50d59874d
#3577 incorrect URL produced by AvatarLink 2016-09-01 12:36:26 -04:00
Unknwon 7c1fbed057 Fix panic when attempt login with non-exist user 2016-09-01 05:12:34 -04:00
Unknwon c2afdf2192 Minor code fix [CI SKIP] 2016-08-31 04:31:53 -07:00
Unknwon 152e715999 models/login_source: code improvement 2016-08-31 01:22:41 -07:00
Unknwon 99c2ae7b35 #3515 use alert instead 500 for duplicated login source name 2016-08-31 00:56:10 -07:00
Unknwon 8516dfcb6c #2018 able to sync now for mirrors 
- Refactor code to use sync.UniqueQueue
- Closes #3509
 2016-08-30 16:18:33 -07:00
Unknwon c1ecb6c60a modules/sync: add UniqueQueue 2016-08-30 15:50:30 -07:00
Unknwon 43297148b2 modules/sync: rename SingleInstancePool to ExclusivePool 2016-08-30 15:19:53 -07:00
Unknwon 643142acab Web editor: support upload files 2016-08-30 05:23:59 -07:00
Unknwon 28cf0e6aaa #3459 code quality improvement 2016-08-29 20:00:06 -07:00
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
 2016-08-29 19:02:49 -07:00
LFlare 3738b6399e Fixed typo (#3533) 
Git convention has it capitalised.
 2016-08-29 11:31:12 -07:00
Unknwon 62b0dc4853 Web editor: fix cannot create new file in subdirectory 2016-08-29 00:10:21 -07:00
Unknwon 579e5e4fee Web editor: disallow edit mirror repository 2016-08-28 04:56:41 -07:00
Unknwon 0114fdcba4 Web editor: improve delete file process 2016-08-28 01:41:44 -07:00
Unknwon dad5c15520 #2901 allow setting preferred licenses 
- Closes #3488
 2016-08-28 00:06:22 -07:00
Unknwon c30b856d14 #3505 use user’s info for committer and author 2016-08-27 13:37:55 -07:00
Unknwon 13c106af77 label: adjust forecolor boundary 2016-08-27 12:44:39 -07:00
Unknwon ce1e4348da #3521 fix wiki HTTP/S clone URL does not have .wiki suffix 2016-08-27 12:29:52 -07:00
Unknwon 37305a59ca migrations: sync table first 2016-08-26 17:32:41 -07:00
Unknwon bb359a74f1 migrations: set comment updated as created 2016-08-26 14:07:21 -07:00
Unknwon 6b98d58906 #2966 code cleanup 2016-08-26 13:40:53 -07:00
Iwan Budi Kusnanto 8dca9f95fa issues comment API : list, create, edit (#2966) 
add `since` query string support to list issue comment
 2016-08-26 11:23:21 -07:00
Thibault Meyer f50e568fd1 Fix #3189: Sort labels by name (#3446) 
* Fix #3189 #3445: Order labels by name

* Order labels by name on Issues view
 2016-08-25 17:43:53 -07:00
Unknwon f8a48ffaad Web editor: improve code quality 2016-08-24 21:35:03 -07:00
Kurt Madel 67fb0fe6a5 added support to set pull_request event from api (#3513) 2016-08-24 20:44:58 -07:00
Unknwon 0b273ac4d5 #3383 code cleanup 2016-08-24 16:05:56 -07:00
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...
 2016-08-24 12:01:30 -07:00
Unknwon a00c932bbc General code quality improvement 2016-08-16 23:06:38 -07:00
Unknwon 6f9a95f830 #2246 add HTMLURL to webhook type 
- Fill Milestone and Assignee field when available in webhook payload
 2016-08-16 10:19:09 -07:00
Unknwon 8bf57be9ba Fix git diff tests 2016-08-16 07:45:06 -07:00
Unknwon b1504ed99a #3464 add diff signs which does not have inline diff 2016-08-16 07:37:28 -07:00
Unknwon 9349def72e #3464 reproduce diff signs 
Commited wrong file.
 2016-08-16 07:33:53 -07:00
Unknwon 2625193a48 models/repo_editor: improve code quality 2016-08-15 22:20:55 -07:00
Unknwon f3c3258921 Fix repository owner can assign self 2016-08-15 18:48:20 -07:00
Unknwon 4042d1f0c3 models/issue: improve quality and performance of NewIssue function 2016-08-15 18:40:32 -07:00
Unknwon 6c8fcb3af2 #3467 fix clone fail when wiki is empty 2016-08-15 15:09:34 -07:00
Unknwon 94392a7af3 Fix empty repository panic on send test webhook 2016-08-15 05:53:47 -07:00
Unknwon cc647ba9d5 #3461 fix security issue of REAMDE path in create repository 2016-08-15 02:35:54 -07:00
Unknwon 54e0ada9d5 Web editor: improve delete file 2016-08-14 23:52:24 -07:00
Unknwon cd89f6c502 Web editor: improve edit file and diff preview 2016-08-14 23:52:24 -07:00
Unknwon 660e7a178a modules/sync: move sync objects to independent module 2016-08-14 23:52:24 -07:00
Unknwon 15845cb287 Code clean up for new config options 2016-08-14 23:52:24 -07:00
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
 2016-08-14 23:52:24 -07:00
Unknwon dccb0c15b9 Replace convert.To with APIFormat calls 2016-08-14 04:17:26 -07:00
Unknwon 3f7f4852ef #2246 fully support of webhooks for pull request 2016-08-14 03:32:24 -07:00
Unknwon f59d2dd034 Code clean up 2016-08-12 03:04:50 -07:00
Unknwon 5be881756b #3442 add test suites 2016-08-12 02:56:50 -07:00
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
 2016-08-12 02:42:06 -07:00
Unknwon 96f92e6105 Fix email FROM 2016-08-11 15:16:01 -07:00
Unknwon 70fbcd2f27 models: rename EnableTidb to EnableTiDB 2016-08-11 14:38:45 -07:00
Unknwon 5850308a37 #3013 support connect PostgreSQL via unix socket 2016-08-11 14:38:26 -07:00
Unknwon 7e9b42c87d #2780 code clean up 2016-08-11 11:35:46 -07:00
Unknwon 5077408d78 #3233 code cleanup and minor issue fix 2016-08-11 10:53:51 -07:00
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
 2016-08-11 10:18:51 -07:00
Unknwon 0f26f3678a #3279 use doer email for FROM field of issues 2016-08-11 06:17:45 -07:00
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
 2016-08-10 20:08:09 -07:00
lstahlman ea192147ea Add test pull request task on merging a PR. Fixes #3396 (#3425) 2016-08-10 11:38:44 -07:00
Thibault Meyer 8ad92bb8a4 Verify list len before use it with IN (#3423) 2016-08-10 11:06:51 -07:00
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
 2016-08-09 23:47:16 -07:00
Unknwon 5448d29b2e #3417 wrong dashboard issue count for create by you 2016-08-09 23:19:52 -07:00
lstahlman 89f71b44f7 Add committer information to API and Webhooks. Also fixes #3271 (#3414) 2016-08-09 22:01:57 -07:00
Unknwon c5d4a9e046 #2907 Add commit timestamp to webhook 2016-08-09 18:28:06 -07:00
Unknwon b0b88d9bc5 #3091 add config option for Git GC 2016-08-09 17:24:32 -07:00
lstahlman 699c71d319 Fix for #3401 Links of pull request comment email should use pulls URL (#3403) 2016-08-08 22:40:05 -07:00
Unknwon e5bf4281b5 #2825 early response 200 when ?go-get=1 2016-08-07 14:29:16 -07:00
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
 2016-08-07 10:27:38 -07:00
Unknwon ec92565f23 #3393 fix missing sub-url prefix in relative avatar link 2016-08-07 10:13:05 -07:00
Andrey Nering 2772791fda Improve diff highlight (#3390) 
- Try to reduce memory allocations
- Add possibility to disable diff highlight (can improve performance for large diffs)
- Tweaking with cost for prettier (cleaner) diffs
- Do not calculate diff when the number of removed lines in a block is not equal to the number of added lines (this usually resulted in ugly diffs)
 2016-08-07 09:49:47 -07:00
Thibault Meyer 30fda0f1ae Fix #3315: Release dont use tag creation date (#3374) 
* Fix #3315: Release dont use tag creation date

* Simplify code and apply gofmt

* remove useless block (ctx.Repo.GitRepo.GetTag) on EditReleasePost

* apply gofmt on modified files
 2016-08-06 10:02:15 -07:00
Unknwon 50422f1fc2 #3348 always use relative avatar link in the template 2016-08-05 12:12:54 -07:00
Unknwon e7fd65f0cf #3290 better code structure and batch minor improvements 2016-08-03 11:51:22 -07:00
lstahlman 2eeb0ec9b0 Additional API support for labels (#3290) 
* Add API support for labels.

* Error handling for adding/replacing multiple issue labels

* Revisions to function names and error handling. Use issue.ClearLabels in replace/clear functions

* Additional code cleanup
 2016-08-03 09:24:16 -07:00
Unknwon 10dc330640 #3345 dump content directly to HTTP ResponseWriter 2016-07-30 23:39:58 +08:00
Dennis Chen dfab54d5a2 Diff patch (#3345) 
* Add support for .diff and .patch

Add the ability to get text-diff and format-patch by adding .diff or
.patch in the end of a commit url. Issue #2641

* models: git_diff: various fixes

* Renames commitId to commitID.
* Writes stderr to a bytes.Buffer and displays proper error message on
command failure.
* Various style changes.

Signed-off-by: Dennis Chen <barracks510@gmail.com>
 2016-07-30 23:02:22 +08:00
마누엘 36a63dd059 models/release: Update Sha1 if tag already exists (#3331) 
Since the release struct is initialized with the current `HEAD` of the
current `release.Target` the commit id has to be updated if the tag
commit already exists. Otherwise the linked commit on the release page
will target the current `HEAD` at release time.
 2016-07-28 10:45:35 +08:00
Unknwon 8aa0a76702 #3327 fix wrong table name in Join 2016-07-26 18:40:20 +08:00
Unknwon 2d76de2574 #3281 fix x.Iterate returns nothing inside session scope with SQLite3 2016-07-26 17:26:48 +08:00
Unknwon 4d8b905541 models/ssh_key: code cleaning 2016-07-26 10:47:25 +08:00
Unknwon 899e799459 #1601 support delete issue comment 2016-07-26 02:48:17 +08:00
Unknwon a562228c5e Add org.getUserTeams to reduce redundant code 2016-07-24 18:09:45 +08:00
Unknwon e74630ae3b #1384 add pagination for repositories 2016-07-24 14:32:46 +08:00
Unknwon 1f2e173a74 Refactor User.Id to User.ID 2016-07-24 01:08:22 +08:00
Unknwon 46e96c008c Use struct for UI settings 2016-07-24 00:23:54 +08:00
Unknwon 250be011c7 Remove redundant Unix timestamp method call 
Unix() already uses UTC as timezone
 2016-07-23 20:24:44 +08:00
Unknwon 4e822c1911 conf: change default mirror checking interval to 10m 2016-07-23 20:20:09 +08:00
Unknwon 69f5308761 #2903 use different reversed words and patterns for repository and user 2016-07-23 18:58:18 +08:00
Unknwon 4f78abe7dc #3066 fix create organization ignores full name property 2016-07-23 17:57:22 +08:00
Unknwon 745167d57a #3157 create user path before rename repository while transfer 
os.Rename does not create parent directory automatically when not exist
 2016-07-23 17:36:15 +08:00
Unknwon c912494609 #3076 detect invalid tag name git error 2016-07-23 15:59:19 +08:00
Siarhei Navatski cf85e9eb7b add IsSubmodule field to DiffFile and hide view file button on diff page for submodules (#3097) 2016-07-23 02:18:56 +08:00
Dennis Chen 6488ee12be avatar: make custom and generated avatars equal (#3301) 
Sets all avatars to use PNG image format.
Keeps avatars consistent at 290x290px resolution.

Signed-off-by: Dennis Chen <barracks510@gmail.com>
 2016-07-21 15:31:14 +08:00
Unknwon 5761342f32 #3291 fix SQLite3 session read/update conflict on create new issue 2016-07-21 14:26:30 +08:00
Unknwon 57af7432fc #3295 fix wrong logic judgement 2016-07-21 14:15:04 +08:00
lstahlman e7a4f96fb6 Updated Issues and Issues Stats functions to include table aliases. This addresses errors involving ambiguous column references when filtering issues by the view type "Mentioning you". (#3269) 2016-07-17 09:18:35 +08:00
Unknwon 60110adc06 models/webhook: restrict deletion to be explicitly with repo and org ID 2016-07-17 08:33:59 +08:00
Unknwon c083d76567 #2937 able to prohibit user login 2016-07-16 10:22:16 +08:00
Unknwon 52322ef624 models/user_mail: refactor EmailAddress 2016-07-16 10:08:04 +08:00
Sandro Santilli a4ea3bd015 Return avatar link as absolute url (#3235) 
Fixes relative urls coming from api/v1

See https://github.com/drone/drone/issues/1701
 2016-07-16 08:19:30 +08:00
Unknwon 3d93532c87 #3274 fix can't get webhook detail of organization 2016-07-16 01:02:55 +08:00
Unknwon f1b8d52eb3 #2854 fix no mail notification when issue is closed/reopened 2016-07-16 00:36:39 +08:00
Unknwon 7ca5f8f119 models/repo: remove redundant info for some repo methods 
RepoLink -> Link, RepoRelLink -> RelLink, FullRepoLink -> FullLink
 2016-07-15 21:53:43 +08:00
Kim Carlbäcker d950bf68e3 Ignore Response Body for Slack Hooks #3169 (#3256) 2016-07-15 14:02:19 +08:00
Unknwon a752f09055 #2709 validate username attribute fetched from LDAP 2016-07-12 07:07:57 +08:00
Unknwon 70a281a39b #2375 preserve cases for action content 2016-07-09 23:37:32 +08:00
Unknwon 9fcf66f0e0 Minor fix for #3246 2016-07-09 13:42:05 +08:00
Pablo Saavedra 98b152030d The pruning for the synchronized mirrors is a option now. Default value: enable_prune = true (#3246) 
Executed go fmt

getEngine() not handles DB parameters (#2972) (#2974)

Uses .AllCols() for Update in updateMirror()

Spanish traslation removed

Fixed a wrong way to ommit the --prune option in process.ExecDir() for MirrorUpdate function
 2016-07-09 13:22:28 +08:00
Pheng Heong TAN 467d7dacb6 Modify behaviour of repo-delete. (#3232) 
Re: issues gogits/gogs#2863 and gogits/gogs#3231

As a result of modifications to the contents of the conf folder, `make bindata`
was run, causing an update to bindata.go.

Meta
-----
This commit will be rebased onto the 'develop' branch.
 2016-07-09 13:13:57 +08:00
Unknwon d62ab49978 #3057 retrieve webhook with repo_id 
This prevents user retrieve arbitrary webhook by changing URL to
access webhook from other unauthorized repositories.
 2016-07-08 13:57:09 +08:00
Unknwon e30c701386 #3229 disallow repository name . and .. 
Since . and .. has browser automatical behaviors, we need to disallow those names.
 2016-07-08 07:34:05 +08:00
Unknwon 401bf944ef Use SecurityProtocol to replace UseSSL in LDAP config 
Initially proposed by #2376 and fixes #3068 as well.
 2016-07-08 07:25:09 +08:00
Unknwon 4b25bdfbc4 #3058 #3059 support correct page size and link header 2016-07-04 17:27:06 +08:00
Tom 528682a294 getEngine() not handles DB parameters (#2972) (#2974) 2016-07-02 22:39:39 +08:00
Unknwon 3a30c06345 Fix wiki vulnerabilities 
- Arbitrary file creation leading to command execution
- .md file creation/deletion

Reported by Gabriel Campana.
 2016-07-01 15:33:35 +08:00
Andrey Nering 743d22669a Re-work MAX_DIFF_LINES: supress diff per file, not the whole diff (#3174) 2016-06-29 23:11:00 +08:00
Andrey Nering 6efb1e5626 Localize collaboration settings. (#3100) 
Closes #2764
 2016-06-28 00:22:30 +08:00
Sandro Santilli 8a248696e9 Use a gopher as default avatar (rather than the gravatar logo) (#3208) 
Also changes the avatar from a jpeg to a png, to allow for
transparent background. The indexed png is also smaller in size.

Note that at the moment the default avatar is only used when
the user requested a custom avatar and the custom avatar file
is not found (should never happen).

In the future the default avatar could be used as a default
return when by-mail avatar lookups fail too (both gravatar
and libravatar support passing a default)
 2016-06-27 18:12:30 +08:00
Franz Schmidt 8b35c194ec Fixes #3110 (#3136) 2016-06-27 17:02:39 +08:00
Robin Lambertz ac05f88641 Fix #3154 (#3155) 2016-06-27 16:58:53 +08:00
SjonHortensius 17a4d8a5e5 Fix capitalisation of repo-name in news (#3203) 
use 'official' repo.Name instead of incoming repoName; to enforce
correct capitalisation
 2016-06-27 16:10:12 +08:00
Robin Lambertz bc00da1721 Fix negative issue count (#3207) 2016-06-27 01:53:30 +08:00
Unknwon e9ae926e04 #809 fix wrong closed issue count when create closed issue via API 
Add start count corrector for Repository.NumClosedIssues
 2016-05-27 18:23:39 -07:00
Andrey Nering 12d30255a7 Add comment note (#3093) 2016-05-23 13:24:40 -07:00
Kim Carlbäcker 3c0c7a9f83 Fix listing team members (#3048) 2016-05-06 20:02:36 -04:00
Andrey Nering d8612f7704 Fix remove folder issues, including initialization failling. (#2969) 
- Prevent panic on creating notice if database is not available
- Prevent incorrect folder on Windows ("/" instead of "\")
 2016-05-06 15:48:18 -04:00
Unknwon 0a78d99a4d models/release: filter input to prevent command line argument vulnerability 2016-05-06 15:40:41 -04:00
Unknwon 0325bec283 #2895 minor fix for bug of xorm 2016-04-26 00:22:03 -04:00
Thomas Boerger dfad51fe9e Made the issue stats query more secure with parameterized placeholders (#2895) 2016-04-26 00:07:49 -04:00
Unknwon 78b8b63774 #2992 set default style name when empty in AfterSet 2016-04-22 18:36:05 -04:00
Cosmin Stroe ba314a7a36 Support alphanumeric issue style (ABC-1234) for external issue tracker (#2992) 2016-04-22 18:28:08 -04:00
Unknwon 762ab056a2 Fix XORM IN condition table name parse 2016-03-27 18:21:37 -04:00
Thomas Boerger 746c7fd4e7 Followup fix for previous query fix 2016-03-28 00:05:49 +02:00
Thomas Boerger b5948f2e71 Made the issues query more secure and simpler 2016-03-27 23:26:45 +02:00
Thomas Boerger 79a1bfd963 Try to make the SQL queries cleaner and more secure 2016-03-27 22:59:57 +02:00
Unknwon b1d41cfa60 #1692 add admin APIs to add/remove a user from teams 2016-03-25 18:04:02 -04:00
Unknwon 98b58fa050 Handle windows deletion when start 
Fix #2872
 2016-03-23 03:16:53 -04:00
Unknwon e6f927f61a #1692 api: admin list and create team under organization 2016-03-21 12:47:54 -04:00
Unknwon ff731ea07d #2814 LOWER() column value within search 2016-03-16 16:55:19 -04:00
Odin Ugedal 6ccb2d36cf Remove email from user search 2016-03-15 19:44:58 +01:00
Odin Ugedal 3253e3c5aa Make user search look in username, name and email 
Make user search function look in username (lower_name), full name
(full_name) and primary email (email). This will benefit searching after
user in "explore", admin panel and when adding new collaborators.
 2016-03-15 14:16:58 +01:00
Unknwon 9bd9ad4205 #1692 add CRUD issue APIs 
- Fix go-gogs-client#10
- Related to #809
 2016-03-13 23:20:22 -04:00
Unknwon f76d821bda fix #2804 2016-03-11 17:12:37 -05:00
Unknwon 263304b6b7 #13 fix postgres aggregate 2016-03-11 16:11:33 -05:00
Unknwon 2bf8494332 #13 finish user and repository search 
Both are possible on explore and admin panel
 2016-03-11 15:33:12 -05:00
Marin Jankovski 1314ba219e Updated and created were appended with _unix. Fresh databases have only the newly named fields. 2016-03-11 12:43:35 +01:00
Unknwon 5267dce210 Fix ref comment from commit create empty feed 2016-03-11 05:11:58 -05:00
Unknwon eed9966ad6 #2727 fix incompatible SQL in PostgreSQL 2016-03-09 23:18:39 -05:00
Unknwon ad513a20e9 #2302 Replace time.Time with Unix Timestamp (int64) 2016-03-09 19:53:30 -05:00
Unknwon 13bd16af92 Minor fixes for #2766 2016-03-06 13:24:42 -05:00
Tamás Molnár 9c91e27933 Added: Ability to delete org avatar. 2016-03-06 17:36:30 +01:00
Unknwon a5b0400be7 #1146 finish new access rights for collaborators 2016-03-05 20:45:23 -05:00
Unknwon 045f14fbd0 #1146 finsih UI work for access mode of collaborators 
Collaborators have write access as default, and can be changed via repository
collaboration settings page to change between read, write and admin.
 2016-03-05 18:08:42 -05:00
Unknwon 414eb22ef9 #1597 fix activitity feeds for pull requests 2016-03-05 12:58:51 -05:00
Unknwon a2f13eae55 #1157 some avatar setting changes 
- Allow to delete current avatar
 2016-03-05 00:51:51 -05:00
Unknwon 2a931937a8 Update locales 2016-03-04 18:51:18 -05:00
Unknwon dfd6f8f7ab Merge pull request #2757 from joshfng/fix-fork-relative-url 
Use relative url when showing forked from
 2016-03-04 18:37:42 -05:00
Josh Frye 275464e7fb Use relative url when showing forked from 2016-03-04 18:32:30 -05:00
Unknwon e2d370f0da #1597 fix pull request remote head can't update with force push 2016-03-04 16:53:03 -05:00
Unknwon 5335e671be #2743 more fixes on SQL errors 2016-03-04 16:00:00 -05:00
Unknwon 2d2d85bba4 #1597 support pull requests in same repository 2016-03-04 15:43:01 -05:00
Unknwon 9df6ce48c5 Minor fixes for #2746 2016-03-04 13:32:17 -05:00
Unknwon 4d5911dbcf Merge pull request #2746 from joshfng/feature-delete-wiki-pages 
Add ability to delete single wiki pages.
 2016-03-04 13:14:37 -05:00
Unknwon d57a2b908a #2743 and #2751 fix bad SQL generated by XORM 
Use hand-written SQL to do complex query
 2016-03-04 13:08:47 -05:00
Josh Frye 1ca171dbe9 Add ability to delete single wiki pages. 2016-03-04 09:26:52 -05:00
Unknwon 260723e2cc Minor fixes for #2745 2016-03-03 23:24:22 -05:00
Josh Frye f3358f5927 Repo setting to delete and disable wiki 2016-03-03 16:12:48 -05:00
Josh Frye 7f2733fa1b Return errors instead of just logging them. 2016-03-03 12:43:23 -05:00
Josh Frye edb7967dc7 Set DefaultBranch to master when importing a new repo if possible 2016-03-03 12:23:45 -05:00
Unknwon c9901bbba5 #2743 workaround to fix XORM problem 2016-03-03 10:57:27 -05:00
Unknwon 97429a25ab #2727 make IN clause compatible with Postgres 2016-03-01 14:39:28 -05:00
Unknwon 9e89584cb4 Allow setting git operations timeouts 
- Migrate: #2704 #2653
- Clone: #2701
- Mirror, Pull
 2016-02-29 19:29:49 -05:00
Unknwon ea80274229 #2700 fix sqlite3 can't create issue with more than one label 2016-02-29 18:45:12 -05:00
Unknwon 8055a0bdac Post work for #2637 
Improve test cases, config settings, also show SSH config settings on admin config panel.
 2016-02-27 20:48:39 -05:00
Unknwon 83c74878df Merge pull request #2637 from Gibheer/ssh-publickeys 
allow native and ssh-keygen public key check
 2016-02-27 18:55:14 -05:00
Unknwon d320915ad2 Minor fix for #2710 2016-02-27 11:31:24 -05:00
Lukas Dietrich c0eaae200e Add ForegroundColor for labels 2016-02-27 13:59:11 +01:00
Unknwon 129638117f #2697 fix panic when close issue via commit message 2016-02-25 14:17:55 -05:00
Gibheer 2f27ee2232 variable should not use ALL_CAPS 2016-02-23 15:39:05 +01:00
Unknwon 912f7b51e9 #1821 add actions for close and reopen issues 2016-02-22 12:40:00 -05:00
Andrey Nering d160c7e565 Little refactoring of diff highlight. 
Moving cache variable to template instead of in the struct.
 2016-02-21 18:45:24 -03:00
Unknwon ac78bae7b5 Replace uuid module with original package 2016-02-20 18:13:12 -05:00
Unknwon d5a3021a7d Make markdown as an independent module 2016-02-20 17:10:05 -05:00
Unknwon d8a994ef24 Move cron module to independent package 
Make it easier to keep track of upstream changes and bug fixes
 2016-02-20 15:58:09 -05:00
Unknwon acf094fb07 Minor fix for #2634 
Add AttributesInBind option in new auth source form.
 2016-02-20 14:56:27 -05:00
Unknwon b7f3d94cd0 Minor fix for #2524 2016-02-19 22:16:26 -05:00
Unknwon f6c98465c7 Merge pull request #2524 from mhartkorn/pullrefs 
Enable a way to checkout Pull Requests from remote refs
 2016-02-19 22:00:25 -05:00
Unknwon aa12135b97 Fix panic when view profile without signin 
Also fix that no matter who, still able to see organizations with private membership.
 2016-02-19 18:10:03 -05:00
Unknwon 2408df3f35 Merge pull request #2663 from Download-Fritz/MirrorForks 
#2505 Allow to fork and disallow to create PRs for mirrors.
 2016-02-19 15:04:50 -05:00
Download-Fritz a467184e13 #2505 Allow to fork and disallow to create PRs for mirrors. 2016-02-19 20:33:06 +01:00
Unknwon 338af89d56 #2650 fix possbility that use email as pusher user name 
Remove the possibility of using email as user name when user actually push
through combination of email and password with HTTP.

Also refactor update action function to replcae tons of arguments with
single PushUpdateOptions struct.
And define the user who pushes code as pusher, therefore variable names shouldn't
be confusing any more.
 2016-02-17 22:47:06 -05:00
Gibheer dab74f21b7 remove ed25519 test for now 
TravisCI is too old for ed25519, so it can't be tested correctly.
 2016-02-17 11:30:48 +01:00
Gibheer 9eef2e706c fix ssh public key tests 
The old API was using []byte, but was changed to string without running
the tests again.
It also sets the variables from the configuration to make them work.
Maybe there is a better way to do this.
 2016-02-17 09:33:41 +01:00
Gibheer 12403bdfb0 allow native and ssh-keygen public key check 
This commit adds the possibibility to use either the native golang
libraries or ssh-keygen to check public keys. The check is adjusted
depending on the settings, so that only supported keys are let through.

This commit also brings back the blacklist feature, which was removed in
7ef9a05588. This allows to blacklist
algorythms or keys based on the key length. This works with the native
and the ssh-keygen way.

Because of #2179 it also includes a way to adjust the path to
ssh-keygen and the working directory for ssh-keygen. With this,
sysadmins should be able to adjust the settings in a way, that SELinux
is okay with it. In the worst case, they can switch to the native
implementation and only loose support for ed25519 keys at the moment.
There are some other places which need adjustment to utilize the
parameters and the native implementation, but this sets the ground work.
 2016-02-16 23:01:56 +01:00
Lunny Xiao 779b71eda4 fix dependency broken because xorm's API changed 2016-02-16 22:35:08 +08:00
Unknwon 2765b5c7cf #2630 fix wrong user avatar link in webhook 
Was using the wrong method and now uses the method which checks if
the avatar link is relative or not.
 2016-02-15 15:18:53 -05:00
Unknwon 632c27802c Minor fix for #2624 2016-02-15 14:57:15 -05:00
Unknwon dc89c51f3e Merge pull request #2624 from mhartkorn/convert-mirror-to-repo 
Convert mirrors to regular repositories
 2016-02-15 14:26:21 -05:00
Martin Hartkorn bb595666ac Moved UpdateRepository() to CleanUpMigrateInfo() and correctly delete mirror from database 2016-02-15 14:59:24 +01:00
Unknwon 58e004f7da Remove cache avatar support and add its tests 2016-02-14 23:14:55 -05:00
Unknwon fd92d91da3 Minor fix for #2578 2016-02-14 20:36:03 -05:00
Unknwon d8631b616e Merge pull request #2578 from exmex/develop 
Admins and user itself sees private org relations on profile
 2016-02-14 20:34:53 -05:00
Unknwon a1d97e8f5c Minor fix for #2567 2016-02-14 20:07:42 -05:00
Unknwon daa43cfb6e Merge pull request #2567 from fnkr/hide-other-teams-activity-from-dashboard 
Only show activities and repositories on the dashboard, that the user has access to
 2016-02-14 19:57:49 -05:00
Unknwon 9adfe453d5 #2569 delete repo local copy when transfer 
Remote repository path is renamed but does not delete
outdated local copy which still has old repository path
as remote.
 2016-02-14 19:42:38 -05:00
Martin Hartkorn 15d37b7a95 Refactored according to suggestions 2016-02-14 22:40:39 +01:00
Martin Hartkorn 3650bd8528 Convert mirrors to regular repositories. 2016-02-14 21:12:00 +01:00
Josh Frye 8662990746 Add default branch to repo payload 2016-02-12 11:04:46 -05:00
Josh Frye ce3708b3ea Remove local wiki copy on repo transfer. Fixes #2558 2016-02-11 19:26:51 -05:00
Unknwon 59745c62b4 #1577 fix missing SQL query placeholder 2016-02-10 17:30:24 -05:00
Unknwon 297e772c20 #2485 fix payloads mixed up for webhook 
When repository contains a Slack type hook,
it changes original payload content.

This patch fixes it by using a local object to store
newly created Slack payload instead of assigning
back to the same variable.
 2016-02-10 15:21:39 -05:00
Unknwon f15a2f9b25 Merge pull request #2528 from andreynering/diff-sintax-highlight-733 
Enable syntax highlighting on diff view
 2016-02-07 11:49:11 -05:00
Andrey Nering d37cf09ccd Workaroud delete folder on Windows. Fix #1738 2016-02-07 13:39:32 -02:00
ExMex 2cfe6f8c60 Admins and user itself sees private org relations on profile 2016-02-07 10:20:58 +01:00
Florian Kaiser 45db167f7a Only show activities for repositories on dashboard, that the user has access to 2016-02-06 07:52:21 +00:00
Tobias Kunicke fa5a1cb54f regulate timezone for milestone.deadline 2016-02-06 00:08:02 +01:00
Unknwon f8182ac521 #2558 delete local wiki copy when rename repo and user 2016-02-05 14:11:53 -05:00
Andrey Nering 2bfb8bb5fd Enable sintax highlighting on diff view. Close #733 2016-02-04 18:21:47 -02:00
Andrey Nering 137a49e834 go fmt models/git_diff_test.go 2016-02-04 17:55:17 -02:00
Martin Hartkorn a3bdede2ce Removed unused method GetUnmergedPullRequestByRepoPathAndHeadBranch 2016-02-04 19:15:21 +01:00
Unknwon ddf9fa06c7 Minor fix for #2530 2016-02-04 13:03:34 -05:00
Martin Hartkorn d91004ee71 Removed dependency on post-receive hook and use TriggerTask instead 2016-02-04 19:00:42 +01:00
Unknwon 739d5aa1d3 Merge pull request #2530 from fnkr/hide-other-teams-repos-from-org-page 
Hide other teams & repos from organization page
 2016-02-04 12:52:11 -05:00
Unknwon 04be8c0de5 #2554 reinitialize all repos from the db 
- Update locales
 2016-02-04 12:51:00 -05:00
Florian Kaiser fb1708e1af Remove unnecessary private functions 2016-02-04 17:08:25 +00:00
Unknwon a47baa1b7a Add missing patch conflit pattern 2016-02-03 12:28:03 -05:00
Unknwon 995487e822 Minor fix for #2506 2016-02-02 17:07:40 -05:00
Unknwon 5e97693e0e Merge pull request #2506 from sapk/add-branche-api-support 
Implement API for branches listing
 2016-02-02 16:51:14 -05:00
Unknwon 5a27aea8e0 Fix random avatar does not work on Windows 
path.Dir can't handle Windows case, must use filepath.Dir
 2016-02-02 10:22:27 -05:00
Unknwon 32efc3ec0a Merge pull request #2540 from JohnMaguire/bugfix/2447-delete-public-key-authorized_keys 
Fixes #2447 (delete public key from authorized_keys)
 2016-02-01 16:32:30 -05:00
John Maguire b3e0efc0c3 Trim whitespace when adding SSH keys (fixes #2447) 2016-01-31 22:02:36 -05:00
John Maguire caa4ca46c0 Add debug log when SSH key for deletion isn't found 2016-01-31 22:02:23 -05:00
Florian Kaiser 90780a0d90 Use invalid value (-1) instead of 0 to prevent bug if auto increment starts with 0 2016-01-31 19:17:58 +00:00
Florian Kaiser bba1847a8e Everyone can see public repos 2016-01-31 18:37:50 +00:00
Florian Kaiser e35791b2b2 Only show teams the user has access to 2016-01-31 15:30:07 +00:00
Florian Kaiser 5eafe2b17e Only show repositories the user has access to, on the organization home 2016-01-31 15:29:45 +00:00
Martin Hartkorn 20403f75fb Enable a way to checkout Pull Requests from remote refs 2016-01-30 23:56:38 +01:00
Florian Kaiser 295de51b99 Show all orgs on user profile, except the private one's 2016-01-30 21:53:58 +00:00
Unknwon 112a7cab31 #2497 incorrect error handle for team name 2016-01-29 17:06:14 -05:00
Antoine GIRARD b7b30cd85e Corrections following recommendations 2016-01-28 20:51:19 +01:00
Antoine GIRARD c11c3b6c11 Near ready 2016-01-28 20:51:19 +01:00
Unknwon e2dde6eb0a Record error when fail to health check repository 2016-01-28 06:46:25 -05:00
Unknwon 4deb876343 Minor fix for #2494 
- Change tooltip size from mini to tiny in profile page
 2016-01-28 06:07:16 -05:00
Unknwon 0617720c0c Merge pull request #2494 from mhartkorn/pullreq-name-change 
Change user name in Pull Requests to avoid errors (fixes #2495)
 2016-01-28 05:58:37 -05:00
Martin Hartkorn 674c5c37be Change user name in Pull Requests 2016-01-27 22:45:03 +01:00
Andrey Nering 5deb726f3f Refactoring of inline diff computing to prevent empty diff box. Fix #2489 2016-01-27 18:54:08 -02:00
Kim "BKC" Carlbäcker edc414c584 Fixed Webhook URL-length Issue #2465 2016-01-27 01:40:35 +01:00
Unknwon 7ef9a05588 #2179 use Go sub-repo ssh to verify public key content 2016-01-15 18:39:51 +08:00
Unknwon c631a4a9b9 URL fix for #2287 2016-01-15 18:00:39 +08:00
Antoine GIRARD 688fc515f8 Fix username display in lower-cased for comment in Dashboard 2016-01-12 21:30:14 +01:00
Unknwon f43cc90841 #2287 Truncate repository name if too long 2016-01-11 20:41:43 +08:00
Unknwon c199703e2a #2349 fix convert type 2016-01-11 15:47:23 +08:00
Unknwon 91bab801aa #2349 try to handle []int8 case 2016-01-11 14:34:32 +08:00
Andrey Nering 9620f48ed0 Fix test case after 86bce4a2ae. 2016-01-09 17:05:21 -02:00
Unknwon 8a93113192 roll back a small change 2016-01-09 15:04:28 +08:00
Unknwon 86bce4a2ae minor fix to #2335 2016-01-09 14:51:17 +08:00
Unknwon bcf6aed452 Merge pull request #2335 from andreynering/highlight-diff 
Highlight diff
 2016-01-09 13:39:18 +08:00
Andrey Nering 697b0e2aba Fix: now highlights in diff view are getting the correct lines. 2016-01-08 16:33:27 -02:00
Andrey Nering bf11ad19ea Semantic fixes. 2016-01-07 11:27:35 -02:00
Andrey Nering 81ed5c4bee Declaring specific types for enums constants. 
This makes the code more strict since you can't assign or compare
values of different types without proper cast.
 2016-01-06 18:00:40 -02:00
Andrey Nering 73474c043b Highlighting differences of lines in the diff view. 2016-01-06 17:46:56 -02:00
zhuharev 0d5dc8a064 typo fix 2016-01-06 22:41:42 +03:00
Unknwon 4993ab1a76 #2185 fall back to use custom chardet lib 2015-12-31 22:13:47 -05:00
Unknwon 240fe07287 #2273 URL consistency on webhook payload 2015-12-25 07:11:58 -05:00
Unknwon 157d868254 Merge pull request #2262 from angus-g/fixes/user-following-migration 
Add default for NumFollowing field (fixes #2261)
 2015-12-24 10:13:13 -05:00
Unknwon e16042010e Merge pull request #2257 from Jofkos/patch-1 
Wiki pages containing question marks in their name weren't loading
 2015-12-24 10:00:03 -05:00
Angus Gibson e914969e4c Add default for NumFollowing field (fixes #2261) 
We set the default value for the non-NULL field NumFollowing of the User
model to 0, which stops an error when the ORM tries to sync.
 2015-12-22 11:09:28 +11:00
Unknwon a49af93faf #1692 APIs: Users Followers 
- User profile un/follow
- List user's followers/following
 2015-12-21 04:24:11 -08:00
Jofkos 76d4af891f Removed empty line, multi return args 2015-12-20 21:13:12 +01:00
Jofkos 0721095944 Wiki pages containing question marks in their name weren't loading 
(untested)
 2015-12-20 18:02:54 +01:00
Unknwon 53eb37d529 fix #1436 2015-12-19 21:43:32 -05:00
Unknwon 9cd16c5b12 #1692 add organization APIs 2015-12-17 02:28:47 -05:00
Unknwon b117befc2b #1692 add user email APIs 2015-12-15 22:57:18 -05:00
Unknwon 7786cb76f3 fix #2205 2015-12-15 21:32:17 -05:00
Unknwon 19423957b1 rename import path 2015-12-15 17:25:45 -05:00
Unknwon 3362b3a44f fix possible disclosure 2015-12-14 17:06:54 -05:00