Merge branch 'master' of https://github.com/go-gitea/gitea

2018-05-11 10:46:43 +02:00 · 2018-05-11 10:46:43 +02:00 · 617d8cda75
commit 617d8cda75
parent 83b883104a c14870c5ac
43 changed files with 1270 additions and 379 deletions
--- a/.drone.yml
+++ b/.drone.yml
@ -134,6 +134,7 @@ pipeline:
    group: test
    environment:
      TAGS: bindata
+      TEST_LDAP: "1"
    commands:
      - curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash
      - apt-get install -y git-lfs
@ -148,6 +149,7 @@ pipeline:
    group: test
    environment:
      TAGS: bindata
+      TEST_LDAP: "1"
    commands:
      - curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash
      - apt-get install -y git-lfs
@ -161,6 +163,7 @@ pipeline:
    group: test
    environment:
      TAGS: bindata
+      TEST_LDAP: "1"
    commands:
      - curl -s https://packagecloud.io/install/repositories/github/git-lfs/script.deb.sh | bash
      - apt-get install -y git-lfs
@ -336,3 +339,8 @@ services:
      - POSTGRES_DB=test
    when:
      event: [ push, tag, pull_request ]
+
+  ldap:
+    image: gitea/test-openldap:latest
+    when:
+      event: [ push, tag, pull_request ]
--- a/2
+++ b/2
@ -292,7 +292,7 @@ stylesheets-check: generate-stylesheets

 .PHONY: generate-stylesheets
 generate-stylesheets:
-	node_modules/.bin/lessc --no-ie-compat --clean-css public/less/index.less public/css/index.css
+	node_modules/.bin/lessc --clean-css public/less/index.less public/css/index.css

 .PHONY: swagger-ui
 swagger-ui:
