Commit d7ee7e89 authored by Nick Thomas's avatar Nick Thomas

Merge branch 'master' into ce-to-ee-2018-04-10

parents a20fa3f4 cf031738
......@@ -78,7 +78,6 @@ module Gitlab
cipher.__send__(operation) # rubocop:disable GitlabSecurity/PublicSend
cipher.iv = salt
cipher.key = Gitlab::Application.secrets.db_key_base
cipher.auth_data = ''
cipher
end
......
......@@ -17,6 +17,15 @@ module Gitlab
true
end
# This is a workaround for a Ruby 2.3.7 bug. rspec-mocks cannot restore
# the visibility of prepended modules. See
# https://github.com/rspec/rspec-mocks/issues/1231 for more details.
if Rails.env.test?
def self.requires_ci_cd_setup?
raise NotImplementedError
end
end
def initialize(project)
@project = project
end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment