Skip to content

Revert "Merge branch 'mk-always-allow-simulate-saas' into 'master'"

Matthias Käppler requested to merge revert-d64a1af7 into master

What does this MR do and why?

This led to errors when used in the Ruby 3 test instance (deployed from Omnibus):

Database connection should not be called during initializers. Read more at https://docs.gitlab.com/ee/development/rails_initializers.html#database-connections-in-initializers
...
 Caused by:
        ActiveRecord::ConnectionNotEstablished: ActiveRecord::ConnectionNotEstablished
        /opt/gitlab/embedded/service/gitlab-rails/lib/gitlab/database/load_balancing/load_balancer.rb:290:in `pool'
        /opt/gitlab/embedded/service/gitlab-rails/lib/gitlab/database/load_balancing/load_balancer.rb:110:in `read_write'
        /opt/gitlab/embedded/service/gitlab-rails/lib/gitlab/database/load_balancing/connection_proxy.rb:119:in `write_using_load_balancer'
        /opt/gitlab/embedded/service/gitlab-rails/lib/gitlab/database/load_balancing/connection_proxy.rb:89:in `method_missing'
        /opt/gitlab/embedded/service/gitlab-rails/ee/app/models/license.rb:79:in `load_license'
        /opt/gitlab/embedded/service/gitlab-rails/ee/app/models/license.rb:54:in `block in current'
        /opt/gitlab/embedded/service/gitlab-rails/lib/gitlab/json_cache.rb:55:in `fetch'
        /opt/gitlab/embedded/service/gitlab-rails/ee/app/models/license.rb:54:in `current'
        /opt/gitlab/embedded/service/gitlab-rails/lib/gitlab.rb:66:in `licensed_to_gitlab_team_member?'
        /opt/gitlab/embedded/service/gitlab-rails/lib/gitlab.rb:62:in `simulate_com?'
        /opt/gitlab/embedded/service/gitlab-rails/lib/gitlab.rb:71:in `com?'

Screenshots or screen recordings

Screenshots are required for UI changes, and strongly recommended for all other merge requests.

How to set up and validate locally

Numbered steps to set up and validate the change are strongly suggested.

MR acceptance checklist

This checklist encourages us to confirm any changes have been analyzed to reduce risks in quality, performance, reliability, security, and maintainability.

Merge request reports