Skip to content
Snippets Groups Projects
Commit 2b51ba87981b authored by Balasankar 'Balu' C's avatar Balasankar 'Balu' C
Browse files

Merge branch 'sh-drop-mailroom-dep' into 'master'

Drop mail_room as a separate dependency

See merge request https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/6804



Merged-by: default avatarBalasankar 'Balu' C <balasankar@gitlab.com>
Approved-by: default avatarBalasankar 'Balu' C <balasankar@gitlab.com>
Co-authored-by: default avatarStan Hu <stanhu@gmail.com>
No related branches found
No related tags found
3 merge requests!102heptapod#1237: making 0.38 the new oldstable,!96Merged heptapod branch for upstream 15.11 in heptapod-stable,!93Merged upstream 15.11.0+rc42+ce.0
......@@ -112,7 +112,6 @@
dependency 'go-crond'
dependency 'docker-distribution-pruner'
dependency 'mail_room'
dependency 'grafana-dashboards'
if Build::Check.include_ee?
dependency 'consul'
......
#
# Copyright:: Copyright (c) 2021 GitLab Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
name 'mail_room'
default_version '0.0.23'
license 'MIT'
license_file 'LICENSE.txt'
skip_transitive_dependency_licensing true
dependency 'ruby'
build do
patch source: 'add-license-file.patch'
env = with_standard_compiler_flags(with_embedded_path)
gem "install gitlab-mail_room --no-document --version #{version}", env: env
end
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment