Remove ldap encryption patch

bd8dc9bd0c/app/models/concerns/ldap_authenticable.rb (L50)
This commit is contained in:
Girish Ramakrishnan 2019-12-12 14:46:58 -08:00
parent 70259254a7
commit 14f02aa71c
2 changed files with 0 additions and 21 deletions

View file

@ -24,9 +24,6 @@ RUN curl -L https://github.com/tootsuite/mastodon/archive/v${VERSION}.tar.gz | t
bundle install --deployment --without test development && \
yarn install --pure-lockfile
COPY patches /app/code/patches
RUN for patch in /app/code/patches/*; do patch -N -p0 < $patch; done
# secret keys are not built into assets, so precompiling is safe to do here
# (these variables are required by rake though)
RUN SECRET_KEY_BASE=insecure.secret_key_base OTP_SECRET=insecure.otp_secret \

View file

@ -1,18 +0,0 @@
Index: lib/devise/ldap_authenticatable.rb
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- lib/devise/ldap_authenticatable.rb (date 1539296558000)
+++ lib/devise/ldap_authenticatable.rb (date 1540988096000)
@@ -12,10 +12,6 @@
host: Devise.ldap_host,
port: Devise.ldap_port,
base: Devise.ldap_base,
- encryption: {
- method: Devise.ldap_method,
- tls_options: tls_options,
- },
auth: {
method: :simple,
username: Devise.ldap_bind_dn,