tom/forkjo
tom/forkjo
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages 1 Wiki Activity Actions 1
3852 commits 11 branches 231 tags 586 MiB
Commit graph

1150 commits

Author SHA1 Message Date
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
Unknwon
50264200f0 fix huge diff hangs 2015-12-14 09:38:21 -05:00
Unknwon
91789930bc #2176 fix 500 on /watchers & /stars for pg 2015-12-14 02:40:23 -05:00
Unknwon
95f9c85bcc #2185 use Go sub-repo to detect encoding 2015-12-13 19:56:33 -05:00
Unknwon
79dcd7ee6e #2167 able to identify git version on Windows 2015-12-13 18:20:39 -05:00
Unknwon
76bdbcc969 #2152 fix SMTP authentication makes invalid assumption on protocol 2015-12-11 18:57:45 -05:00
Unknwon
4d31eb2c0d #2155 fix org max repo limit default to -1 2015-12-11 15:48:02 -05:00
Unknwon
5d95ffe3eb #2155 The owner has reached maximum creation limit of 0 repositories 2015-12-11 15:11:13 -05:00
Unknwon
bc17f2f759 #2147 fix rewrites authorized_keys when builtin SSH server is enabled 2015-12-11 05:02:33 -05:00