3690 Commits

Author SHA1 Message Date
baaf6046a1 Minor fix for #2660 2016-02-24 23:59:17 -05:00
5418c2c5e4 Merge pull request #2660 from joshfng/config-test-mailer
Test mailer button. Addresses #1531
2016-02-24 23:26:32 -05:00
c27038e392 Test mailer button. Addresses #1531 2016-02-24 09:48:05 -05:00
d324500959 Prepare to release 2016-02-24 01:14:43 -05:00
3d218861e2 Merge pull request #2693 from appleboy/patch-2
test the latest version.
2016-02-24 00:19:01 -05:00
c65bd65254 test the latest version. 2016-02-23 16:04:40 +08:00
72ce06eab8 #2682 fix missing slash for go-get meta 2016-02-23 00:12:04 -05:00
912f7b51e9 #1821 add actions for close and reopen issues 2016-02-22 12:40:00 -05:00
90fab0be6b Merge pull request #2665 from muhmuhten/develop
Dockerfile cleanup for Alpine 3.3
2016-02-22 11:59:18 -05:00
c9516c4c60 Fix wrong place to check disable SSH 2016-02-21 21:55:59 -05:00
6e74dd4388 Merge pull request #2674 from andreynering/highlight-little-refactoring
Little refactoring of diff highlight.
2016-02-21 17:07:17 -05:00
d160c7e565 Little refactoring of diff highlight.
Moving cache variable to template instead of in the struct.
2016-02-21 18:45:24 -03:00
8ac04a3f29 Merge pull request #2672 from louwers/patch-1
Removed duplicate of paragraph
2016-02-21 16:16:54 -05:00
b91b35b565 Removed duplicate of paragraph 2016-02-21 16:02:00 +01:00
ac78bae7b5 Replace uuid module with original package 2016-02-20 18:13:12 -05:00
926e75d721 #2334 strip whitespace for migrate URL
Also fix a possible race condition while install
2016-02-20 17:32:34 -05:00
d5a3021a7d Make markdown as an independent module 2016-02-20 17:10:05 -05:00
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
7140dbac95 Fix #857 2016-02-20 15:10:34 -05:00
acf094fb07 Minor fix for #2634
Add AttributesInBind option in new auth source form.
2016-02-20 14:56:27 -05:00
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
a703f7d7b4 Merge pull request #2647 from andreynering/issue-template
Implement issue and pull request templates
2016-02-20 14:12:15 -05:00
a9981d8099 Update bindata for LDAP changes 2016-02-20 14:17:24 +01:00
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
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
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
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
b7f3d94cd0 Minor fix for #2524 2016-02-19 22:16:26 -05:00
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
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
f38d5e57dd Remove border-bottom for tabs header divider 2016-02-19 17:49:48 -05:00
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
7162095635 Merge pull request #2664 from jwdeitch/patch-1
Update contributing guidlines link
2016-02-19 16:09:43 -05:00
0b54035d7a Update README.md 2016-02-19 16:07:15 -05:00
dbd4697001 Update contributing guidlines link
previously displays 404
2016-02-19 15:25:23 -05:00
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
a1b28fc33c Rename MustEnablePulls() to MustAllowPulls() and simplify the contained check to AllowsPulls(). 2016-02-19 20:48:32 +01:00
a467184e13 #2505 Allow to fork and disallow to create PRs for mirrors. 2016-02-19 20:33:06 +01:00
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
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
0f1b26ed1e Fix issue email formatting. Addresses #2331 2016-02-18 16:08:20 -05:00
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
eb009923f4 Fix chmod for several files in conf/locale/ and public/ 2016-02-18 19:31:23 +00:00
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
2fdf8fc938 Add issue and pull request template 2016-02-17 21:22:58 -05:00
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
b97780ba51 Add GitHub's issue and pull request templates. 2016-02-17 21:15:11 -02:00
ccc94dd11c #2646 fix panic on pushing repositor 2016-02-17 15:17:52 -05:00
d5ca913b2f #2639 add branch prefix for test webhook 2016-02-17 15:05:07 -05:00
3af1d3c581 #2633 fix removed config option 2016-02-16 13:27:02 -05:00