Skip to content
Snippets Groups Projects
Commit d68c2b250ca6 authored by Robert Marshall's avatar Robert Marshall
Browse files

Merge branch '332502_update_bundler' into 'master'

Update Bundler version to 2.2.33

Closes gitlab#332502

See merge request gitlab-org/omnibus-gitlab!5889
No related branches found
No related tags found
2 merge requests!67heptapod#675: making 0.31 the new stable,!66GitLab 14.9
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..5e89f93
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,22 @@
+Portions copyright (c) 2010-2019 André Arko Portions copyright (c) 2009 Engine Yard
+
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
# Copyright 2012-2016 Chef Software, Inc.
# Copyright 2017-2022 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 'bundler'
# Pin the bundler version to avoid breaking changes in later versions
default_version '2.2.33'
license 'MIT'
license_file 'LICENSE'
skip_transitive_dependency_licensing true
dependency 'rubygems'
build do
patch source: "add-license-file.patch"
env = with_standard_compiler_flags(with_embedded_path)
v_opts = "--version '#{version}'" unless version.nil?
gem [
'install bundler',
v_opts,
'--no-document --force'
].compact.join(' '), env: env
end
......@@ -26,6 +26,7 @@
skip_transitive_dependency_licensing true
dependency 'pkg-config-lite'
dependency 'bundler'
dependency 'rubygems'
dependency 'libicu'
......
......@@ -40,6 +40,7 @@
license_file combined_licenses_file
dependency 'pkg-config-lite'
dependency 'bundler'
dependency 'rubygems'
dependency 'libxml2'
dependency 'libxslt'
......
......@@ -25,6 +25,7 @@
skip_transitive_dependency_licensing true
dependency 'bundler'
dependency 'rubygems'
source git: version.remote
......
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