Commit graph

1125 commits

Author SHA1 Message Date
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