Commit graph

3985 commits

Author SHA1 Message Date
Unknwon
90fab0be6b Merge pull request #2665 from muhmuhten/develop
Dockerfile cleanup for Alpine 3.3
2016-02-22 11:59:18 -05:00
Unknwon
c9516c4c60 Fix wrong place to check disable SSH 2016-02-21 21:55:59 -05:00
Unknwon
6e74dd4388 Merge pull request #2674 from andreynering/highlight-little-refactoring
Little refactoring of diff highlight.
2016-02-21 17:07:17 -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
8ac04a3f29 Merge pull request #2672 from louwers/patch-1
Removed duplicate of paragraph
2016-02-21 16:16:54 -05:00
Bart
b91b35b565 Removed duplicate of paragraph 2016-02-21 16:02:00 +01:00
Unknwon
ac78bae7b5 Replace uuid module with original package 2016-02-20 18:13:12 -05:00
Unknwon
926e75d721 #2334 strip whitespace for migrate URL
Also fix a possible race condition while install
2016-02-20 17:32:34 -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
7140dbac95 Fix #857 2016-02-20 15:10:34 -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
7e0baf4136 Merge pull request #2634 from nanoant/patch/ldap-attributes-in-bind
LDAP: Fetch attributes in Bind DN context
2016-02-20 14:44:21 -05:00
Unknwon
a703f7d7b4 Merge pull request #2647 from andreynering/issue-template
Implement issue and pull request templates
2016-02-20 14:12:15 -05:00
Adam Strzelecki
a9981d8099 Update bindata for LDAP changes 2016-02-20 14:17:24 +01:00
Adam Strzelecki
5649556a33 LDAP: Make a bit more detailed log traces
This is useful especially to check whether we fetch right attributes, using
right LDAP search base and in right order.
2016-02-20 14:12:32 +01:00
Adam Strzelecki
834d92a47b LDAP: Fetch attributes in Bind DN context option
This is feature is workaround for #2628 (JumpCloud) and some other services
that allow LDAP search only under BindDN user account, but not allow any LDAP
search query in logged user DN context.

Such approach is an alternative to minimal permissions security pattern for
BindDN user.
2016-02-20 14:12:32 +01:00
Adam Strzelecki
e2f95c2845 LDAP: Use single connection in BindDN mode auth
According to RFC 4511 4.2.1. Processing of the Bind Request "Clients may send
multiple Bind requests to change the authentication and/or security
associations or to complete a multi-stage Bind process. Authentication from
earlier binds is subsequently ignored."

Therefore we should not use 2 connections, but single one just sending two bind
requests.
2016-02-20 14:01:47 +01:00
Muh Muhten
5609585ec1 update alpine package dependencies
- s6 is in main in 3.3, so we no longer need to mangle the repos file
- official image is periodically updated, so it's not preferred to do
  upgrades downstream (usually harmless, but inelegant)
- apk-tools in 3.3 supports --no-cache to avoid leaving the APKINDEX
  files in the image
2016-02-19 23:07:20 -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
f38d5e57dd Remove border-bottom for tabs header divider 2016-02-19 17:49:48 -05:00
Unknwon
341da3cea7 Fix inappropriate markdown post process end tag check
When <code> is nested inside <pre>, the next end tag token would not able to be the same
as outer-most start tag. So we only check outer-most start and end tag token to be the same.
2016-02-19 17:39:50 -05:00
Unknwon
7162095635 Merge pull request #2664 from jwdeitch/patch-1
Update contributing guidlines link
2016-02-19 16:09:43 -05:00
jwdeitch
0b54035d7a Update README.md 2016-02-19 16:07:15 -05:00
jwdeitch
dbd4697001 Update contributing guidlines link
previously displays 404
2016-02-19 15:25:23 -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
a1b28fc33c Rename MustEnablePulls() to MustAllowPulls() and simplify the contained check to AllowsPulls(). 2016-02-19 20:48:32 +01:00
Download-Fritz
a467184e13 #2505 Allow to fork and disallow to create PRs for mirrors. 2016-02-19 20:33:06 +01:00
Andrey Nering
658bfc2704 Implement issue and pull request templates.
Similar to GitHub:
https://github.com/blog/2111-issue-and-pull-request-templates

Priority:
- root
- .gogs
- .github
2016-02-18 21:21:30 -02:00
Unknwon
736a46dff9 Merge pull request #2659 from joshfng/fix-issue-email-format
Fix issue email formatting. Addresses #2331
2016-02-18 16:19:23 -05:00
Josh Frye
0f1b26ed1e Fix issue email formatting. Addresses #2331 2016-02-18 16:08:20 -05:00
Unknwon
60896c66af Merge pull request #2658 from fnkr/fix-chmod
Fix chmod for several files in conf/locale/ and public/
2016-02-18 14:39:27 -05:00
Florian Kaiser
eb009923f4 Fix chmod for several files in conf/locale/ and public/ 2016-02-18 19:31:23 +00: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
Unknwon
2fdf8fc938 Add issue and pull request template 2016-02-17 21:22:58 -05:00
Unknwon
89d6b18dad Merge pull request #2649 from andreynering/gh-issue-template
Add GitHub's issue and pull request templates.
2016-02-17 18:29:35 -05:00
Andrey Nering
b97780ba51 Add GitHub's issue and pull request templates. 2016-02-17 21:15:11 -02:00
Unknwon
ccc94dd11c #2646 fix panic on pushing repositor 2016-02-17 15:17:52 -05:00
Unknwon
d5ca913b2f #2639 add branch prefix for test webhook 2016-02-17 15:05:07 -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
Unknwon
3af1d3c581 #2633 fix removed config option 2016-02-16 13:27:02 -05:00
Unknwon
24829f314b Merge pull request #2635 from lunny/develop
fix dependency broken because xorm's API changed
2016-02-16 13:23:44 -05:00
Lunny Xiao
779b71eda4 fix dependency broken because xorm's API changed 2016-02-16 22:35:08 +08:00
Unknwon
9cf4fe043b Add env var check for update 2016-02-15 23:11:22 -05: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