--- a/README.md
+++ b/README.md
@ -4,12 +4,11 @@

 [![Build Status](https://drone.gitea.io/api/badges/go-gitea/gitea/status.svg)](https://drone.gitea.io/go-gitea/gitea)
 [![Join the Discord chat at https://discord.gg/NsatcWJ](https://img.shields.io/discord/322538954119184384.svg)](https://discord.gg/NsatcWJ)
-[![Join the Matrix chat at https://matrix.to/#/#gitea:matrix.org](https://img.shields.io/badge/matrix-%23gitea%3Amatrix.org-7bc9a4.svg)](https://matrix.to/#/#gitea:matrix.org)
 [![](https://images.microbadger.com/badges/image/gitea/gitea.svg)](https://microbadger.com/images/gitea/gitea "Get your own image badge on microbadger.com")
 [![codecov](https://codecov.io/gh/go-gitea/gitea/branch/master/graph/badge.svg)](https://codecov.io/gh/go-gitea/gitea)
 [![Go Report Card](https://goreportcard.com/badge/code.gitea.io/gitea)](https://goreportcard.com/report/code.gitea.io/gitea)
 [![GoDoc](https://godoc.org/code.gitea.io/gitea?status.svg)](https://godoc.org/code.gitea.io/gitea)
-[![Release](https://github-release-version.herokuapp.com/github/go-gitea/gitea/release.svg?style=flat)](https://github.com/go-gitea/gitea/releases/latest)
+[![GitHub release](https://img.shields.io/github/release/go-gitea/gitea.svg)](https://github.com/go-gitea/gitea/releases/latest)
 [![Help Contribute to Open Source](https://www.codetriage.com/go-gitea/gitea/badges/users.svg)](https://www.codetriage.com/go-gitea/gitea)
 [![Become a backer/sponsor of gitea](https://opencollective.com/gitea/tiers/backer/badge.svg?label=backer&color=brightgreen)](https://opencollective.com/gitea)

@ -63,7 +62,6 @@ For more information and instructions about how to install Gitea, please look
 at our [documentation](https://docs.gitea.io/en-us/). If you have questions
 that are not covered by the documentation, you can get in contact with us on
 our [Discord server](https://discord.gg/NsatcWJ),
-[Matrix room](https://matrix.to/#/#gitea:matrix.org),
 or [forum](https://discourse.gitea.io/)!

 ## Authors
@ -72,6 +70,27 @@ or [forum](https://discourse.gitea.io/)!
 * [Contributors](https://github.com/go-gitea/gitea/graphs/contributors)
 * [Translators](options/locale/TRANSLATORS)

+## Backers
+
+Thank you to all our backers! 🙏 [[Become a backer](https://opencollective.com/gitea#backer)]
+
+<a href="https://opencollective.com/gitea#backers" target="_blank"><img src="https://opencollective.com/gitea/backers.svg?width=890"></a>
+
+## Sponsors
+
+Support this project by becoming a sponsor. Your logo will show up here with a link to your website. [[Become a sponsor](https://opencollective.com/gitea#sponsor)]
+
+<a href="https://opencollective.com/gitea/sponsor/0/website" target="_blank"><img src="https://opencollective.com/gitea/sponsor/0/avatar.svg"></a>
+<a href="https://opencollective.com/gitea/sponsor/1/website" target="_blank"><img src="https://opencollective.com/gitea/sponsor/1/avatar.svg"></a>
+<a href="https://opencollective.com/gitea/sponsor/2/website" target="_blank"><img src="https://opencollective.com/gitea/sponsor/2/avatar.svg"></a>
+<a href="https://opencollective.com/gitea/sponsor/3/website" target="_blank"><img src="https://opencollective.com/gitea/sponsor/3/avatar.svg"></a>
+<a href="https://opencollective.com/gitea/sponsor/4/website" target="_blank"><img src="https://opencollective.com/gitea/sponsor/4/avatar.svg"></a>
+<a href="https://opencollective.com/gitea/sponsor/5/website" target="_blank"><img src="https://opencollective.com/gitea/sponsor/5/avatar.svg"></a>
+<a href="https://opencollective.com/gitea/sponsor/6/website" target="_blank"><img src="https://opencollective.com/gitea/sponsor/6/avatar.svg"></a>
+<a href="https://opencollective.com/gitea/sponsor/7/website" target="_blank"><img src="https://opencollective.com/gitea/sponsor/7/avatar.svg"></a>
+<a href="https://opencollective.com/gitea/sponsor/8/website" target="_blank"><img src="https://opencollective.com/gitea/sponsor/8/avatar.svg"></a>
+<a href="https://opencollective.com/gitea/sponsor/9/website" target="_blank"><img src="https://opencollective.com/gitea/sponsor/9/avatar.svg"></a>
+
 ## License

 This project is licensed under the MIT License.
--- a/README_ZH.md
+++ b/README_ZH.md
@ -8,7 +8,7 @@
 [![Coverage Status](https://coverage.gitea.io/badges/go-gitea/gitea/coverage.svg)](https://coverage.gitea.io/go-gitea/gitea)
 [![Go Report Card](https://goreportcard.com/badge/code.gitea.io/gitea)](https://goreportcard.com/report/code.gitea.io/gitea)
 [![GoDoc](https://godoc.org/code.gitea.io/gitea?status.svg)](https://godoc.org/code.gitea.io/gitea)
-[![Release](https://github-release-version.herokuapp.com/github/go-gitea/gitea/release.svg?style=flat)](https://github.com/go-gitea/gitea/releases/latest)
+[![GitHub release](https://img.shields.io/github/release/go-gitea/gitea.svg)](https://github.com/go-gitea/gitea/releases/latest)
 [![Become a backer/sponsor of gitea](https://opencollective.com/gitea/tiers/backer/badge.svg?label=backer&color=brightgreen)](https://opencollective.com/gitea)

 | | | |
--- a/contrib/systemd/gitea.service
+++ b/contrib/systemd/gitea.service
@ -22,6 +22,11 @@ WorkingDirectory=/home/git/gitea
 ExecStart=/home/git/gitea/gitea web
 Restart=always
 Environment=USER=git HOME=/home/git
+# If you want to bind Gitea to a port below 1024 uncomment
+# the two values below
+###
+#CapabilityBoundingSet=CAP_NET_BIND_SERVICE
+#AmbientCapabilities=CAP_NET_BIND_SERVICE

 [Install]
 WantedBy=multi-user.target
--- a/custom/conf/app.ini.sample
+++ b/custom/conf/app.ini.sample
@ -2,7 +2,9 @@
 ; Copy required sections to your own app.ini (default is custom/conf/app.ini)
 ; and modify as needed.

-; App name that shows on every page title
+; see https://docs.gitea.io/en-us/config-cheat-sheet/ for additional documentation.
+
+; App name that shows in every page title
 APP_NAME = Gitea: Git with a cup of tea
 ; Change it if you run locally
 RUN_USER = git
@ -16,28 +18,28 @@ SCRIPT_TYPE = bash
 ANSI_CHARSET =
 ; Force every new repository to be private
 FORCE_PRIVATE = false
-; Default private when create a new repository, could be: last, private, public. Default is last which means last user repo visiblity.
+; Default privacy setting when creating a new repository, allowed values: last, private, public. Default is last which means the last setting used.
 DEFAULT_PRIVATE = last
-; Global maximum creation limit of repository per user, -1 means no limit
+; Global limit of repositories per user, applied at creation time. -1 means no limit
 MAX_CREATION_LIMIT = -1
 ; Mirror sync queue length, increase if mirror syncing starts hanging
 MIRROR_QUEUE_LENGTH = 1000
 ; Patch test queue length, increase if pull request patch testing starts hanging
 PULL_REQUEST_QUEUE_LENGTH = 1000
 ; Preferred Licenses to place at the top of the List
-; Name must match file name in conf/license or custom/conf/license
+; The name here must match the filename in conf/license or custom/conf/license
 PREFERRED_LICENSES = Apache License 2.0,MIT License
-; Disable ability to interact with repositories by HTTP protocol
+; Disable the ability to interact with repositories using the HTTP protocol
 DISABLE_HTTP_GIT = false
 ; Force ssh:// clone url instead of scp-style uri when default SSH port is used
 USE_COMPAT_SSH_URI = false

 [repository.editor]
-; List of file extensions that should have line wraps in the CodeMirror editor
-; Separate extensions with a comma. To line wrap files w/o extension, just put a comma
+; List of file extensions for which lines should be wrapped in the CodeMirror editor
+; Separate extensions with a comma. To line wrap files without an extension, just put a comma
 LINE_WRAP_EXTENSIONS = .txt,.md,.markdown,.mdown,.mkd,
 ; Valid file modes that have a preview API associated with them, such as api/v1/markdown
-; Separate values by commas. Preview tab in edit mode won't show if the file extension doesn't match
+; Separate the values by commas. The preview tab in edit mode won't be displayed if the file extension doesn't match
 PREVIEWABLE_FILE_MODES = markdown

 [repository.local]
@ -53,39 +55,39 @@ ENABLED = true
 TEMP_PATH = data/tmp/uploads
 ; One or more allowed types, e.g. image/jpeg|image/png. Nothing means any file type
 ALLOWED_TYPES =
-; Max size of each file in MB. Defaults to 3MB
+; Max size of each file in megabytes. Defaults to 3MB
 FILE_MAX_SIZE = 3
 ; Max number of files per upload. Defaults to 5
 MAX_FILES = 5

 [ui]
-; Number of repositories that are showed in one explore page
+; Number of repositories that are displayed on one explore page
 EXPLORE_PAGING_NUM = 20
-; Number of issues that are showed in one page
+; Number of issues that are displayed on one page
 ISSUE_PAGING_NUM = 10
-; Number of maximum commits showed in one activity feed
+; Number of maximum commits displayed in one activity feed
 FEED_MAX_COMMIT_NUM = 5
 ; Value of `theme-color` meta tag, used by Android >= 5.0
 ; An invalid color like "none" or "disable" will have the default style
 ; More info: https://developers.google.com/web/updates/2014/11/Support-for-theme-color-in-Chrome-39-for-Android
 THEME_COLOR_META_TAG = `#6cc644`
-; Max size of files to be displayed (defaults is 8MiB)
+; Max size of files to be displayed (default is 8MiB)
 MAX_DISPLAY_FILE_SIZE = 8388608
-; Whether show the user email in the Explore Users page
+; Whether the email of the user should be shown in the Explore Users page
 SHOW_USER_EMAIL = true

 [ui.admin]
-; Number of users that are showed in one page
+; Number of users that are displayed on one page
 USER_PAGING_NUM = 50
-; Number of repos that are showed in one page
+; Number of repos that are displayed on one page
 REPO_PAGING_NUM = 50
-; Number of notices that are showed in one page
+; Number of notices that are displayed on in one page
 NOTICE_PAGING_NUM = 25
-; Number of organization that are showed in one page
+; Number of organizations that are displayed on one page
 ORG_PAGING_NUM = 50

 [ui.user]
-; Number of repos that are showed in one page
+; Number of repos that are displayed on one page
 REPO_PAGING_NUM = 15

 [ui.meta]
@ -100,19 +102,19 @@ ENABLE_HARD_LINE_BREAK = false
 ; for example git,magnet
 CUSTOM_URL_SCHEMES =
 ; List of file extensions that should be rendered/edited as Markdown
-; Separate extensions with a comma. To render files w/o extension as markdown, just put a comma
+; Separate the extensions with a comma. To render files without any extension as markdown, just put a comma
 FILE_EXTENSIONS = .md,.markdown,.mdown,.mkd

 [server]
-; Listen protocol. One of 'http', 'https', 'unix' or 'fcgi'.
+; The protocol the server listens on. One of 'http', 'https', 'unix' or 'fcgi'.
 PROTOCOL = http
 DOMAIN = localhost
 ROOT_URL = %(PROTOCOL)s://%(DOMAIN)s:%(HTTP_PORT)s/
-; Listen address. Either a IPv4/IPv6 address or the path to a unix socket.
+; The address to listen on. Either a IPv4/IPv6 address or the path to a unix socket.
 HTTP_ADDR = 0.0.0.0
 HTTP_PORT = 3000
 ; If REDIRECT_OTHER_PORT is true, and PROTOCOL is set to https an http server
-; will be started on PORT_TO_REDIRECT and redirect request to the main
+; will be started on PORT_TO_REDIRECT and it will redirect plain, non-secure http requests to the main
 ; ROOT_URL.  Defaults are false for REDIRECT_OTHER_PORT and 80 for
 ; PORT_TO_REDIRECT.
 REDIRECT_OTHER_PORT = false
@ -125,33 +127,33 @@ UNIX_SOCKET_PERMISSION = 666
 LOCAL_ROOT_URL = %(PROTOCOL)s://%(HTTP_ADDR)s:%(HTTP_PORT)s/
 ; Disable SSH feature when not available
 DISABLE_SSH = false
-; Whether use builtin SSH server or not.
+; Whether to use the builtin SSH server or not.
 START_SSH_SERVER = false
-; Username to use for builtin SSH server. If blank, then it is the value of RUN_USER.
+; Username to use for the builtin SSH server. If blank, then it is the value of RUN_USER.
 BUILTIN_SSH_SERVER_USER =
 ; Domain name to be exposed in clone URL
 SSH_DOMAIN = %(DOMAIN)s
-; Network interface builtin SSH server listens on
+; THe network interface the builtin SSH server should listen on
 SSH_LISTEN_HOST =
 ; Port number to be exposed in clone URL
 SSH_PORT = 22
-; Port number builtin SSH server listens on
+; The port number the builtin SSH server should listen on
 SSH_LISTEN_PORT = %(SSH_PORT)s
 ; Root path of SSH directory, default is '~/.ssh', but you have to use '/home/git/.ssh'.
 SSH_ROOT_PATH =
-; For built-in SSH server only, choose the ciphers to support for SSH connections,
+; For the built-in SSH server, choose the ciphers to support for SSH connections,
 ; for system SSH this setting has no effect
 SSH_SERVER_CIPHERS = aes128-ctr, aes192-ctr, aes256-ctr, aes128-gcm@openssh.com, arcfour256, arcfour128
-; For built-in SSH server only, choose the key exchange algorithms to support for SSH connections,
+; For the built-in SSH server, choose the key exchange algorithms to support for SSH connections,
 ; for system SSH this setting has no effect
 SSH_SERVER_KEY_EXCHANGES = diffie-hellman-group1-sha1, diffie-hellman-group14-sha1, ecdh-sha2-nistp256, ecdh-sha2-nistp384, ecdh-sha2-nistp521, curve25519-sha256@libssh.org
-; For built-in SSH server only, choose the MACs to support for SSH connections,
+; For the built-in SSH server, choose the MACs to support for SSH connections,
 ; for system SSH this setting has no effect
 SSH_SERVER_MACS = hmac-sha2-256-etm@openssh.com, hmac-sha2-256, hmac-sha1, hmac-sha1-96
-; Directory to create temporary files when test public key using ssh-keygen,
-; default is system temporary directory.
+; Directory to create temporary files in when testing public keys using ssh-keygen,
+; default is the system temporary directory.
 SSH_KEY_TEST_PATH =
-; Path to ssh-keygen, default is 'ssh-keygen' and let shell find out which one to call.
+; Path to ssh-keygen, default is 'ssh-keygen' which means the shell is responsible for finding out which one to call.
 SSH_KEYGEN_PATH = ssh-keygen
 ; Enable SSH Authorized Key Backup when rewriting all keys, default is true
 SSH_BACKUP_AUTHORIZED_KEYS = true
@ -171,7 +173,7 @@ DISABLE_ROUTER_LOG = false
 ; $ openssl pkcs12 -in cert.pfx -out key.pem -nocerts -nodes
 CERT_FILE = custom/https/cert.pem
 KEY_FILE = custom/https/key.pem
-; Upper level of template and static file path
+; Root directory containing templates and static files.
 ; default is the path where Gitea is executed
 STATIC_ROOT_PATH =
 ; Default path for App data
@ -182,9 +184,9 @@ ENABLE_GZIP = false
 LANDING_PAGE = home
 ; Enables git-lfs support. true or false, default is false.
 LFS_START_SERVER = false
-; Where your lfs files put on, default is data/lfs.
+; Where your lfs files reside, default is data/lfs.
 LFS_CONTENT_PATH = data/lfs
-; LFS authentication secret, changed this to yourself.
+; LFS authentication secret, change this yourself
 LFS_JWT_SECRET =

 ; Define allowed algorithms and their minimum key length (use -1 to disable a type)
@ -204,7 +206,7 @@ USER = root
 PASSWD =
 ; For "postgres" only, either "disable", "require" or "verify-full"
 SSL_MODE = disable
-; For "sqlite3" and "tidb", use absolute path when you start as service
+; For "sqlite3" and "tidb", use absolute path when you start gitea as service
 PATH = data/gitea.db
 ; For "sqlite3" only. Query timeout
 SQLITE_TIMEOUT = 500
@ -222,7 +224,7 @@ UPDATE_BUFFER_LEN = 20
 MAX_FILE_SIZE = 1048576

 [admin]
-; Disable regular (non-admin) users to create organizations
+; Disallow regular (non-admin) users from creating organizations.
 DISABLE_REGULAR_ORG_CREATION = false

 [security]
@ -230,13 +232,13 @@ DISABLE_REGULAR_ORG_CREATION = false
 INSTALL_LOCK = false
 ; !!CHANGE THIS TO KEEP YOUR USER DATA SAFE!!
 SECRET_KEY = !#@FDEWREWR&*(
-; Auto-login remember days
+; How long to remember that an user is logged in before requiring relogin (in days)
 LOGIN_REMEMBER_DAYS = 7
 COOKIE_USERNAME = gitea_awesome
 COOKIE_REMEMBER_NAME = gitea_incredible
 ; Reverse proxy authentication header name of user name
 REVERSE_PROXY_AUTHENTICATION_USER = X-WEBAUTH-USER
-; Sets the minimum password length for new Users
+; The minimum password length for new Users
 MIN_PASSWORD_LENGTH = 6
 ; True when users are allowed to import local server paths
 IMPORT_LOCAL_PATHS = false
@ -245,7 +247,7 @@ DISABLE_GIT_HOOKS = false

 [openid]
 ;
-; OpenID is an open standard and decentralized authentication protocol.
+; OpenID is an open, standard and decentralized authentication protocol.
 ; Your identity is the address of a webpage you provide, which describes
 ; how to prove you are in control of that page.
 ;
@ -264,7 +266,7 @@ DISABLE_GIT_HOOKS = false
 ; Whether to allow signin in via OpenID
 ENABLE_OPENID_SIGNIN = true
 ; Whether to allow registering via OpenID
-; Do not include to rely on DISABLE_REGISTRATION setting
+; Do not include to rely on rhw DISABLE_REGISTRATION setting
 ;ENABLE_OPENID_SIGNUP = true
 ; Allowed URI patterns (POSIX regexp).
 ; Space separated.
@ -280,11 +282,11 @@ BLACKLISTED_URIS =
 [service]
 ; Time limit to confirm account/email registration
 ACTIVE_CODE_LIVE_MINUTES = 180
-; Time limit to confirm forgot password reset process
+; Time limit to perform the reset of a forgotten password
 RESET_PASSWD_CODE_LIVE_MINUTES = 180
-; User need to confirm e-mail for registration
+; Whether a new user needs to confirm their email when registering.
 REGISTER_EMAIL_CONFIRM = false
-; Does not allow register and admin create account only
+; Disallow registration, only allow admins to create accounts.
 DISABLE_REGISTRATION = false
 ; User must sign in to view anything.
 REQUIRE_SIGNIN_VIEW = false
@ -296,10 +298,10 @@ ENABLE_REVERSE_PROXY_AUTO_REGISTRATION = false
 ; Enable captcha validation for registration
 ENABLE_CAPTCHA = true
 ; Default value for KeepEmailPrivate
-; New user will get the value of this setting copied into their profile
+; Each new user will get the value of this setting copied into their profile
 DEFAULT_KEEP_EMAIL_PRIVATE = false
 ; Default value for AllowCreateOrganization
-; New user will have rights set to create organizations depending on this setting
+; Every new user will have rights set to create organizations depending on this setting
 DEFAULT_ALLOW_CREATE_ORGANIZATION = true
 ; Default value for EnableDependencies
 ; Repositories will use depencies by default depending on this setting
@ -310,10 +312,10 @@ ENABLE_TIMETRACKING = true
 ; Repositories will use timetracking by default depending on this setting
 DEFAULT_ENABLE_TIMETRACKING = true
 ; Default value for AllowOnlyContributorsToTrackTime
-; Only users with write permissions could track time if this is true
+; Only users with write permissions can track time if this is true
 DEFAULT_ALLOW_ONLY_CONTRIBUTORS_TO_TRACK_TIME = true
 ; Default value for the domain part of the user's email address in the git log
-; if he has set KeepEmailPrivate true. The user's email replaced with a
+; if he has set KeepEmailPrivate to true. The user's email will be replaced with a
 ; concatenation of the user name in lower case, "@" and NO_REPLY_ADDRESS.
 NO_REPLY_ADDRESS = noreply.example.org

@ -338,9 +340,9 @@ SUBJECT = %(APP_NAME)s
 ; QQ: smtp.qq.com:465
 ; Note, if the port ends with "465", SMTPS will be used. Using STARTTLS on port 587 is recommended per RFC 6409. If the server supports STARTTLS it will always be used.
 HOST =
-; Disable HELO operation when hostname are different.
+; Disable HELO operation when hostnames are different.
 DISABLE_HELO =
-; Custom hostname for HELO operation, default is from system.
+; Custom hostname for HELO operation, if no value is provided, one is retrieved from system.
 HELO_HOSTNAME =
 ; Do not verify the certificate of the server. Only use this for self-signed certificates
 SKIP_VERIFY =
@ -380,7 +382,7 @@ ITEM_TTL = 16h
 ; Either "memory", "file", or "redis", default is "memory"
 PROVIDER = memory
 ; Provider config options
-; memory: not have any config yet
+; memory: doesn't have any config yet
 ; file: session file path, e.g. `data/sessions`
 ; redis: network=tcp,addr=:6379,password=macaron,db=0,pool_size=100,idle_timeout=180
 ; mysql: go-sql-driver/mysql dsn config string, e.g. `root:password@/session_table`
@ -401,11 +403,11 @@ AVATAR_UPLOAD_PATH = data/avatars
 ; Chinese users can choose "duoshuo"
 ; or a custom avatar source, like: http://cn.gravatar.com/avatar/
 GRAVATAR_SOURCE = gravatar
-; This value will be forced to be true in offline mode.
+; This value will always be true in offline mode.
 DISABLE_GRAVATAR = false
 ; Federated avatar lookup uses DNS to discover avatar associated
 ; with emails, see https://www.libravatar.org
-; This value will be forced to be false in offline mode or Gravatar is disabled.
+; This value will always be false in offline mode or when Gravatar is disabled.
 ENABLE_FEDERATED_AVATAR = false

 [attachment]
@ -415,9 +417,9 @@ ENABLE = true
 PATH = data/attachments
 ; One or more allowed types, e.g. image/jpeg|image/png
 ALLOWED_TYPES = image/jpeg|image/png|application/zip|application/gzip
-; Max size of each file. Defaults to 32MB
+; Max size of each file. Defaults to 4MB
 MAX_SIZE = 4
-; Max number of files per upload. Defaults to 10
+; Max number of files per upload. Defaults to 5
 MAX_FILES = 5

 [time]
@ -431,7 +433,7 @@ ROOT_PATH =
 ; Either "console", "file", "conn", "smtp" or "database", default is "console"
 ; Use comma to separate multiple modes, e.g. "console, file"
 MODE = console
-; Buffer length of channel, keep it as it is if you don't know what it is.
+; Buffer length of the channel, keep it as it is if you don't know what it is.
 BUFFER_LEN = 10000
 ; Either "Trace", "Debug", "Info", "Warn", "Error", "Critical", default is "Trace"
 LEVEL = Trace
@ -445,13 +447,13 @@ LEVEL =
 LEVEL =
 ; This enables automated log rotate(switch of following options), default is true
 LOG_ROTATE = true
-; Max line number of single file, default is 1000000
+; Max number of lines in a single file, default is 1000000
 MAX_LINES = 1000000
-; Max size shift of single file, default is 28 means 1 << 28, 256MB
+; Max size shift of a single file, default is 28 means 1 << 28, 256MB
 MAX_SIZE_SHIFT = 28
 ; Segment log daily, default is true
 DAILY_ROTATE = true
-; Expired days of log file(delete after max days), default is 7
+; delete the log file after n days, default is 7
 MAX_DAYS = 7

 ; For "conn" mode only
@ -535,9 +537,9 @@ UPDATE_EXISTING = true
 [git]
 ; Disables highlight of added and removed changes
 DISABLE_DIFF_HIGHLIGHT = false
-; Max number of lines allowed of a single file in diff view
+; Max number of lines allowed in a single file in diff view
 MAX_GIT_DIFF_LINES = 1000
-; Max number of characters of a line allowed in diff view
+; Max number of allowed characters in a line in diff view
 MAX_GIT_DIFF_LINE_CHARACTERS = 5000
 ; Max number of files shown in diff view
 MAX_GIT_DIFF_FILES = 100
@ -562,7 +564,7 @@ MIN_INTERVAL = 10m
 [api]
 ; Enables /api/swagger, /api/v1/swagger etc. endpoints. True or false; default is true.
 ENABLE_SWAGGER_ENDPOINT = true
-; Max number of items will response in a page
+; Max number of items in a page
 MAX_RESPONSE_ITEMS = 50

 [i18n]
@ -601,7 +603,7 @@ ko-KR = ko
 SHOW_FOOTER_BRANDING = false
 ; Show version information about Gitea and Go in the footer
 SHOW_FOOTER_VERSION = true
-; Show time of template execution in the footer
+; Show template execution time in the footer
 SHOW_FOOTER_TEMPLATE_LOAD_TIME = true

 [markup.asciidoc]
@ -610,5 +612,5 @@ ENABLED = false
 FILE_EXTENSIONS = .adoc,.asciidoc
 ; External command to render all matching extensions
 RENDER_COMMAND = "asciidoc --out-file=- -"
-; Input is not a standard input but a file
+; Don't pass the file on STDIN, pass the filename as argument instead.
 IS_INPUT_FILE = false
--- a/docs/content/doc/advanced/config-cheat-sheet.en-us.md
+++ b/docs/content/doc/advanced/config-cheat-sheet.en-us.md
@ -202,8 +202,6 @@ Values containing `#` or `;` must be quoted using `` ` `` or `"""`.
 ## Cache (`cache`)

 - `ADAPTER`: **memory**: Cache engine adapter, either `memory`, `redis`, or `memcache`.
-   - To use `redis` or `memcache`, be sure to rebuild everything with build tags `redis` or
-     `memcache`: `go build -tags='redis'`.
 - `INTERVAL`: **60**: Garbage Collection interval (sec), for memory cache only.
 - `HOST`: **\<empty\>**: Connection string for `redis` and `memcache`.
   - Redis: `network=tcp,addr=127.0.0.1:6379,password=macaron,db=0,pool_size=100,idle_timeout=180`
--- a/docs/content/doc/features/comparison.en-us.md
+++ b/docs/content/doc/features/comparison.en-us.md
@ -168,7 +168,7 @@ _Symbols used in table:_
    </tr>
    <tr>
      <td>Multiple assignees for issues</td>
-      <td>✘</td>
+      <td>✓</td>
      <td>✘</td>
      <td>✓</td>
      <td>✓</td>
--- a/docs/content/doc/usage/issue-pull-request-templates.en-us.md
+++ b/docs/content/doc/usage/issue-pull-request-templates.en-us.md
@ -0,0 +1,41 @@
+---
+date: "2018-05-10T16:00:00+02:00"
+title: "Usage: Issue and Pull Request templates"
+slug: "issue-pull-request-templates"
+weight: 15
+toc: true
+draft: false
+menu:
+  sidebar:
+    parent: "usage"
+    name: "Issue and Pull Request templates"
+    weight: 15
+    identifier: "issue-pull-request-templates"
+---
+
+# Issue and Pull Request Templates
+
+For some projects there are a standard list of questions that users need to be asked
+for creating an issue, or adding a pull request. Gitea supports adding templates to the
+main branch of the repository so that they can autopopulate the form when users are 
+creating issues, and pull requests. This will cut down on the initial back and forth
+of getting some clarifiying details.
+
+Possible file names for issue templates:
+
+* ISSUE_TEMPLATE.md
+* issue_template.md
+* .gitea/ISSUE_TEMPLATE.md
+* .gitea/issue_template.md
+* .github/ISSUE_TEMPLATE.md
+* .github/issue_template.md
+
+
+Possible file names for PR templates:
+
+* PULL_REQUEST_TEMPLATE.md
+* pull_request_template.md
+* .gitea/PULL_REQUEST_TEMPLATE.md
+* .gitea/pull_request_template.md
+* .github/PULL_REQUEST_TEMPLATE.md
+* .github/pull_request_template.md
--- a/integrations/auth_ldap_test.go
+++ b/integrations/auth_ldap_test.go
@ -0,0 +1,194 @@
+// Copyright 2018 The Gitea Authors. All rights reserved.
+// Use of this source code is governed by a MIT-style
+// license that can be found in the LICENSE file.
+
+package integrations
+
+import (
+	"net/http"
+	"os"
+	"strings"
+	"testing"
+
+	"code.gitea.io/gitea/models"
+
+	"github.com/Unknwon/i18n"
+	"github.com/stretchr/testify/assert"
+)
+
+type ldapUser struct {
+	UserName    string
+	Password    string
+	FullName    string
+	Email       string
+	OtherEmails []string
+	IsAdmin     bool
+	SSHKeys     []string
+}
+
+var gitLDAPUsers = []ldapUser{
+	{
+		UserName:    "professor",
+		Password:    "professor",
+		FullName:    "Hubert Farnsworth",
+		Email:       "professor@planetexpress.com",
+		OtherEmails: []string{"hubert@planetexpress.com"},
+		IsAdmin:     true,
+	},
+	{
+		UserName: "hermes",
+		Password: "hermes",
+		FullName: "Conrad Hermes",
+		Email:    "hermes@planetexpress.com",
+		IsAdmin:  true,
+	},
+	{
+		UserName: "fry",
+		Password: "fry",
+		FullName: "Philip Fry",
+		Email:    "fry@planetexpress.com",
+	},
+	{
+		UserName: "leela",
+		Password: "leela",
+		FullName: "Leela Turanga",
+		Email:    "leela@planetexpress.com",
+	},
+	{
+		UserName: "bender",
+		Password: "bender",
+		FullName: "Bender Rodríguez",
+		Email:    "bender@planetexpress.com",
+	},
+}
+
+var otherLDAPUsers = []ldapUser{
+	{
+		UserName: "zoidberg",
+		Password: "zoidberg",
+		FullName: "John Zoidberg",
+		Email:    "zoidberg@planetexpress.com",
+	},
+	{
+		UserName: "amy",
+		Password: "amy",
+		FullName: "Amy Kroker",
+		Email:    "amy@planetexpress.com",
+	},
+}
+
+func skipLDAPTests() bool {
+	return os.Getenv("TEST_LDAP") != "1"
+}
+
+func getLDAPServerHost() string {
+	host := os.Getenv("TEST_LDAP_HOST")
+	if len(host) == 0 {
+		host = "ldap"
+	}
+	return host
+}
+
+func addAuthSourceLDAP(t *testing.T) {
+	session := loginUser(t, "user1")
+	csrf := GetCSRF(t, session, "/admin/auths/new")
+	req := NewRequestWithValues(t, "POST", "/admin/auths/new", map[string]string{
+		"_csrf":              csrf,
+		"type":               "2",
+		"name":               "ldap",
+		"host":               getLDAPServerHost(),
+		"port":               "389",
+		"bind_dn":            "uid=gitea,ou=service,dc=planetexpress,dc=com",
+		"bind_password":      "password",
+		"user_base":          "ou=people,dc=planetexpress,dc=com",
+		"filter":             "(&(objectClass=inetOrgPerson)(memberOf=cn=git,ou=people,dc=planetexpress,dc=com)(uid=%s))",
+		"admin_filter":       "(memberOf=cn=admin_staff,ou=people,dc=planetexpress,dc=com)",
+		"attribute_username": "uid",
+		"attribute_name":     "givenName",
+		"attribute_surname":  "sn",
+		"attribute_mail":     "mail",
+		"is_sync_enabled":    "on",
+		"is_active":          "on",
+	})
+	session.MakeRequest(t, req, http.StatusFound)
+}
+
+func TestLDAPUserSignin(t *testing.T) {
+	if skipLDAPTests() {
+		t.Skip()
+		return
+	}
+	prepareTestEnv(t)
+	addAuthSourceLDAP(t)
+
+	u := gitLDAPUsers[0]
+
+	session := loginUserWithPassword(t, u.UserName, u.Password)
+	req := NewRequest(t, "GET", "/user/settings")
+	resp := session.MakeRequest(t, req, http.StatusOK)
+
+	htmlDoc := NewHTMLParser(t, resp.Body)
+
+	assert.Equal(t, u.UserName, htmlDoc.GetInputValueByName("name"))
+	assert.Equal(t, u.FullName, htmlDoc.GetInputValueByName("full_name"))
+	assert.Equal(t, u.Email, htmlDoc.GetInputValueByName("email"))
+}
+
+func TestLDAPUserSync(t *testing.T) {
+	if skipLDAPTests() {
+		t.Skip()
+		return
+	}
+	prepareTestEnv(t)
+	addAuthSourceLDAP(t)
+	models.SyncExternalUsers()
+
+	session := loginUser(t, "user1")
+	// Check if users exists
+	for _, u := range gitLDAPUsers {
+		req := NewRequest(t, "GET", "/admin/users?q="+u.UserName)
+		resp := session.MakeRequest(t, req, http.StatusOK)
+
+		htmlDoc := NewHTMLParser(t, resp.Body)
+
+		tr := htmlDoc.doc.Find("table.table tbody tr")
+		if !assert.True(t, tr.Length() == 1) {
+			continue
+		}
+		tds := tr.Find("td")
+		if !assert.True(t, tds.Length() > 0) {
+			continue
+		}
+		assert.Equal(t, u.UserName, strings.TrimSpace(tds.Find("td:nth-child(2) a").Text()))
+		assert.Equal(t, u.Email, strings.TrimSpace(tds.Find("td:nth-child(3) span").Text()))
+		if u.IsAdmin {
+			assert.True(t, tds.Find("td:nth-child(5) i").HasClass("fa-check-square-o"))
+		} else {
+			assert.True(t, tds.Find("td:nth-child(5) i").HasClass("fa-square-o"))
+		}
+	}
+
+	// Check if no users exist
+	for _, u := range otherLDAPUsers {
+		req := NewRequest(t, "GET", "/admin/users?q="+u.UserName)
+		resp := session.MakeRequest(t, req, http.StatusOK)
+
+		htmlDoc := NewHTMLParser(t, resp.Body)
+
+		tr := htmlDoc.doc.Find("table.table tbody tr")
+		assert.True(t, tr.Length() == 0)
+	}
+}
+
+func TestLDAPUserSigninFailed(t *testing.T) {
+	if skipLDAPTests() {
+		t.Skip()
+		return
+	}
+	prepareTestEnv(t)
+	addAuthSourceLDAP(t)
+
+	u := otherLDAPUsers[0]
+
+	testLoginFailed(t, u.UserName, u.Password, i18n.Tr("en", "form.username_password_incorrect"))
+}
--- a/models/fixtures/login_source.yml
+++ b/models/fixtures/login_source.yml
@ -0,0 +1 @@
+[] # empty
--- a/models/migrations/v64.go
+++ b/models/migrations/v64.go
@ -34,42 +34,6 @@ func addMultipleAssignees(x *xorm.Engine) error {
 		ClosedUnix   util.TimeStamp `xorm:"INDEX"`
 	}

-	allIssues := []Issue{}
-	err := x.Find(&allIssues)
-	if err != nil {
-		return err
-	}
-
-	// Create the table
-	type IssueAssignees struct {
-		ID         int64 `xorm:"pk autoincr"`
-		AssigneeID int64 `xorm:"INDEX"`
-		IssueID    int64 `xorm:"INDEX"`
-	}
-	err = x.Sync2(IssueAssignees{})
-	if err != nil {
-		return err
-	}
-
-	// Range over all issues and insert a new entry for each issue/assignee
-	sess := x.NewSession()
-	defer sess.Close()
-
-	err = sess.Begin()
-	if err != nil {
-		return err
-	}
-
-	for _, issue := range allIssues {
-		if issue.AssigneeID != 0 {
-			_, err := sess.Insert(IssueAssignees{IssueID: issue.ID, AssigneeID: issue.AssigneeID})
-			if err != nil {
-				sess.Rollback()
-				return err
-			}
-		}
-	}
-
 	// Updated the comment table
 	type Comment struct {
 		ID              int64 `xorm:"pk autoincr"`
@ -96,10 +60,45 @@ func addMultipleAssignees(x *xorm.Engine) error {
 		// Reference issue in commit message
 		CommitSHA string `xorm:"VARCHAR(40)"`
 	}
+
+	// Create the table
+	type IssueAssignees struct {
+		ID         int64 `xorm:"pk autoincr"`
+		AssigneeID int64 `xorm:"INDEX"`
+		IssueID    int64 `xorm:"INDEX"`
+	}
+
+	if err := x.Sync2(IssueAssignees{}); err != nil {
+		return err
+	}
+
 	if err := x.Sync2(Comment{}); err != nil {
 		return err
 	}

+	// Range over all issues and insert a new entry for each issue/assignee
+	sess := x.NewSession()
+	defer sess.Close()
+
+	if err := sess.Begin(); err != nil {
+		return err
+	}
+
+	allIssues := []Issue{}
+	if err := sess.Find(&allIssues); err != nil {
+		return err
+	}
+
+	for _, issue := range allIssues {
+		if issue.AssigneeID != 0 {
+			_, err := sess.Insert(IssueAssignees{IssueID: issue.ID, AssigneeID: issue.AssigneeID})
+			if err != nil {
+				sess.Rollback()
+				return err
+			}
+		}
+	}
+
 	// Migrate comments
 	// First update everything to not have nulls in db
 	if _, err := sess.Where("type = ?", 9).Cols("removed_assignee").Update(Comment{RemovedAssignee: false}); err != nil {
@ -114,7 +113,10 @@ func addMultipleAssignees(x *xorm.Engine) error {
 	for _, comment := range allAssignementComments {
 		// Everytime where OldAssigneeID is > 0, the assignement was removed.
 		if comment.OldAssigneeID > 0 {
-			_, err = sess.ID(comment.ID).Update(Comment{RemovedAssignee: true})
+			_, err := sess.ID(comment.ID).Update(Comment{RemovedAssignee: true})
+			if err != nil {
+				return err
+			}
 		}
 	}

--- a/options/locale/locale_bg-BG.ini
+++ b/options/locale/locale_bg-BG.ini
@ -271,9 +271,6 @@ issues.new.no_milestone=Няма етап
 issues.new.clear_milestone=Изчисти етап
 issues.new.open_milestone=Отворени етапи
 issues.new.closed_milestone=Затворени етапи
-issues.new.assignee=Изпълнител
-issues.new.clear_assignee=Изчисти изпълнител
-issues.new.no_assignee=Няма изпълнител
 issues.create=Създай задача
 issues.new_label=Нов етикет
 issues.create_label=Създай етикет
--- a/options/locale/locale_cs-CZ.ini
+++ b/options/locale/locale_cs-CZ.ini
@ -270,9 +270,6 @@ issues.new.no_milestone=Bez milníku
 issues.new.clear_milestone=Smazat milník
 issues.new.open_milestone=Otevřít milník
 issues.new.closed_milestone=Zavřené milníky
-issues.new.assignee=Zpracovatel
-issues.new.clear_assignee=Smazat zpracovatele
-issues.new.no_assignee=Bez zpracovatele
 issues.create=Vytvořit úkol
 issues.new_label=Nový štítek
 issues.create_label=Vytvořit štítek
--- a/options/locale/locale_de-DE.ini
+++ b/options/locale/locale_de-DE.ini
@ -81,7 +81,7 @@ err_empty_admin_password=Das Administrator-Passwort darf nicht leer sein.

 general_title=Allgemeine Einstellungen
 app_name=Seitentitel
-app_name_helper=Gebe hier den Namen deines Unternehmens ein.
+app_name_helper=Du kannst hier den Namen deines Unternehmens eingeben.
 repo_path=Repository-Verzeichnis
 repo_path_helper=Remote-Git-Repositories werden in diesem Verzeichnis gespeichert.
 lfs_path=Git LFS-Wurzelpfad
@ -618,9 +618,9 @@ issues.new.no_milestone=Kein Meilenstein
 issues.new.clear_milestone=Meilenstein entfernen
 issues.new.open_milestone=Offene Meilensteine
 issues.new.closed_milestone=Geschlossene Meilensteine
-issues.new.assignee=Zuständig
-issues.new.clear_assignee=Zuständigkeit entfernen
-issues.new.no_assignee=Niemand zuständig
+issues.new.assignees=Zuständig
+issues.new.clear_assignees=Zuständige entfernen
+issues.new.no_assignees=Niemand zugewiesen
 issues.no_ref=Keine Branch/Tag angegeben
 issues.create=Issue erstellen
 issues.new_label=Neues Label
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@ -81,7 +81,7 @@ err_empty_admin_password = The administrator password cannot be empty.

 general_title = General Settings
 app_name = Site Title
-app_name_helper = Enter your company name here.
+app_name_helper = You can enter your company name here.
 repo_path = Repository Root Path
 repo_path_helper = Remote Git repositories will be saved to this directory.
 lfs_path = Git LFS Root Path
--- a/options/locale/locale_es-ES.ini
+++ b/options/locale/locale_es-ES.ini
@ -335,9 +335,6 @@ issues.new.no_milestone=Sin Milestone
 issues.new.clear_milestone=Limpiar Milestone
 issues.new.open_milestone=Milestones abiertas
 issues.new.closed_milestone=Milestones cerradas
-issues.new.assignee=Asignado a
-issues.new.clear_assignee=Limpiar asignado
-issues.new.no_assignee=Sin asignado
 issues.create=Crear incidencia
 issues.new_label=Nueva Etiqueta
 issues.create_label=Crear etiqueta
--- a/options/locale/locale_fi-FI.ini
+++ b/options/locale/locale_fi-FI.ini
@ -261,9 +261,6 @@ issues.new.no_milestone=Ei merkkipaalua
 issues.new.clear_milestone=Tyhjennä merkkipaalu
 issues.new.open_milestone=Avoimet merkkipaalut
 issues.new.closed_milestone=Suljetut merkkipaalut
-issues.new.assignee=Osoitettu
-issues.new.clear_assignee=Tyhjennä osoitettu
-issues.new.no_assignee=Ei osoitettua
 issues.create=Ilmoita ongelma
 issues.new_label=Uusi tunniste
 issues.create_label=Luo tunniste
--- a/options/locale/locale_fr-FR.ini
+++ b/options/locale/locale_fr-FR.ini
@ -340,9 +340,6 @@ issues.new.no_milestone=Aucun jalon
 issues.new.clear_milestone=Effacer le jalon
 issues.new.open_milestone=Ouvrir un jalon
 issues.new.closed_milestone=Jalons fermés
-issues.new.assignee=Affecté à
-issues.new.clear_assignee=Supprimer les assignataires
-issues.new.no_assignee=Pas d'assignataire
 issues.no_ref=Aucune branche/tag spécifiés
 issues.create=Créer un ticket
 issues.new_label=Nouvelle étiquette
--- a/options/locale/locale_hu-HU.ini
+++ b/options/locale/locale_hu-HU.ini
@ -347,9 +347,6 @@ issues.new.no_milestone=Nincs mérföldkő
 issues.new.clear_milestone=Mérföldkő eltávolítása
 issues.new.open_milestone=Nyitott mérföldkövek
 issues.new.closed_milestone=Lezárt mérföldkövek
-issues.new.assignee=Megbízott
-issues.new.clear_assignee=Megbízott eltávolítása
-issues.new.no_assignee=Nincs megbízott
 issues.no_ref=Nincsen ág/címke megadva
 issues.create=Hibajegy létrehozása
 issues.new_label=Új címke
--- a/options/locale/locale_id-ID.ini
+++ b/options/locale/locale_id-ID.ini
@ -340,9 +340,6 @@ issues.new.no_milestone=Tidak Ada Milestone
 issues.new.clear_milestone=Bersihkan milestone
 issues.new.open_milestone=Buka Milestone
 issues.new.closed_milestone=Tutup Milestone
-issues.new.assignee=Menerima
-issues.new.clear_assignee=Jelas menerima
-issues.new.no_assignee=Tidak ada penerima
 issues.no_ref=Tidak Ada Cabang/Tag Ditentukan
 issues.create=Buat Masalah
 issues.new_label=Label Baru
--- a/options/locale/locale_it-IT.ini
+++ b/options/locale/locale_it-IT.ini
@ -323,9 +323,6 @@ issues.new.no_milestone=Nessuna milestone
 issues.new.clear_milestone=Milestone pulita
 issues.new.open_milestone=Apri Milestone
 issues.new.closed_milestone=Milestone chiuse
-issues.new.assignee=Assegnatario
-issues.new.clear_assignee=Cancella l'assegnatario
-issues.new.no_assignee=Nessun assegnatario
 issues.create=Crea Problema
 issues.new_label=Nuova etichetta
 issues.create_label=Crea Etichetta
--- a/options/locale/locale_ja-JP.ini
+++ b/options/locale/locale_ja-JP.ini
@ -347,9 +347,6 @@ issues.new.no_milestone=マイルストーンなし
 issues.new.clear_milestone=マイルストーンをクリア
 issues.new.open_milestone=オープン中のマイルストーン
 issues.new.closed_milestone=クローズされたマイルストーン
-issues.new.assignee=担当者
-issues.new.clear_assignee=担当者をクリア
-issues.new.no_assignee=担当者なし
 issues.no_ref=ブランチ/タグが指定されていません
 issues.create=問題を作成
 issues.new_label=新しいラベル
--- a/options/locale/locale_ko-KR.ini
+++ b/options/locale/locale_ko-KR.ini
@ -323,9 +323,6 @@ issues.new.no_milestone=마일스톤 없음
 issues.new.clear_milestone=마일스톤 초기화
 issues.new.open_milestone=마일스톤 생성
 issues.new.closed_milestone=마일스톤 닫기
-issues.new.assignee=담당자
-issues.new.clear_assignee=담당자 초기화
-issues.new.no_assignee=담당자 없음
 issues.no_ref=Branch/Tag 가 지정되어 있지 않습니다.
 issues.create=이슈 생성
 issues.new_label=새로운 레이블
--- a/options/locale/locale_lv-LV.ini
+++ b/options/locale/locale_lv-LV.ini
@ -347,9 +347,6 @@ issues.new.no_milestone=Nav atskaites punktu
 issues.new.clear_milestone=Notīrīt atskaites punktus
 issues.new.open_milestone=Atvērtie atskaites punktus
 issues.new.closed_milestone=Aizvērtie atskaites punkti
-issues.new.assignee=Atbildīgais
-issues.new.clear_assignee=Noņemt atbildīgo
-issues.new.no_assignee=Nav atbildīgā
 issues.no_ref=Nav norādīts atzars/tags
 issues.create=Pieteikt problēmu
 issues.new_label=Jauna etiķete
--- a/options/locale/locale_nl-NL.ini
+++ b/options/locale/locale_nl-NL.ini
@ -345,9 +345,6 @@ issues.new.no_milestone=Geen mijlpaal
 issues.new.clear_milestone=Verwijder mijlpaal
 issues.new.open_milestone=Open mijlpalen
 issues.new.closed_milestone=Gesloten mijlpalen
-issues.new.assignee=Toegewezen aan
-issues.new.clear_assignee=Verwijder verantwoordelijke
-issues.new.no_assignee=Geen verantwoordelijke
 issues.no_ref=Geen Branch/Tag gespecificeerd
 issues.create=Maak probleem
 issues.new_label=Nieuw Label
--- a/options/locale/locale_pl-PL.ini
+++ b/options/locale/locale_pl-PL.ini
@ -340,9 +340,6 @@ issues.new.no_milestone=Brak kamienia milowego
 issues.new.clear_milestone=Wyczyść kamień milowy
 issues.new.open_milestone=Otwórz kamienie milowe
 issues.new.closed_milestone=Zamknięte kamienie milowe
-issues.new.assignee=Przypisany
-issues.new.clear_assignee=Usuń przypisanie
-issues.new.no_assignee=Brak przypisania
 issues.no_ref=Nie określono gałęzi/etykiety
 issues.create=Utwórz problem
 issues.new_label=Nowa etykieta
--- a/options/locale/locale_pt-BR.ini
+++ b/options/locale/locale_pt-BR.ini
@ -81,7 +81,7 @@ err_empty_admin_password=A senha do administrador não pode ser em branco.

 general_title=Configurações gerais
 app_name=Título do site
-app_name_helper=Digite o nome da sua empresa aqui.
+app_name_helper=Você pode inserir o nome da empresa aqui.
 repo_path=Caminho raíz do repositório
 repo_path_helper=Todos os repositórios remotos do Git serão salvos neste diretório.
 lfs_path=Caminho raiz do Git LFS
@ -624,9 +624,9 @@ issues.new.no_milestone=Sem marco
 issues.new.clear_milestone=Limpar marco
 issues.new.open_milestone=Marcos abertos
 issues.new.closed_milestone=Marcos fechados
-issues.new.assignee=Responsável
-issues.new.clear_assignee=Limpar responsável
-issues.new.no_assignee=Não atribuída
+issues.new.assignees=Responsáveis
+issues.new.clear_assignees=Limpar responsáveis
+issues.new.no_assignees=Nenhum responsável
 issues.no_ref=Nenhum branch/tag especificado
 issues.create=Criar issue
 issues.new_label=Nova etiqueta
--- a/options/locale/locale_ru-RU.ini
+++ b/options/locale/locale_ru-RU.ini
@ -475,9 +475,6 @@ issues.new.no_milestone=Нет этапа
 issues.new.clear_milestone=Очистить этап
 issues.new.open_milestone=Открыть этап
 issues.new.closed_milestone=Завершенные этапы
-issues.new.assignee=Ответственный
-issues.new.clear_assignee=Убрать ответственного
-issues.new.no_assignee=Нет ответственного
 issues.no_ref=Не указана ветка или тэг
 issues.create=Добавить задачу
 issues.new_label=Новая метка
--- a/options/locale/locale_sr-SP.ini
+++ b/options/locale/locale_sr-SP.ini
@ -270,9 +270,6 @@ issues.new.no_milestone=Нема фазе
 issues.new.clear_milestone=Уклони фазу
 issues.new.open_milestone=Отворене фазе
 issues.new.closed_milestone=Затворене фазе
-issues.new.assignee=Одговорни
-issues.new.clear_assignee=Уклони одговорног
-issues.new.no_assignee=Нема одговорних
 issues.create=Додај задатак
 issues.new_label=Нова лабела
 issues.create_label=Креирај лабелу
--- a/options/locale/locale_sv-SE.ini
+++ b/options/locale/locale_sv-SE.ini
@ -339,9 +339,6 @@ issues.new.no_milestone=Ingen Milsten
 issues.new.clear_milestone=Rensa milstenar
 issues.new.open_milestone=Öppna Milstenar
 issues.new.closed_milestone=Stängda Milstenar
-issues.new.assignee=Förvärvare
-issues.new.clear_assignee=Rensa förvärvare
-issues.new.no_assignee=Ingen förvärvare
 issues.create=Skapa Ärende
 issues.new_label=Ny etikett
 issues.create_label=Skapa Etikett
--- a/options/locale/locale_tr-TR.ini
+++ b/options/locale/locale_tr-TR.ini
@ -338,9 +338,6 @@ issues.new.no_milestone=Kilometre Taşı Yok
 issues.new.clear_milestone=Kilometre Taşlarını Temizle
 issues.new.open_milestone=Kilometre Taşlarını Aç
 issues.new.closed_milestone=Kapanmış Kilometre Taşları
-issues.new.assignee=Atanan
-issues.new.clear_assignee=Atamayı Temizle
-issues.new.no_assignee=Atanan Kişi Yok
 issues.no_ref=Bölüm/Etiket Belirtilmedi
 issues.create=Sorun Oluştur
 issues.new_label=Yeni Etiket
--- a/options/locale/locale_uk-UA.ini
+++ b/options/locale/locale_uk-UA.ini
@ -80,7 +80,6 @@ err_empty_admin_password=Пароль адміністратора не може

 general_title=Загальні налаштування
 app_name=Назва сайту
-app_name_helper=Введіть назву вашої компанії.
 repo_path=Кореневий шлях репозиторія
 repo_path_helper=Всі вилучені Git репозиторії будуть збережені в цей каталог.
 lfs_path=Кореневої шлях Git LFS
@ -368,6 +367,8 @@ readme_helper=Виберіть шаблон README.
 create_repo=Створити репозиторій
 default_branch=Головна гілка
 mirror_prune=Очистити
+mirror_interval=Інтервал дзеркалювання (доступні значення 'h', 'm', 's')
+mirror_address=Клонування з URL-адреси
 mirror_last_synced=Остання синхронізація
 watchers=Спостерігачі
 forks=Форки
@ -375,10 +376,14 @@ pick_reaction=Залиште свою оцінку

 form.reach_limit_of_creation=Ви досягли максимальної кількості %d створених репозиторіїв.

+need_auth=Клонування авторизації
 migrate_type=Тип міграції
 migrate_type_helper=Даний репозиторій буде <span class="text blue">дзеркалом</span>
 migrate_repo=Перенесення репозиторія
+migrate.clone_address=Міграція / клонувати з URL-адреси
+migrate.clone_address_desc=URL-адреса HTTP(S) або Git "clone" існуючого репозиторія
 migrate.failed=Міграція не вдалася: %v
+migrate.lfs_mirror_unsupported=Дзеркалювання LFS об'єктів не підтримується - використовуйте 'git lfs fetch --all' і 'git lfs push --all' вручну.

 mirror_from=дзеркало
 forked_from=форк від
@ -465,9 +470,8 @@ issues.new.no_milestone=Етап відсутній
 issues.new.clear_milestone=Очистити етап
 issues.new.open_milestone=Активні етапи
 issues.new.closed_milestone=Закриті етапи
-issues.new.assignee=Виконавець
-issues.new.clear_assignee=Прибрати виконавеця
-issues.new.no_assignee=Немає виконавеця
+issues.new.assignees=Виконавеці
+issues.new.clear_assignees=Прибрати виконавеців
 issues.no_ref=Не вказана гілка або тег
 issues.create=Створити проблему
 issues.new_label=Нова мітка
@ -675,11 +679,13 @@ settings.tracker_issue_style.alphanumeric=Буквено-цифровий
 settings.admin_settings=Налаштування адміністратора
 settings.danger_zone=Небезпечна зона
 settings.new_owner_has_same_repo=Новий власник вже має репозиторій з такою назвою. Будь ласка, виберіть інше ім'я.
-settings.transfer=Переказати новому власнику
+settings.convert=Перетворити на звичайний репозиторій
+settings.transfer=Передати новому власнику
 settings.wiki_delete=Видалити Wiki-дані
 settings.confirm_wiki_delete=Видалити Wiki-дані
 settings.delete=Видалити цей репозиторій
 settings.delete_notices_1=- Цю операцію <strong>НЕ МОЖНА</strong> відмінити.
+settings.update_settings_success=Налаштування репозиторію було оновлено.
 settings.transfer_owner=Новий власник
 settings.confirm_delete=Видалити репозиторій
 settings.delete_collaborator=Видалити
@ -728,8 +734,11 @@ settings.delete_protected_branch=Вимкнути захист
 settings.choose_branch=Оберіть гілку…

 diff.browse_source=Переглянути джерело
+diff.parent=джерело
 diff.commit=коміт
+diff.show_diff_stats=Показати статистику Diff
 diff.show_split_view=Розділений перегляд
+diff.show_unified_view=Об'єднаний перегляд
 diff.stats_desc=<strong> %d змінених файлів</strong> з <strong>%d додано</strong> та <strong>%d видалено</strong>
 diff.view_file=Переглянути файл
 diff.too_many_files=Деякі файли не було показано, через те що забагато файлів було змінено
@ -851,6 +860,7 @@ users.activated=Активовано
 users.admin=Адміністратор
 users.repos=Репозиторії
 users.created=Створено
+users.last_login=Останній вхід
 users.edit=Редагувати
 users.auth_source=Джерело автентифікації
 users.local=Локальні
--- a/options/locale/locale_zh-CN.ini
+++ b/options/locale/locale_zh-CN.ini
--- a/options/locale/locale_zh-HK.ini
+++ b/options/locale/locale_zh-HK.ini
@ -329,9 +329,6 @@ issues.new.no_milestone=未選擇里程碑
 issues.new.clear_milestone=清除已選取里程碑
 issues.new.open_milestone=開啟中的里程碑
 issues.new.closed_milestone=已關閉的里程碑
-issues.new.assignee=指派成員
-issues.new.clear_assignee=取消指派成員
-issues.new.no_assignee=未指派成員
 issues.create=建立問題
 issues.new_label=建立標籤
 issues.create_label=建立標籤
--- a/options/locale/locale_zh-TW.ini
+++ b/options/locale/locale_zh-TW.ini
@ -339,9 +339,6 @@ issues.new.no_milestone=未選擇里程碑
 issues.new.clear_milestone=清除已選取里程碑
 issues.new.open_milestone=開啟中的里程碑
 issues.new.closed_milestone=已關閉的里程碑
-issues.new.assignee=指派成員
-issues.new.clear_assignee=取消指派成員
-issues.new.no_assignee=未指派成員
 issues.no_ref=未指定分支或標籤
 issues.create=建立問題
 issues.new_label=建立標籤
--- a/package-lock.json
+++ b/package-lock.json
@ -2,17 +2,6 @@
    "requires": true,
    "lockfileVersion": 1,
    "dependencies": {
-        "ajv": {
-            "version": "4.11.8",
-            "resolved": "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz",
-            "integrity": "sha1-gv+wKynmYq5TvcIK8VlHcGc5xTY=",
-            "dev": true,
-            "optional": true,
-            "requires": {
-                "co": "4.6.0",
-                "json-stable-stringify": "1.0.1"
-            }
-        },
        "amdefine": {
            "version": "1.0.1",
            "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz",
@ -33,13 +22,6 @@
            "dev": true,
            "optional": true
        },
-        "assert-plus": {
-            "version": "0.2.0",
-            "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz",
-            "integrity": "sha1-104bh+ev/A24qttwIfP+SBAasjQ=",
-            "dev": true,
-            "optional": true
-        },
        "asynckit": {
            "version": "0.4.0",
            "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
@ -47,13 +29,6 @@
            "dev": true,
            "optional": true
        },
-        "aws-sign2": {
-            "version": "0.6.0",
-            "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz",
-            "integrity": "sha1-FDQt0428yU0OW4fXY81jYSwOeU8=",
-            "dev": true,
-            "optional": true
-        },
        "aws4": {
            "version": "1.7.0",
            "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.7.0.tgz",
@ -71,15 +46,6 @@
                "tweetnacl": "0.14.5"
            }
        },
-        "boom": {
-            "version": "2.10.1",
-            "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz",
-            "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=",
-            "dev": true,
-            "requires": {
-                "hoek": "2.16.3"
-            }
-        },
        "caseless": {
            "version": "0.12.0",
            "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
@ -140,16 +106,6 @@
            "dev": true,
            "optional": true
        },
-        "cryptiles": {
-            "version": "2.0.5",
-            "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz",
-            "integrity": "sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g=",
-            "dev": true,
-            "optional": true,
-            "requires": {
-                "boom": "2.10.1"
-            }
-        },
        "dashdash": {
            "version": "1.14.1",
            "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
@ -208,6 +164,20 @@
            "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
            "dev": true
        },
+        "fast-deep-equal": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz",
+            "integrity": "sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=",
+            "dev": true,
+            "optional": true
+        },
+        "fast-json-stable-stringify": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz",
+            "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I=",
+            "dev": true,
+            "optional": true
+        },
        "forever-agent": {
            "version": "0.6.1",
            "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
@ -215,18 +185,6 @@
            "dev": true,
            "optional": true
        },
-        "form-data": {
-            "version": "2.1.4",
-            "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz",
-            "integrity": "sha1-M8GDrPGTJ27KqYFDpp6Uv+4XUNE=",
-            "dev": true,
-            "optional": true,
-            "requires": {
-                "asynckit": "0.4.0",
-                "combined-stream": "1.0.6",
-                "mime-types": "2.1.18"
-            }
-        },
        "getpass": {
            "version": "0.1.7",
            "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
@ -259,55 +217,6 @@
            "integrity": "sha1-TK+tdrxi8C+gObL5Tpo906ORpyU=",
            "dev": true
        },
-        "har-schema": {
-            "version": "1.0.5",
-            "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz",
-            "integrity": "sha1-0mMTX0MwfALGAq/I/pWXDAFRNp4=",
-            "dev": true,
-            "optional": true
-        },
-        "har-validator": {
-            "version": "4.2.1",
-            "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz",
-            "integrity": "sha1-M0gdDxu/9gDdID11gSpqX7oALio=",
-            "dev": true,
-            "optional": true,
-            "requires": {
-                "ajv": "4.11.8",
-                "har-schema": "1.0.5"
-            }
-        },
-        "hawk": {
-            "version": "3.1.3",
-            "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz",
-            "integrity": "sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ=",
-            "dev": true,
-            "optional": true,
-            "requires": {
-                "boom": "2.10.1",
-                "cryptiles": "2.0.5",
-                "hoek": "2.16.3",
-                "sntp": "1.0.9"
-            }
-        },
-        "hoek": {
-            "version": "2.16.3",
-            "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
-            "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=",
-            "dev": true
-        },
-        "http-signature": {
-            "version": "1.1.1",
-            "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz",
-            "integrity": "sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8=",
-            "dev": true,
-            "optional": true,
-            "requires": {
-                "assert-plus": "0.2.0",
-                "jsprim": "1.4.1",
-                "sshpk": "1.14.1"
-            }
-        },
        "image-size": {
            "version": "0.5.5",
            "resolved": "https://registry.npmjs.org/image-size/-/image-size-0.5.5.tgz",
@ -343,15 +252,12 @@
            "dev": true,
            "optional": true
        },
-        "json-stable-stringify": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz",
-            "integrity": "sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=",
+        "json-schema-traverse": {
+            "version": "0.3.1",
+            "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz",
+            "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=",
            "dev": true,
-            "optional": true,
-            "requires": {
-                "jsonify": "0.0.0"
-            }
+            "optional": true
        },
        "json-stringify-safe": {
            "version": "5.0.1",
@ -360,13 +266,6 @@
            "dev": true,
            "optional": true
        },
-        "jsonify": {
-            "version": "0.0.0",
-            "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz",
-            "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=",
-            "dev": true,
-            "optional": true
-        },
        "jsprim": {
            "version": "1.4.1",
            "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
@ -390,9 +289,9 @@
            }
        },
        "less": {
-            "version": "2.7.3",
-            "resolved": "https://registry.npmjs.org/less/-/less-2.7.3.tgz",
-            "integrity": "sha512-KPdIJKWcEAb02TuJtaLrhue0krtRLoRoo7x6BNJIBelO00t/CCdJQUnHW5V34OnHMWzIktSalJxRO+FvytQlCQ==",
+            "version": "3.0.4",
+            "resolved": "https://registry.npmjs.org/less/-/less-3.0.4.tgz",
+            "integrity": "sha512-q3SyEnPKbk9zh4l36PGeW2fgynKu+FpbhiUNx/yaiBUQ3V0CbACCgb9FzYWcRgI2DJlP6eI4jc8XPrCTi55YcQ==",
            "dev": true,
            "requires": {
                "errno": "0.1.7",
@ -401,8 +300,192 @@
                "mime": "1.6.0",
                "mkdirp": "0.5.1",
                "promise": "7.3.1",
-                "request": "2.81.0",
-                "source-map": "0.5.7"
+                "request": "2.85.0",
+                "source-map": "0.6.1"
+            },
+            "dependencies": {
+                "ajv": {
+                    "version": "5.5.2",
+                    "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz",
+                    "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=",
+                    "dev": true,
+                    "optional": true,
+                    "requires": {
+                        "co": "4.6.0",
+                        "fast-deep-equal": "1.1.0",
+                        "fast-json-stable-stringify": "2.0.0",
+                        "json-schema-traverse": "0.3.1"
+                    }
+                },
+                "assert-plus": {
+                    "version": "1.0.0",
+                    "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+                    "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
+                    "dev": true,
+                    "optional": true
+                },
+                "aws-sign2": {
+                    "version": "0.7.0",
+                    "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
+                    "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=",
+                    "dev": true,
+                    "optional": true
+                },
+                "boom": {
+                    "version": "4.3.1",
+                    "resolved": "https://registry.npmjs.org/boom/-/boom-4.3.1.tgz",
+                    "integrity": "sha1-T4owBctKfjiJ90kDD9JbluAdLjE=",
+                    "dev": true,
+                    "optional": true,
+                    "requires": {
+                        "hoek": "4.2.1"
+                    }
+                },
+                "cryptiles": {
+                    "version": "3.1.2",
+                    "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-3.1.2.tgz",
+                    "integrity": "sha1-qJ+7Ig9c4l7FboxKqKT9e1sNKf4=",
+                    "dev": true,
+                    "optional": true,
+                    "requires": {
+                        "boom": "5.2.0"
+                    },
+                    "dependencies": {
+                        "boom": {
+                            "version": "5.2.0",
+                            "resolved": "https://registry.npmjs.org/boom/-/boom-5.2.0.tgz",
+                            "integrity": "sha512-Z5BTk6ZRe4tXXQlkqftmsAUANpXmuwlsF5Oov8ThoMbQRzdGTA1ngYRW160GexgOgjsFOKJz0LYhoNi+2AMBUw==",
+                            "dev": true,
+                            "optional": true,
+                            "requires": {
+                                "hoek": "4.2.1"
+                            }
+                        }
+                    }
+                },
+                "form-data": {
+                    "version": "2.3.2",
+                    "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.2.tgz",
+                    "integrity": "sha1-SXBJi+YEwgwAXU9cI67NIda0kJk=",
+                    "dev": true,
+                    "optional": true,
+                    "requires": {
+                        "asynckit": "0.4.0",
+                        "combined-stream": "1.0.6",
+                        "mime-types": "2.1.18"
+                    }
+                },
+                "har-schema": {
+                    "version": "2.0.0",
+                    "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
+                    "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=",
+                    "dev": true,
+                    "optional": true
+                },
+                "har-validator": {
+                    "version": "5.0.3",
+                    "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz",
+                    "integrity": "sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=",
+                    "dev": true,
+                    "optional": true,
+                    "requires": {
+                        "ajv": "5.5.2",
+                        "har-schema": "2.0.0"
+                    }
+                },
+                "hawk": {
+                    "version": "6.0.2",
+                    "resolved": "https://registry.npmjs.org/hawk/-/hawk-6.0.2.tgz",
+                    "integrity": "sha512-miowhl2+U7Qle4vdLqDdPt9m09K6yZhkLDTWGoUiUzrQCn+mHHSmfJgAyGaLRZbPmTqfFFjRV1QWCW0VWUJBbQ==",
+                    "dev": true,
+                    "optional": true,
+                    "requires": {
+                        "boom": "4.3.1",
+                        "cryptiles": "3.1.2",
+                        "hoek": "4.2.1",
+                        "sntp": "2.1.0"
+                    }
+                },
+                "hoek": {
+                    "version": "4.2.1",
+                    "resolved": "https://registry.npmjs.org/hoek/-/hoek-4.2.1.tgz",
+                    "integrity": "sha512-QLg82fGkfnJ/4iy1xZ81/9SIJiq1NGFUMGs6ParyjBZr6jW2Ufj/snDqTHixNlHdPNwN2RLVD0Pi3igeK9+JfA==",
+                    "dev": true
+                },
+                "http-signature": {
+                    "version": "1.2.0",
+                    "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
+                    "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
+                    "dev": true,
+                    "optional": true,
+                    "requires": {
+                        "assert-plus": "1.0.0",
+                        "jsprim": "1.4.1",
+                        "sshpk": "1.14.1"
+                    }
+                },
+                "performance-now": {
+                    "version": "2.1.0",
+                    "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
+                    "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
+                    "dev": true,
+                    "optional": true
+                },
+                "qs": {
+                    "version": "6.5.2",
+                    "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
+                    "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==",
+                    "dev": true,
+                    "optional": true
+                },
+                "request": {
+                    "version": "2.85.0",
+                    "resolved": "https://registry.npmjs.org/request/-/request-2.85.0.tgz",
+                    "integrity": "sha512-8H7Ehijd4js+s6wuVPLjwORxD4zeuyjYugprdOXlPSqaApmL/QOy+EB/beICHVCHkGMKNh5rvihb5ov+IDw4mg==",
+                    "dev": true,
+                    "optional": true,
+                    "requires": {
+                        "aws-sign2": "0.7.0",
+                        "aws4": "1.7.0",
+                        "caseless": "0.12.0",
+                        "combined-stream": "1.0.6",
+                        "extend": "3.0.1",
+                        "forever-agent": "0.6.1",
+                        "form-data": "2.3.2",
+                        "har-validator": "5.0.3",
+                        "hawk": "6.0.2",
+                        "http-signature": "1.2.0",
+                        "is-typedarray": "1.0.0",
+                        "isstream": "0.1.2",
+                        "json-stringify-safe": "5.0.1",
+                        "mime-types": "2.1.18",
+                        "oauth-sign": "0.8.2",
+                        "performance-now": "2.1.0",
+                        "qs": "6.5.2",
+                        "safe-buffer": "5.1.2",
+                        "stringstream": "0.0.5",
+                        "tough-cookie": "2.3.4",
+                        "tunnel-agent": "0.6.0",
+                        "uuid": "3.2.1"
+                    }
+                },
+                "sntp": {
+                    "version": "2.1.0",
+                    "resolved": "https://registry.npmjs.org/sntp/-/sntp-2.1.0.tgz",
+                    "integrity": "sha512-FL1b58BDrqS3A11lJ0zEdnJ3UOKqVxawAkF3k7F0CVN7VQ34aZrV+G8BZ1WC9ZL7NyrwsW0oviwsWDgRuVYtJg==",
+                    "dev": true,
+                    "optional": true,
+                    "requires": {
+                        "hoek": "4.2.1"
+                    }
+                },
+                "source-map": {
+                    "version": "0.6.1",
+                    "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+                    "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+                    "dev": true,
+                    "optional": true
+                }
            }
        },
        "less-plugin-clean-css": {
@ -460,17 +543,10 @@
            "dev": true,
            "optional": true
        },
-        "performance-now": {
-            "version": "0.2.0",
-            "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz",
-            "integrity": "sha1-M+8wxcd9TqIcWlOGnZG1bY8lVeU=",
-            "dev": true,
-            "optional": true
-        },
        "promise": {
            "version": "7.3.1",
            "resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz",
-            "integrity": "sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==",
+            "integrity": "sha1-BktyYCsY+Q8pGSuLG8QY/9Hr078=",
            "dev": true,
            "optional": true,
            "requires": {
@ -491,67 +567,12 @@
            "dev": true,
            "optional": true
        },
-        "qs": {
-            "version": "6.4.0",
-            "resolved": "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz",
-            "integrity": "sha1-E+JtKK1rD/qpExLNO/cI7TUecjM=",
-            "dev": true,
-            "optional": true
-        },
-        "request": {
-            "version": "2.81.0",
-            "resolved": "https://registry.npmjs.org/request/-/request-2.81.0.tgz",
-            "integrity": "sha1-xpKJRqDgbF+Nb4qTM0af/aRimKA=",
-            "dev": true,
-            "optional": true,
-            "requires": {
-                "aws-sign2": "0.6.0",
-                "aws4": "1.7.0",
-                "caseless": "0.12.0",
-                "combined-stream": "1.0.6",
-                "extend": "3.0.1",
-                "forever-agent": "0.6.1",
-                "form-data": "2.1.4",
-                "har-validator": "4.2.1",
-                "hawk": "3.1.3",
-                "http-signature": "1.1.1",
-                "is-typedarray": "1.0.0",
-                "isstream": "0.1.2",
-                "json-stringify-safe": "5.0.1",
-                "mime-types": "2.1.18",
-                "oauth-sign": "0.8.2",
-                "performance-now": "0.2.0",
-                "qs": "6.4.0",
-                "safe-buffer": "5.1.2",
-                "stringstream": "0.0.5",
-                "tough-cookie": "2.3.4",
-                "tunnel-agent": "0.6.0",
-                "uuid": "3.2.1"
-            }
-        },
        "safe-buffer": {
            "version": "5.1.2",
            "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
            "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
            "dev": true
        },
-        "sntp": {
-            "version": "1.0.9",
-            "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz",
-            "integrity": "sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=",
-            "dev": true,
-            "optional": true,
-            "requires": {
-                "hoek": "2.16.3"
-            }
-        },
-        "source-map": {
-            "version": "0.5.7",
-            "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
-            "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
-            "dev": true,
-            "optional": true
-        },
        "sshpk": {
            "version": "1.14.1",
            "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.14.1.tgz",
--- a/package.json
+++ b/package.json
@ -1,7 +1,7 @@
 {
    "license": "MIT",
    "devDependencies": {
-        "less": "^2.7.2",
+        "less": "^3.0.4",
        "less-plugin-clean-css": "^1.5.1"
    }
 }
--- a/public/css/index.css
+++ b/public/css/index.css
--- a/public/js/index.js
+++ b/public/js/index.js
@ -2198,7 +2198,11 @@ function initTopicbar() {
                alert(res.message);
            } else {
                viewDiv.children(".topic").remove();
+                if (topics.length == 0) {
+                    return
+                }
                var topicArray = topics.split(",");
+                
                var last = viewDiv.children("a").last();
                for (var i=0;i < topicArray.length; i++) {
                    $('<div class="ui green basic label topic" style="cursor:pointer;">'+topicArray[i]+'</div>').insertBefore(last)
--- a/public/less/_base.less
+++ b/public/less/_base.less
@ -152,6 +152,10 @@ pre, code {
        }
    }

+    &.floating.label {
+        z-index: 10;
+    }
+
    &.menu,
    &.vertical.menu,
    &.segment {
@ -167,6 +171,14 @@ pre, code {
        font-size: .92857143rem;
    }

+    &.dropdown .menu>.item>.floating.label {
+        z-index: 11;
+    }
+
+    &.dropdown .menu .menu>.item>.floating.label {
+        z-index: 21;
+    }
+
    .text {
        &.red {
            color: #d95c5c !important;
--- a/routers/repo/topic.go
+++ b/routers/repo/topic.go
@ -21,7 +21,11 @@ func TopicPost(ctx *context.Context) {
 		return
 	}

-	topics := strings.Split(ctx.Query("topics"), ",")
+	var topics = make([]string, 0)
+	var topicsStr = strings.TrimSpace(ctx.Query("topics"))
+	if len(topicsStr) > 0 {
+		topics = strings.Split(topicsStr, ",")
+	}

 	err := models.SaveTopics(ctx.Repo.Repository.ID, topics...)
 	if err != nil {
--- a/templates/repo/issue/view_content/sidebar.tmpl
+++ b/templates/repo/issue/view_content/sidebar.tmpl
@ -211,7 +211,7 @@

 		<div class="ui divider"></div>
 		<span class="text"><strong>{{.i18n.Tr "repo.issues.due_date"}}</strong></span>
-		{{if gt .Issue.DeadlineUnix 0}}
+		{{if ne .Issue.DeadlineUnix 0}}
 			<p>
 				<span class="octicon octicon-calendar"></span>
 				{{.Issue.DeadlineUnix.FormatShort}}
@ -229,12 +229,12 @@
 		{{end}}

 		{{if and .IsSigned .IsRepositoryWriter}}
-			<form method="POST"{{if gt .Issue.DeadlineUnix 0}}style="display: none;"{{end}}} id="add_deadline_form" action="{{$.RepoLink}}/issues/{{.Issue.Index}}/deadline/update" class="ui action input fluid">
+			<form method="POST" {{if ne .Issue.DeadlineUnix 0}}style="display: none;"{{end}} id="add_deadline_form" action="{{$.RepoLink}}/issues/{{.Issue.Index}}/deadline/update" class="ui action input fluid">
 				{{$.CsrfTokenHtml}}
 				<div class="ui fluid action input">
-					<input required placeholder="{{.i18n.Tr "repo.issues.due_date_form"}}" {{if gt .Issue.DeadlineUnix 0}}value="{{.Issue.DeadlineUnix.Format "2006-01-02"}}"{{end}} type="date" name="date" style="min-width: 13.9rem;border-radius: 4px 0 0 4px;border-right: 0;white-space: nowrap;">
+					<input required placeholder="{{.i18n.Tr "repo.issues.due_date_form"}}" {{if ne .Issue.DeadlineUnix 0 }}value="{{.Issue.DeadlineUnix.Format "2006-01-02"}}"{{end}} type="date" name="date" style="min-width: 13.9rem;border-radius: 4px 0 0 4px;border-right: 0;white-space: nowrap;">
 					<button class="ui green icon button">
-					{{if gt .Issue.DeadlineUnix 0}}
+					{{if ne .Issue.DeadlineUnix 0}}
 							<i class="edit icon"></i>
 					{{else}}
 							<i class="plus icon"></i>