diff options
| author | DeAndre Harris <dharris@gitlab.com> | 2019-07-29 09:45:20 +0000 |
|---|---|---|
| committer | DeAndre Harris <dharris@gitlab.com> | 2019-07-29 09:45:20 +0000 |
| commit | 88b4b9bd2e8224e17ff089d2a8ea99f800686b70 (patch) | |
| tree | 67e6fadf31d75860f2158c05168f160d52ae46fe /lib/mysql_zero_date.rb | |
| parent | 750fd7374ae67bb6ed4d9d875052bbc6d86d9b31 (diff) | |
| parent | 77926ea02512d836c61a30e3986902e2d8e7f886 (diff) | |
| download | gitlab-ce-docs-troubleshoot-scim.tar.gz | |
Merge branch 'master' into 'docs-troubleshoot-scim'docs-troubleshoot-scim
# Conflicts:
# doc/user/group/saml_sso/scim_setup.md
Diffstat (limited to 'lib/mysql_zero_date.rb')
| -rw-r--r-- | lib/mysql_zero_date.rb | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/lib/mysql_zero_date.rb b/lib/mysql_zero_date.rb deleted file mode 100644 index f36610abf8f..00000000000 --- a/lib/mysql_zero_date.rb +++ /dev/null @@ -1,20 +0,0 @@ -# frozen_string_literal: true - -# Disable NO_ZERO_DATE mode for mysql in rails 5. -# We use zero date as a default value -# (config/initializers/active_record_mysql_timestamp.rb), in -# Rails 5 using zero date fails by default (https://gitlab.com/gitlab-org/gitlab-ce/-/jobs/75450216) -# and NO_ZERO_DATE has to be explicitly disabled. Disabling strict mode -# is not sufficient. - -require 'active_record/connection_adapters/abstract_mysql_adapter' - -module MysqlZeroDate - def configure_connection - super - - @connection.query "SET @@SESSION.sql_mode = REPLACE(@@SESSION.sql_mode, 'NO_ZERO_DATE', '');" # rubocop:disable Gitlab/ModuleWithInstanceVariables - end -end - -ActiveRecord::ConnectionAdapters::AbstractMysqlAdapter.prepend(MysqlZeroDate) |