Merge branch 'master' of http://git.yes-soft.cn/scms/omnibus-gitlab

COPYING

+git-filter-repo itself and most the files in this repository (exceptions
+noted below) are provided under the MIT license (see COPYING.mit).
+
+The usage of the MIT license probably makes filter-repo compatible with
+everything, but just in case, these files can also be used under whatever
+open source license[1] that git.git or libgit2 use now or in the future
+(currently GPL[2] and GPL-with-linking-exception[3]).  Further, the
+examples (in contrib/filter-repo-demos/ and t/t9391/) can also be used
+under the same license that libgit2 provides their examples under (CC0,
+currently[4]).
+
+Exceptions:
+
+  - The test harness (t/test-lib.sh, t/test-lib-functions.sh) is a slightly
+    modified copy of git.git's test harness (the difference being that my
+    copy doesn't require a built version of 'git' to be present).  These
+    are thus GPL2 (see COPYING.gpl), and are individually marked as such.
+
+
+[1] ...as defined by the Open Source Initiative (https://opensource.org/)
+[2] https://git.kernel.org/pub/scm/git/git.git/tree/COPYING
+[3] https://github.com/libgit2/libgit2/blob/master/COPYING
+[4] https://github.com/libgit2/libgit2/blob/master/examples/COPYING

LICENSE.txt

+RubyGems is copyrighted free software by Chad Fowler, Rich Kilmer, Jim
+Weirich and others.  You can redistribute it and/or modify it under
+either the terms of the MIT license (see the file MIT.txt), or the
+conditions below:
+
+1. You may make and give away verbatim copies of the source form of the
+   software without restriction, provided that you duplicate all of the
+   original copyright notices and associated disclaimers.
+
+2. You may modify your copy of the software in any way, provided that
+   you do at least ONE of the following:
+
+   a. place your modifications in the Public Domain or otherwise
+      make them Freely Available, such as by posting said
+      modifications to Usenet or an equivalent medium, or by allowing
+      the author to include your modifications in the software.
+
+   b. use the modified software only within your corporation or
+      organization.
+
+   c. give non-standard executables non-standard names, with
+      instructions on where to get the original software distribution.
+
+   d. make other distribution arrangements with the author.
+
+3. You may distribute the software in object code or executable
+   form, provided that you do at least ONE of the following:
+
+   a. distribute the executables and library files of the software,
+      together with instructions (in the manual page or equivalent)
+      on where to get the original distribution.
+
+   b. accompany the distribution with the machine-readable source of
+      the software.
+
+   c. give non-standard executables non-standard names, with
+      instructions on where to get the original software distribution.
+
+   d. make other distribution arrangements with the author.
+
+4. You may modify and include the part of the software into any other
+   software (possibly commercial).
+
+5. The scripts and library files supplied as input to or produced as
+   output from the software do not automatically fall under the
+   copyright of the software, but belong to whomever generated them,
+   and may be sold commercially, and may be aggregated with this
+   software.
+
+6. THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
+   IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+   WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+   PURPOSE.
+

config/projects/gitlab.rb

@@ -105,7 +105,7 @@ if Build::Check.use_system_ssl?
     runtime_dependency 'openssl'
   end
 end
-
+dependency 'libiconv'
 dependency 'cacerts'
 dependency 'omnibus-gitlab-gems'
 dependency 'gitlab-selinux' if SELinuxDistroHelper.selinux_supported?

yarn.lock

+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+