2
0
Commit Graph

3686 Commits

Author SHA1 Message Date
Unknwon
4a2b8f2ebe Merge pull request #2693 from appleboy/patch-2
test the latest version.
2016-02-24 00:19:01 -05:00
Bo-Yi Wu
b6725e36eb test the latest version. 2016-02-23 16:04:40 +08:00
Unknwon
755e046547 #2682 fix missing slash for go-get meta 2016-02-23 00:12:04 -05:00
Unknwon
41fbd1bbeb #1821 add actions for close and reopen issues 2016-02-22 12:40:00 -05:00
Unknwon
02c45093ec Merge pull request #2665 from muhmuhten/develop
Dockerfile cleanup for Alpine 3.3
2016-02-22 11:59:18 -05:00
Unknwon
0d52fe6240 Fix wrong place to check disable SSH 2016-02-21 21:55:59 -05:00
Unknwon
70549bc3e9 Merge pull request #2674 from andreynering/highlight-little-refactoring
Little refactoring of diff highlight.
2016-02-21 17:07:17 -05:00
Andrey Nering
5454e51a24 Little refactoring of diff highlight.
Moving cache variable to template instead of in the struct.
2016-02-21 18:45:24 -03:00
Unknwon
e869a164cc Merge pull request #2672 from louwers/patch-1
Removed duplicate of paragraph
2016-02-21 16:16:54 -05:00
Bart
c3e3a52081 Removed duplicate of paragraph 2016-02-21 16:02:00 +01:00
Unknwon
e106eb2000 Replace uuid module with original package 2016-02-20 18:13:12 -05:00
Unknwon
2b66e67625 #2334 strip whitespace for migrate URL
Also fix a possible race condition while install
2016-02-20 17:32:34 -05:00
Unknwon
69f420490d Make markdown as an independent module 2016-02-20 17:10:05 -05:00
Unknwon
fce86b3da1 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
4181250ccb Fix #857 2016-02-20 15:10:34 -05:00
Unknwon
68fc354f7d Minor fix for #2634
Add AttributesInBind option in new auth source form.
2016-02-20 14:56:27 -05:00
Unknwon
99c4b2ac83 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
08c16cff64 Merge pull request #2647 from andreynering/issue-template
Implement issue and pull request templates
2016-02-20 14:12:15 -05:00
Adam Strzelecki
cbf66ead0b Update bindata for LDAP changes 2016-02-20 14:17:24 +01:00
Adam Strzelecki
a32b5b9bee 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
b4bd486184 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
72b4e9f776 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
f7438ee1c8 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
09b290b38c Minor fix for #2524 2016-02-19 22:16:26 -05:00
Unknwon
2f959396cf 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
a9ea846adf 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
bcea8bb659 Remove border-bottom for tabs header divider 2016-02-19 17:49:48 -05:00
Unknwon
cf76dca801 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
aea02dfc9a Merge pull request #2664 from jwdeitch/patch-1
Update contributing guidlines link
2016-02-19 16:09:43 -05:00
jwdeitch
a7ca628b48 Update README.md 2016-02-19 16:07:15 -05:00
jwdeitch
23eb2849c8 Update contributing guidlines link
previously displays 404
2016-02-19 15:25:23 -05:00
Unknwon
8b4cf7a495 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
2a165b4aa5 Rename MustEnablePulls() to MustAllowPulls() and simplify the contained check to AllowsPulls(). 2016-02-19 20:48:32 +01:00
Download-Fritz
510ac4520f #2505 Allow to fork and disallow to create PRs for mirrors. 2016-02-19 20:33:06 +01:00
Andrey Nering
f746d8474d 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
e5955ad05f 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
b73ad93c9f Fix issue email formatting. Addresses #2331 2016-02-18 16:08:20 -05:00
Unknwon
7afa3bd6ab 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
c884d5094d Fix chmod for several files in conf/locale/ and public/ 2016-02-18 19:31:23 +00:00
Unknwon
970e514f4e #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
7e43b5660e Add issue and pull request template 2016-02-17 21:22:58 -05:00
Unknwon
fe2ee5b1bf 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
e7b1cad47e Add GitHub's issue and pull request templates. 2016-02-17 21:15:11 -02:00
Unknwon
d905826bb1 #2646 fix panic on pushing repositor 2016-02-17 15:17:52 -05:00
Unknwon
c99b55c020 #2639 add branch prefix for test webhook 2016-02-17 15:05:07 -05:00
Unknwon
8d510aa6ff #2633 fix removed config option 2016-02-16 13:27:02 -05:00
Unknwon
5590a32a03 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
b7b5961279 fix dependency broken because xorm's API changed 2016-02-16 22:35:08 +08:00
Unknwon
a65c53aeba Add env var check for update 2016-02-15 23:11:22 -05:00
Unknwon
bfc85fc0a9 #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