Merge branch 'master' into IJSDK-542

This commit is contained in:
John Hake 2019-08-20 11:45:51 -07:00 committed by GitHub
commit a3748b2d4a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 5 deletions

View File

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="intellij-sdk-docs" type="docker-deploy" factoryName="Docker Deployment" server-name="Docker">
<deployment type="dockerfile" path="$PROJECT_DIR$/Dockerfile">
<configuration default="false" name="intellij-sdk-docs" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
<deployment type="dockerfile">
<settings>
<option name="JSONFilePath" value="$PROJECT_DIR$/container_settings.json" />
<option name="command" value="" />
@ -19,8 +20,10 @@
</DockerVolumeBindingImpl>
</list>
</option>
<option name="sourceFilePath" value="$PROJECT_DIR$/Dockerfile" />
</settings>
</deployment>
<method />
</configuration>
</component>
</component>

View File

@ -68,9 +68,9 @@ GEM
ruby_dep (~> 1.2)
mercenary (0.3.6)
mini_portile2 (2.4.0)
nokogiri (1.10.1)
nokogiri (1.10.4)
mini_portile2 (~> 2.4.0)
nokogiri (1.10.1-x64-mingw32)
nokogiri (1.10.4-x64-mingw32)
mini_portile2 (~> 2.4.0)
pathutil (0.16.2)
forwardable-extended (~> 2.6)

View File

@ -66,6 +66,9 @@ NOTE: You are allowed to prettify the pattern using markdown-features:
`com.intellij.util.net.ssl.CertificateManager.HOSTNAME_VERIFIER` field removed
: Use `org.apache.http.conn.ssl.DefaultHostnameVerifier` instead.
`org.jetbrains.plugins.groovy.extensions.GroovyScriptTypeDetector(GroovyScriptType, String[])` constructor removed
: Use constructor `GroovyScriptTypeDetector(GroovyScriptType)` instead, and `com.intellij.fileType` to register additional extensions.
# 2019.2
## Changes in IntelliJ Platform 2019.2