]> source.dussan.org Git - gitea.git/log
gitea.git
8 years ago#1597 support pull requests in same repository
Unknwon [Fri, 4 Mar 2016 20:43:01 +0000 (15:43 -0500)]
#1597 support pull requests in same repository

8 years agoMinor fixes for #2746
Unknwon [Fri, 4 Mar 2016 18:32:17 +0000 (13:32 -0500)]
Minor fixes for #2746

8 years agoMerge pull request #2746 from joshfng/feature-delete-wiki-pages
Unknwon [Fri, 4 Mar 2016 18:14:37 +0000 (13:14 -0500)]
Merge pull request #2746 from joshfng/feature-delete-wiki-pages

Add ability to delete single wiki pages.

8 years ago#2743 and #2751 fix bad SQL generated by XORM
Unknwon [Fri, 4 Mar 2016 18:08:47 +0000 (13:08 -0500)]
#2743 and #2751 fix bad SQL generated by XORM

Use hand-written SQL to do complex query

8 years agoUpdate delete wiki page route
Josh Frye [Thu, 3 Mar 2016 22:41:01 +0000 (17:41 -0500)]
Update delete wiki page route

8 years agoAdd ability to delete single wiki pages.
Josh Frye [Thu, 3 Mar 2016 22:06:50 +0000 (17:06 -0500)]
Add ability to delete single wiki pages.

8 years ago#2748 fix redirect loop with auto-signin
Unknwon [Fri, 4 Mar 2016 14:15:11 +0000 (09:15 -0500)]
#2748 fix redirect loop with auto-signin

8 years agoMerge pull request #2738 from andreynering/emogify
Unknwon [Fri, 4 Mar 2016 04:38:20 +0000 (23:38 -0500)]
Merge pull request #2738 from andreynering/emogify

Render emojis in more places.

8 years agoMinor fixes for #2745
Unknwon [Fri, 4 Mar 2016 04:24:22 +0000 (23:24 -0500)]
Minor fixes for #2745

8 years agoMerge pull request #2745 from joshfng/delete-wiki-option
Unknwon [Fri, 4 Mar 2016 04:04:35 +0000 (23:04 -0500)]
Merge pull request #2745 from joshfng/delete-wiki-option

Repo setting to delete and disable wiki

8 years agoRepo setting to delete and disable wiki
Josh Frye [Thu, 3 Mar 2016 20:38:25 +0000 (15:38 -0500)]
Repo setting to delete and disable wiki

8 years ago#1891 attempt to fix expected invalid CSRF token
Unknwon [Thu, 3 Mar 2016 20:09:43 +0000 (15:09 -0500)]
#1891 attempt to fix expected invalid CSRF token

- Remove unused config settings `[picture] service`

8 years agoMerge pull request #2744 from joshfng/mirror-default-branch
Unknwon [Thu, 3 Mar 2016 19:22:45 +0000 (14:22 -0500)]
Merge pull request #2744 from joshfng/mirror-default-branch

Set DefaultBranch to master when importing a new repo.

8 years agoReturn errors instead of just logging them.
Josh Frye [Thu, 3 Mar 2016 17:43:23 +0000 (12:43 -0500)]
Return errors instead of just logging them.

8 years agoSet DefaultBranch to master when importing a new repo if possible
Josh Frye [Thu, 3 Mar 2016 17:07:43 +0000 (12:07 -0500)]
Set DefaultBranch to master when importing a new repo if possible

8 years ago#2743 workaround to fix XORM problem
Unknwon [Thu, 3 Mar 2016 15:57:27 +0000 (10:57 -0500)]
#2743 workaround to fix XORM problem

8 years agoMerge pull request #2719 from mblacktree/patch-1
Unknwon [Thu, 3 Mar 2016 15:35:59 +0000 (10:35 -0500)]
Merge pull request #2719 from mblacktree/patch-1

update README.md

8 years agoRender emojis in more places.
Andrey Nering [Thu, 3 Mar 2016 00:18:58 +0000 (21:18 -0300)]
Render emojis in more places.

8 years agoUpdate TRANSLATORS and remove tip for CI
Unknwon [Wed, 2 Mar 2016 21:43:32 +0000 (16:43 -0500)]
Update TRANSLATORS and remove tip for CI

8 years agoMerge pull request #2736 from neolit123/patch
Unknwon [Wed, 2 Mar 2016 18:53:49 +0000 (13:53 -0500)]
Merge pull request #2736 from neolit123/patch

ISSUE_TEMPLATE: suggestion to test at try.gogs.io

8 years agoISSUE_TEMPLATE: suggestion to test at try.gogs.io
Lubomir I. Ivanov [Wed, 2 Mar 2016 13:58:59 +0000 (15:58 +0200)]
ISSUE_TEMPLATE: suggestion to test at try.gogs.io

I've noticed that a lot of issues cannot be reproduced on http://try.gogs.io,
which either hints about specific database type problems or
hints about bugs which are already solved in the newer version
(as http://try.gogs.io is usually a newer build).

This patch adds the suggestion to test the issue at http://try.gogs.io in
the Github "issue template". The user can answer: "Yes", "No", "Not relevant".

"Not relevant" is an option where testing on http://try.gogs.io makes no sense as
the bug is unrelated to the Web UI or is very specific in nature.

8 years ago#2727 make IN clause compatible with Postgres
Unknwon [Tue, 1 Mar 2016 19:39:28 +0000 (14:39 -0500)]
#2727 make IN clause compatible with Postgres

8 years agoAllow setting git operations timeouts
Unknwon [Tue, 1 Mar 2016 00:29:49 +0000 (19:29 -0500)]
Allow setting git operations timeouts

- Migrate: #2704 #2653
- Clone: #2701
- Mirror, Pull

8 years ago#2700 fix sqlite3 can't create issue with more than one label
Unknwon [Mon, 29 Feb 2016 23:45:12 +0000 (18:45 -0500)]
#2700 fix sqlite3 can't create issue with more than one label

8 years agoMerge pull request #2722 from chriswatt/hidewikidlbutton
Unknwon [Mon, 29 Feb 2016 18:36:22 +0000 (13:36 -0500)]
Merge pull request #2722 from chriswatt/hidewikidlbutton

Hide the download archive button when viewing wiki pages

8 years agoRemove download archive button on wiki pages
chriswatt [Mon, 29 Feb 2016 15:45:55 +0000 (15:45 +0000)]
Remove download archive button on wiki pages

8 years agoMerge pull request #2717 from chriswatt/prtabs
Unknwon [Mon, 29 Feb 2016 05:51:58 +0000 (00:51 -0500)]
Merge pull request #2717 from chriswatt/prtabs

Change colour of numbers on pull request tabs if greater than zero

8 years agoupdate README.md
Mike [Mon, 29 Feb 2016 02:17:19 +0000 (21:17 -0500)]
update README.md

minor grammar fix

8 years agoChange colour of numbers on pull request tabs if greater than zero
chriswatt [Sun, 28 Feb 2016 23:27:41 +0000 (23:27 +0000)]
Change colour of numbers on pull request tabs if greater than zero

8 years agoPost work for #2637
Unknwon [Sun, 28 Feb 2016 01:48:39 +0000 (20:48 -0500)]
Post work for #2637

Improve test cases, config settings, also show SSH config settings on admin config panel.

8 years agoMerge pull request #2637 from Gibheer/ssh-publickeys
Unknwon [Sat, 27 Feb 2016 23:55:14 +0000 (18:55 -0500)]
Merge pull request #2637 from Gibheer/ssh-publickeys

allow native and ssh-keygen public key check

8 years agoMinor fix for #2710
Unknwon [Sat, 27 Feb 2016 16:31:24 +0000 (11:31 -0500)]
Minor fix for #2710

8 years agoMerge pull request #2710 from lukasdietrich/develop
Unknwon [Sat, 27 Feb 2016 16:10:57 +0000 (11:10 -0500)]
Merge pull request #2710 from lukasdietrich/develop

Add ForegroundColor for labels to resolve #2033

8 years agoAdd ForegroundColor for labels
Lukas Dietrich [Sat, 27 Feb 2016 12:59:11 +0000 (13:59 +0100)]
Add ForegroundColor for labels

8 years agoMerge pull request #2706 from ChubbyNinja/develop
Unknwon [Fri, 26 Feb 2016 19:24:38 +0000 (14:24 -0500)]
Merge pull request #2706 from ChubbyNinja/develop

Image attachments keep aspect ratio

8 years agoMerge pull request #2694 from mhartkorn/pullrefs
Unknwon [Fri, 26 Feb 2016 19:21:31 +0000 (14:21 -0500)]
Merge pull request #2694 from mhartkorn/pullrefs

Improved Pull Request refs

8 years agoMerge pull request #2707 from gogits/docker/update
Unknwon [Fri, 26 Feb 2016 17:25:32 +0000 (12:25 -0500)]
Merge pull request #2707 from gogits/docker/update

Docker Container update

8 years agoUpdate Docker REAMDE.md
Jean-Philippe Roemer [Fri, 26 Feb 2016 17:07:31 +0000 (17:07 +0000)]
Update Docker REAMDE.md

- Remove the known issue about `.dockerignore` being ignored during DockerHub automated build as this has been fixed
- Added a note on the fact that we currently do no support building the container on RPi1

8 years agoImage attachments keep aspect ratio
ChubbyNinja [Fri, 26 Feb 2016 14:09:37 +0000 (14:09 +0000)]
Image attachments keep aspect ratio

8 years agoUpdate .dockerignore to add new unneeded files from the Docker Context
Jean-Philippe Roemer [Thu, 25 Feb 2016 20:00:26 +0000 (20:00 +0000)]
Update .dockerignore to add new unneeded files from the Docker Context

8 years agoDockerfile & Dockerfile.pi updates
Jean-Philippe Roemer [Thu, 25 Feb 2016 17:41:41 +0000 (17:41 +0000)]
Dockerfile & Dockerfile.pi updates

- Upgrade of gosu to v1.7
- Change in docker/build.sh to use `--no-cache` to prevent APKINDEX creation when installing dev dependencies
- Manual upgrade of Alpine on Raspberry Pi when building to make sure the environment is the same as the standard Dockerfile

8 years ago#2697 fix panic when close issue via commit message
Unknwon [Thu, 25 Feb 2016 19:17:55 +0000 (14:17 -0500)]
#2697 fix panic when close issue via commit message

8 years agoAdd new config option for builtin SSH server
Unknwon [Thu, 25 Feb 2016 05:21:48 +0000 (00:21 -0500)]
Add new config option for builtin SSH server

Config option [server] SSH_LISTEN_PORT to the port the builtin SSH server will be listen.
It can be different from SSH_PORT which is supposed to be exposed in the clone URL.
This should solve the problem when user runs Gogs inside Docker container
and still want to use builtin SSH server.

8 years agoMinor fix for #2660
Unknwon [Thu, 25 Feb 2016 04:59:17 +0000 (23:59 -0500)]
Minor fix for #2660

8 years agoMerge pull request #2660 from joshfng/config-test-mailer
Unknwon [Thu, 25 Feb 2016 04:26:32 +0000 (23:26 -0500)]
Merge pull request #2660 from joshfng/config-test-mailer

Test mailer button. Addresses #1531

8 years agoTest mailer button. Addresses #1531
Josh Frye [Thu, 18 Feb 2016 22:13:12 +0000 (17:13 -0500)]
Test mailer button. Addresses #1531

8 years agoCall PushToBaseRepo() also on Pull Request creation and not only on git push
Martin Hartkorn [Wed, 24 Feb 2016 12:56:54 +0000 (13:56 +0100)]
Call PushToBaseRepo() also on Pull Request creation and not only on git push

8 years agoPrepare to release
Unknwon [Wed, 24 Feb 2016 06:14:43 +0000 (01:14 -0500)]
Prepare to release

8 years agoMerge pull request #2693 from appleboy/patch-2
Unknwon [Wed, 24 Feb 2016 05:19:01 +0000 (00:19 -0500)]
Merge pull request #2693 from appleboy/patch-2

test the latest version.

8 years agouse StartSSHServer instead of DisableSSH
Gibheer [Tue, 23 Feb 2016 14:43:52 +0000 (15:43 +0100)]
use StartSSHServer instead of DisableSSH

DisableSSH doesn't check the kind of ssh server to use, so that was
wrong. Use StartSSHServer instead.

8 years agoseperate ssh constants from schema constants
Gibheer [Tue, 23 Feb 2016 14:41:44 +0000 (15:41 +0100)]
seperate ssh constants from schema constants

The contants were placed in the same section as the scheme ones, which
may lead to confusion.

8 years agovariable should not use ALL_CAPS
Gibheer [Tue, 23 Feb 2016 14:39:05 +0000 (15:39 +0100)]
variable should not use ALL_CAPS

8 years agotest the latest version.
Bo-Yi Wu [Tue, 23 Feb 2016 08:04:40 +0000 (16:04 +0800)]
test the latest version.

8 years ago#2682 fix missing slash for go-get meta
Unknwon [Tue, 23 Feb 2016 05:12:04 +0000 (00:12 -0500)]
#2682 fix missing slash for go-get meta

8 years ago#1821 add actions for close and reopen issues
Unknwon [Mon, 22 Feb 2016 17:40:00 +0000 (12:40 -0500)]
#1821 add actions for close and reopen issues

8 years agoMerge pull request #2665 from muhmuhten/develop
Unknwon [Mon, 22 Feb 2016 16:59:18 +0000 (11:59 -0500)]
Merge pull request #2665 from muhmuhten/develop

Dockerfile cleanup for Alpine 3.3

8 years agoFix wrong place to check disable SSH
Unknwon [Mon, 22 Feb 2016 02:55:59 +0000 (21:55 -0500)]
Fix wrong place to check disable SSH

8 years agoMerge pull request #2674 from andreynering/highlight-little-refactoring
Unknwon [Sun, 21 Feb 2016 22:07:17 +0000 (17:07 -0500)]
Merge pull request #2674 from andreynering/highlight-little-refactoring

Little refactoring of diff highlight.

8 years agoLittle refactoring of diff highlight.
Andrey Nering [Sun, 21 Feb 2016 21:45:24 +0000 (18:45 -0300)]
Little refactoring of diff highlight.

Moving cache variable to template instead of in the struct.

8 years agoMerge pull request #2672 from louwers/patch-1
Unknwon [Sun, 21 Feb 2016 21:16:54 +0000 (16:16 -0500)]
Merge pull request #2672 from louwers/patch-1

Removed duplicate of paragraph

8 years agoRemoved duplicate of paragraph
Bart [Sun, 21 Feb 2016 15:02:00 +0000 (16:02 +0100)]
Removed duplicate of paragraph

8 years agoReplace uuid module with original package
Unknwon [Sat, 20 Feb 2016 23:13:12 +0000 (18:13 -0500)]
Replace uuid module with original package

8 years ago#2334 strip whitespace for migrate URL
Unknwon [Sat, 20 Feb 2016 22:32:34 +0000 (17:32 -0500)]
#2334 strip whitespace for migrate URL

Also fix a possible race condition while install

8 years agoMake markdown as an independent module
Unknwon [Sat, 20 Feb 2016 22:10:05 +0000 (17:10 -0500)]
Make markdown as an independent module

8 years agoMove cron module to independent package
Unknwon [Sat, 20 Feb 2016 20:58:09 +0000 (15:58 -0500)]
Move cron module to independent package

Make it easier to keep track of upstream changes and bug fixes

8 years agoFix #857
Unknwon [Sat, 20 Feb 2016 20:10:34 +0000 (15:10 -0500)]
Fix #857

8 years agoMinor fix for #2634
Unknwon [Sat, 20 Feb 2016 19:56:27 +0000 (14:56 -0500)]
Minor fix for #2634

Add AttributesInBind option in new auth source form.

8 years agoMerge pull request #2634 from nanoant/patch/ldap-attributes-in-bind
Unknwon [Sat, 20 Feb 2016 19:44:21 +0000 (14:44 -0500)]
Merge pull request #2634 from nanoant/patch/ldap-attributes-in-bind

LDAP: Fetch attributes in Bind DN context

8 years agoMerge pull request #2647 from andreynering/issue-template
Unknwon [Sat, 20 Feb 2016 19:12:15 +0000 (14:12 -0500)]
Merge pull request #2647 from andreynering/issue-template

Implement issue and pull request templates

8 years agoUpdate bindata for LDAP changes
Adam Strzelecki [Tue, 16 Feb 2016 11:37:57 +0000 (12:37 +0100)]
Update bindata for LDAP changes

8 years agoLDAP: Make a bit more detailed log traces
Adam Strzelecki [Tue, 16 Feb 2016 11:36:40 +0000 (12:36 +0100)]
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.

8 years agoLDAP: Fetch attributes in Bind DN context option
Adam Strzelecki [Tue, 16 Feb 2016 11:33:16 +0000 (12:33 +0100)]
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.

8 years agoLDAP: Use single connection in BindDN mode auth
Adam Strzelecki [Tue, 16 Feb 2016 10:58:00 +0000 (11:58 +0100)]
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.

8 years agoupdate alpine package dependencies
Muh Muhten [Sat, 20 Feb 2016 03:54:51 +0000 (22:54 -0500)]
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

8 years agoMinor fix for #2524
Unknwon [Sat, 20 Feb 2016 03:16:26 +0000 (22:16 -0500)]
Minor fix for #2524

8 years agoMerge pull request #2524 from mhartkorn/pullrefs
Unknwon [Sat, 20 Feb 2016 03:00:25 +0000 (22:00 -0500)]
Merge pull request #2524 from mhartkorn/pullrefs

Enable a way to checkout Pull Requests from remote refs

8 years agoFix panic when view profile without signin
Unknwon [Fri, 19 Feb 2016 23:10:03 +0000 (18:10 -0500)]
Fix panic when view profile without signin

Also fix that no matter who, still able to see organizations with private membership.

8 years agoRemove border-bottom for tabs header divider
Unknwon [Fri, 19 Feb 2016 22:49:48 +0000 (17:49 -0500)]
Remove border-bottom for tabs header divider

8 years agoFix inappropriate markdown post process end tag check
Unknwon [Fri, 19 Feb 2016 22:39:50 +0000 (17:39 -0500)]
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.

8 years agoMerge pull request #2664 from jwdeitch/patch-1
Unknwon [Fri, 19 Feb 2016 21:09:43 +0000 (16:09 -0500)]
Merge pull request #2664 from jwdeitch/patch-1

Update contributing guidlines link

8 years agoUpdate README.md
jwdeitch [Fri, 19 Feb 2016 21:07:15 +0000 (16:07 -0500)]
Update README.md

8 years agoUpdate contributing guidlines link
jwdeitch [Fri, 19 Feb 2016 20:25:23 +0000 (15:25 -0500)]
Update contributing guidlines link

previously displays 404

8 years agoMerge pull request #2663 from Download-Fritz/MirrorForks
Unknwon [Fri, 19 Feb 2016 20:04:50 +0000 (15:04 -0500)]
Merge pull request #2663 from Download-Fritz/MirrorForks

#2505 Allow to fork and disallow to create PRs for mirrors.

8 years agoRename MustEnablePulls() to MustAllowPulls() and simplify the contained check to...
Download-Fritz [Fri, 19 Feb 2016 19:48:32 +0000 (20:48 +0100)]
Rename MustEnablePulls() to MustAllowPulls() and simplify the contained check to AllowsPulls().

8 years ago#2505 Allow to fork and disallow to create PRs for mirrors.
Download-Fritz [Fri, 19 Feb 2016 19:33:06 +0000 (20:33 +0100)]
#2505 Allow to fork and disallow to create PRs for mirrors.

8 years agoImplement issue and pull request templates.
Andrey Nering [Wed, 17 Feb 2016 22:21:31 +0000 (20:21 -0200)]
Implement issue and pull request templates.

Similar to GitHub:
https://github.com/blog/2111-issue-and-pull-request-templates

Priority:
- root
- .gogs
- .github

8 years agoMerge pull request #2659 from joshfng/fix-issue-email-format
Unknwon [Thu, 18 Feb 2016 21:19:23 +0000 (16:19 -0500)]
Merge pull request #2659 from joshfng/fix-issue-email-format

Fix issue email formatting. Addresses #2331

8 years agoFix issue email formatting. Addresses #2331
Josh Frye [Thu, 18 Feb 2016 20:00:47 +0000 (15:00 -0500)]
Fix issue email formatting. Addresses #2331

8 years agoMerge pull request #2658 from fnkr/fix-chmod
Unknwon [Thu, 18 Feb 2016 19:39:27 +0000 (14:39 -0500)]
Merge pull request #2658 from fnkr/fix-chmod

Fix chmod for several files in conf/locale/ and public/

8 years agoFix chmod for several files in conf/locale/ and public/
Florian Kaiser [Thu, 18 Feb 2016 19:31:23 +0000 (19:31 +0000)]
Fix chmod for several files in conf/locale/ and public/

8 years ago#2650 fix possbility that use email as pusher user name
Unknwon [Thu, 18 Feb 2016 03:47:06 +0000 (22:47 -0500)]
#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.

8 years agoAdd issue and pull request template
Unknwon [Thu, 18 Feb 2016 02:22:58 +0000 (21:22 -0500)]
Add issue and pull request template

8 years agoMerge pull request #2649 from andreynering/gh-issue-template
Unknwon [Wed, 17 Feb 2016 23:29:35 +0000 (18:29 -0500)]
Merge pull request #2649 from andreynering/gh-issue-template

Add GitHub's issue and pull request templates.

8 years agoAdd GitHub's issue and pull request templates.
Andrey Nering [Wed, 17 Feb 2016 22:40:14 +0000 (20:40 -0200)]
Add GitHub's issue and pull request templates.

8 years ago#2646 fix panic on pushing repositor
Unknwon [Wed, 17 Feb 2016 20:17:52 +0000 (15:17 -0500)]
#2646 fix panic on pushing repositor

8 years ago#2639 add branch prefix for test webhook
Unknwon [Wed, 17 Feb 2016 20:05:07 +0000 (15:05 -0500)]
#2639 add branch prefix for test webhook

8 years agoremove ed25519 test for now
Gibheer [Wed, 17 Feb 2016 10:30:48 +0000 (11:30 +0100)]
remove ed25519 test for now

TravisCI is too old for ed25519, so it can't be tested correctly.

8 years agofix ssh public key tests
Gibheer [Wed, 17 Feb 2016 08:33:41 +0000 (09:33 +0100)]
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.

8 years agoallow native and ssh-keygen public key check
Gibheer [Tue, 16 Feb 2016 22:01:56 +0000 (23:01 +0100)]
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
7ef9a055886574655d9f2be70c957bc16bf30500. 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.

8 years ago#2633 fix removed config option
Unknwon [Tue, 16 Feb 2016 18:27:02 +0000 (13:27 -0500)]
#2633 fix removed config option