From 59da2a0cf66bf22cc025c3840a7b32899f62c58f Mon Sep 17 00:00:00 2001 From: g0dil <g0dil@wiback.org> Date: Mon, 16 Jul 2007 12:24:38 +0000 Subject: [PATCH] Reapply changes missed during the previous merge (duh ...) --- Packets/Packet.cc | 1 + Packets/Packet.cci | 1 + Packets/Packet.ct | 1 + Packets/Packet.cti | 1 + Packets/Packet.hh | 1 + Packets/Packet.test.cc | 1 + Packets/PacketData.cc | 2 ++ Packets/PacketData.cci | 2 ++ Packets/PacketData.cti | 2 ++ Packets/PacketData.hh | 2 ++ Packets/PacketData.test.cc | 2 ++ Packets/PacketImpl.cc | 2 ++ Packets/PacketImpl.cci | 2 ++ Packets/PacketImpl.cti | 2 ++ Packets/PacketImpl.hh | 2 ++ Packets/PacketImpl.test.cc | 2 ++ Packets/PacketInterpreter.cc | 2 ++ Packets/PacketInterpreter.cci | 2 ++ Packets/PacketInterpreter.ct | 2 ++ Packets/PacketInterpreter.cti | 2 ++ Packets/PacketInterpreter.hh | 2 ++ Packets/PacketInterpreter.test.cc | 2 ++ Packets/PacketParser.cci | 2 ++ Packets/PacketParser.cti | 2 ++ Packets/PacketParser.hh | 2 ++ Packets/PacketParser.ih | 1 + Packets/PacketParser.test.cc | 2 ++ Packets/PacketRegistry.cc | 2 ++ Packets/PacketType.cci | 2 ++ Packets/PacketType.cti | 2 ++ Packets/PacketType.hh | 2 ++ Packets/PacketTypes.hh | 2 ++ Packets/ParseArray.ct | 1 + Packets/ParseArray.cti | 1 + Packets/ParseArray.hh | 1 + Packets/ParseArray.ih | 1 + Packets/ParseArray.test.cc | 1 + Packets/ParseVec.ct | 1 + Packets/ParseVec.cti | 1 + Packets/ParseVec.hh | 1 + Packets/ParseVec.test.cc | 1 + Packets/main.test.hh | 2 ++ Utils/intrusive_refcount.cti | 2 ++ Utils/pool_alloc_mixin.cti | 2 ++ Utils/pool_alloc_mixin.hh | 2 ++ Utils/singleton.cti | 2 ++ Utils/singleton.hh | 2 ++ find-sources.sh | 21 +++++++++++++++++++-- 48 files changed, 97 insertions(+), 2 deletions(-) diff --git a/Packets/Packet.cc b/Packets/Packet.cc index aed46e770..02cc5ec2d 100644 --- a/Packets/Packet.cc +++ b/Packets/Packet.cc @@ -70,4 +70,5 @@ prefix_ senf::Packet senf::Packet::checkLast() // indent-tabs-mode: nil // ispell-local-dictionary: "american" // compile-command: "scons -u test" +// comment-column: 40 // End: diff --git a/Packets/Packet.cci b/Packets/Packet.cci index a65c653ee..02e577208 100644 --- a/Packets/Packet.cci +++ b/Packets/Packet.cci @@ -158,4 +158,5 @@ prefix_ senf::PacketInterpreterBase::ptr senf::Packet::ptr() // indent-tabs-mode: nil // ispell-local-dictionary: "american" // compile-command: "scons -u test" +// comment-column: 40 // End: diff --git a/Packets/Packet.ct b/Packets/Packet.ct index e840389ca..e293a5eba 100644 --- a/Packets/Packet.ct +++ b/Packets/Packet.ct @@ -68,4 +68,5 @@ prefix_ OtherPacket senf::Packet::findPrev(NoThrow_t) // indent-tabs-mode: nil // ispell-local-dictionary: "american" // compile-command: "scons -u test" +// comment-column: 40 // End: diff --git a/Packets/Packet.cti b/Packets/Packet.cti index c17dc6fa9..532c3b07b 100644 --- a/Packets/Packet.cti +++ b/Packets/Packet.cti @@ -296,4 +296,5 @@ senf::ConcretePacket<PacketType>::ptr() // indent-tabs-mode: nil // ispell-local-dictionary: "american" // compile-command: "scons -u test" +// comment-column: 40 // End: diff --git a/Packets/Packet.hh b/Packets/Packet.hh index f4bc724f2..ae2c66e4e 100644 --- a/Packets/Packet.hh +++ b/Packets/Packet.hh @@ -236,4 +236,5 @@ namespace senf { // indent-tabs-mode: nil // ispell-local-dictionary: "american" // compile-command: "scons -u test" +// comment-column: 40 // End: diff --git a/Packets/Packet.test.cc b/Packets/Packet.test.cc index 7331b9922..60b2bd2c4 100644 --- a/Packets/Packet.test.cc +++ b/Packets/Packet.test.cc @@ -242,4 +242,5 @@ BOOST_AUTO_UNIT_TEST(concretePacket) // indent-tabs-mode: nil // ispell-local-dictionary: "american" // compile-command: "scons -u test" +// comment-column: 40 // End: diff --git a/Packets/PacketData.cc b/Packets/PacketData.cc index 9abdf04d6..8751951ae 100644 --- a/Packets/PacketData.cc +++ b/Packets/PacketData.cc @@ -52,4 +52,6 @@ prefix_ void senf::PacketData::resize(size_type n, byte v) // c-file-style: "senf" // indent-tabs-mode: nil // ispell-local-dictionary: "american" +// compile-command: "scons -u test" +// comment-column: 40 // End: diff --git a/Packets/PacketData.cci b/Packets/PacketData.cci index 6a62bb08f..9a687cfdc 100644 --- a/Packets/PacketData.cci +++ b/Packets/PacketData.cci @@ -224,4 +224,6 @@ prefix_ senf::PacketData::iterator senf::safe_data_iterator::i() // c-file-style: "senf" // indent-tabs-mode: nil // ispell-local-dictionary: "american" +// compile-command: "scons -u test" +// comment-column: 40 // End: diff --git a/Packets/PacketData.cti b/Packets/PacketData.cti index 2e10568f0..ffe2417ab 100644 --- a/Packets/PacketData.cti +++ b/Packets/PacketData.cti @@ -51,4 +51,6 @@ insert(iterator pos, InputIterator f, InputIterator l, // c-file-style: "senf" // indent-tabs-mode: nil // ispell-local-dictionary: "american" +// compile-command: "scons -u test" +// comment-column: 40 // End: diff --git a/Packets/PacketData.hh b/Packets/PacketData.hh index f1de1792c..e7dae963c 100644 --- a/Packets/PacketData.hh +++ b/Packets/PacketData.hh @@ -177,4 +177,6 @@ namespace senf { // c-file-style: "senf" // indent-tabs-mode: nil // ispell-local-dictionary: "american" +// compile-command: "scons -u test" +// comment-column: 40 // End: diff --git a/Packets/PacketData.test.cc b/Packets/PacketData.test.cc index 4354b9a9f..e9e3f3a05 100644 --- a/Packets/PacketData.test.cc +++ b/Packets/PacketData.test.cc @@ -137,4 +137,6 @@ BOOST_AUTO_UNIT_TEST(safePacketIterator) // c-file-style: "senf" // indent-tabs-mode: nil // ispell-local-dictionary: "american" +// compile-command: "scons -u test" +// comment-column: 40 // End: diff --git a/Packets/PacketImpl.cc b/Packets/PacketImpl.cc index dd78bb767..e4db0665e 100644 --- a/Packets/PacketImpl.cc +++ b/Packets/PacketImpl.cc @@ -122,4 +122,6 @@ prefix_ void senf::detail::PacketImpl::updateIterators(PacketData * self, iterat // c-file-style: "senf" // indent-tabs-mode: nil // ispell-local-dictionary: "american" +// compile-command: "scons -u test" +// comment-column: 40 // End: diff --git a/Packets/PacketImpl.cci b/Packets/PacketImpl.cci index d8dd2cb07..f2293a8ec 100644 --- a/Packets/PacketImpl.cci +++ b/Packets/PacketImpl.cci @@ -195,4 +195,6 @@ prefix_ senf::detail::PacketImpl::Guard::~Guard() // c-file-style: "senf" // indent-tabs-mode: nil // ispell-local-dictionary: "american" +// compile-command: "scons -u test" +// comment-column: 40 // End: diff --git a/Packets/PacketImpl.cti b/Packets/PacketImpl.cti index aae761203..2e3fada18 100644 --- a/Packets/PacketImpl.cti +++ b/Packets/PacketImpl.cti @@ -56,4 +56,6 @@ prefix_ senf::detail::PacketImpl::PacketImpl(InputIterator first, InputIterator // c-file-style: "senf" // indent-tabs-mode: nil // ispell-local-dictionary: "american" +// compile-command: "scons -u test" +// comment-column: 40 // End: diff --git a/Packets/PacketImpl.hh b/Packets/PacketImpl.hh index 7ba7cb03e..39ccd470f 100644 --- a/Packets/PacketImpl.hh +++ b/Packets/PacketImpl.hh @@ -126,4 +126,6 @@ namespace detail { // c-file-style: "senf" // indent-tabs-mode: nil // ispell-local-dictionary: "american" +// compile-command: "scons -u test" +// comment-column: 40 // End: diff --git a/Packets/PacketImpl.test.cc b/Packets/PacketImpl.test.cc index 0c6217416..83e5373c9 100644 --- a/Packets/PacketImpl.test.cc +++ b/Packets/PacketImpl.test.cc @@ -207,4 +207,6 @@ BOOST_AUTO_UNIT_TEST(packetImpl_interpreters) // c-file-style: "senf" // indent-tabs-mode: nil // ispell-local-dictionary: "american" +// compile-command: "scons -u test" +// comment-column: 40 // End: diff --git a/Packets/PacketInterpreter.cc b/Packets/PacketInterpreter.cc index 5ab83d8ff..7cd389a3b 100644 --- a/Packets/PacketInterpreter.cc +++ b/Packets/PacketInterpreter.cc @@ -101,4 +101,6 @@ prefix_ senf::PacketInterpreterBase::Factory::~Factory() // c-file-style: "senf" // indent-tabs-mode: nil // ispell-local-dictionary: "american" +// compile-command: "scons -u test" +// comment-column: 40 // End: diff --git a/Packets/PacketInterpreter.cci b/Packets/PacketInterpreter.cci index 5d6a51e13..94e7c292d 100644 --- a/Packets/PacketInterpreter.cci +++ b/Packets/PacketInterpreter.cci @@ -182,4 +182,6 @@ prefix_ void senf::PacketInterpreterBase::releaseImpl() // c-file-style: "senf" // indent-tabs-mode: nil // ispell-local-dictionary: "american" +// compile-command: "scons -u test" +// comment-column: 40 // End: diff --git a/Packets/PacketInterpreter.ct b/Packets/PacketInterpreter.ct index 3f726389b..b2f455b2b 100644 --- a/Packets/PacketInterpreter.ct +++ b/Packets/PacketInterpreter.ct @@ -361,4 +361,6 @@ const typename senf::PacketInterpreter<PacketType>::FactoryImpl // c-file-style: "senf" // indent-tabs-mode: nil // ispell-local-dictionary: "american" +// compile-command: "scons -u test" +// comment-column: 40 // End: diff --git a/Packets/PacketInterpreter.cti b/Packets/PacketInterpreter.cti index a0748b702..19dc0869c 100644 --- a/Packets/PacketInterpreter.cti +++ b/Packets/PacketInterpreter.cti @@ -225,4 +225,6 @@ senf::PacketInterpreter<PacketType>::parser_p() // c-file-style: "senf" // indent-tabs-mode: nil // ispell-local-dictionary: "american" +// compile-command: "scons -u test" +// comment-column: 40 // End: diff --git a/Packets/PacketInterpreter.hh b/Packets/PacketInterpreter.hh index 7e5f52210..d49510f52 100644 --- a/Packets/PacketInterpreter.hh +++ b/Packets/PacketInterpreter.hh @@ -359,4 +359,6 @@ namespace senf { // c-file-style: "senf" // indent-tabs-mode: nil // ispell-local-dictionary: "american" +// compile-command: "scons -u test" +// comment-column: 40 // End: diff --git a/Packets/PacketInterpreter.test.cc b/Packets/PacketInterpreter.test.cc index b71bf3390..c26dc07fc 100644 --- a/Packets/PacketInterpreter.test.cc +++ b/Packets/PacketInterpreter.test.cc @@ -301,4 +301,6 @@ BOOST_AUTO_UNIT_TEST(packetInterpreter_factory) // c-file-style: "senf" // indent-tabs-mode: nil // ispell-local-dictionary: "american" +// compile-command: "scons -u test" +// comment-column: 40 // End: diff --git a/Packets/PacketParser.cci b/Packets/PacketParser.cci index d18cf3a93..173e54e80 100644 --- a/Packets/PacketParser.cci +++ b/Packets/PacketParser.cci @@ -96,4 +96,6 @@ prefix_ senf::PacketParserBase::data_iterator senf::PacketParserBase::end() // c-file-style: "senf" // indent-tabs-mode: nil // ispell-local-dictionary: "american" +// compile-command: "scons -u test" +// comment-column: 40 // End: diff --git a/Packets/PacketParser.cti b/Packets/PacketParser.cti index 9b885e57f..826f06654 100644 --- a/Packets/PacketParser.cti +++ b/Packets/PacketParser.cti @@ -138,4 +138,6 @@ prefix_ bool senf::SafePacketParser<Parser>::boolean_test() // c-file-style: "senf" // indent-tabs-mode: nil // ispell-local-dictionary: "american" +// compile-command: "scons -u test" +// comment-column: 40 // End: diff --git a/Packets/PacketParser.hh b/Packets/PacketParser.hh index cd45e47bb..e5eee7797 100644 --- a/Packets/PacketParser.hh +++ b/Packets/PacketParser.hh @@ -425,4 +425,6 @@ namespace senf { // c-file-style: "senf" // indent-tabs-mode: nil // ispell-local-dictionary: "american" +// compile-command: "scons -u test" +// comment-column: 40 // End: diff --git a/Packets/PacketParser.ih b/Packets/PacketParser.ih index 0c6131e86..9acee0fa1 100644 --- a/Packets/PacketParser.ih +++ b/Packets/PacketParser.ih @@ -80,4 +80,5 @@ namespace detail { // indent-tabs-mode: nil // ispell-local-dictionary: "american" // compile-command: "scons -u test" +// comment-column: 40 // End: diff --git a/Packets/PacketParser.test.cc b/Packets/PacketParser.test.cc index 9f115cb5b..5db0e606a 100644 --- a/Packets/PacketParser.test.cc +++ b/Packets/PacketParser.test.cc @@ -120,4 +120,6 @@ BOOST_AUTO_UNIT_TEST(safePacketParser) // c-file-style: "senf" // indent-tabs-mode: nil // ispell-local-dictionary: "american" +// compile-command: "scons -u test" +// comment-column: 40 // End: diff --git a/Packets/PacketRegistry.cc b/Packets/PacketRegistry.cc index 6b4956c3c..09a6af831 100644 --- a/Packets/PacketRegistry.cc +++ b/Packets/PacketRegistry.cc @@ -44,4 +44,6 @@ prefix_ senf::PkReg_Entry::~PkReg_Entry() // c-file-style: "senf" // indent-tabs-mode: nil // ispell-local-dictionary: "american" +// compile-command: "scons -u test" +// comment-column: 40 // End: diff --git a/Packets/PacketType.cci b/Packets/PacketType.cci index 9ef4a5a78..4e3776782 100644 --- a/Packets/PacketType.cci +++ b/Packets/PacketType.cci @@ -78,4 +78,6 @@ prefix_ void senf::PacketTypeBase::dump(packet p, std::ostream & os) // c-file-style: "senf" // indent-tabs-mode: nil // ispell-local-dictionary: "american" +// compile-command: "scons -u test" +// comment-column: 40 // End: diff --git a/Packets/PacketType.cti b/Packets/PacketType.cti index aa610d8c1..4f01389a1 100644 --- a/Packets/PacketType.cti +++ b/Packets/PacketType.cti @@ -115,4 +115,6 @@ prefix_ void senf::PacketTypeMixin<Self,void>::init(Packet p) // c-file-style: "senf" // indent-tabs-mode: nil // ispell-local-dictionary: "american" +// compile-command: "scons -u test" +// comment-column: 40 // End: diff --git a/Packets/PacketType.hh b/Packets/PacketType.hh index 88ea3bd39..8e46eecf8 100644 --- a/Packets/PacketType.hh +++ b/Packets/PacketType.hh @@ -284,4 +284,6 @@ namespace senf { // c-file-style: "senf" // indent-tabs-mode: nil // ispell-local-dictionary: "american" +// compile-command: "scons -u test" +// comment-column: 40 // End: diff --git a/Packets/PacketTypes.hh b/Packets/PacketTypes.hh index 5a89c1a08..980c18330 100644 --- a/Packets/PacketTypes.hh +++ b/Packets/PacketTypes.hh @@ -84,4 +84,6 @@ namespace test { // c-file-style: "senf" // indent-tabs-mode: nil // ispell-local-dictionary: "american" +// compile-command: "scons -u test" +// comment-column: 40 // End: diff --git a/Packets/ParseArray.ct b/Packets/ParseArray.ct index f893f0107..411b077a2 100644 --- a/Packets/ParseArray.ct +++ b/Packets/ParseArray.ct @@ -54,4 +54,5 @@ prefix_ void senf::Parse_Array<elements,ElementParser>::init() // indent-tabs-mode: nil // ispell-local-dictionary: "american" // compile-command: "scons -u test" +// comment-column: 40 // End: diff --git a/Packets/ParseArray.cti b/Packets/ParseArray.cti index 863181133..901b51a74 100644 --- a/Packets/ParseArray.cti +++ b/Packets/ParseArray.cti @@ -165,4 +165,5 @@ prefix_ void senf::detail::Parse_Array_iterator<ElementParser>::advance(int n) // indent-tabs-mode: nil // ispell-local-dictionary: "american" // compile-command: "scons -u test" +// comment-column: 40 // End: diff --git a/Packets/ParseArray.hh b/Packets/ParseArray.hh index 851486ac2..1e98a71d5 100644 --- a/Packets/ParseArray.hh +++ b/Packets/ParseArray.hh @@ -75,4 +75,5 @@ namespace senf { // indent-tabs-mode: nil // ispell-local-dictionary: "american" // compile-command: "scons -u test" +// comment-column: 40 // End: diff --git a/Packets/ParseArray.ih b/Packets/ParseArray.ih index 7ea3d5063..9aa344b46 100644 --- a/Packets/ParseArray.ih +++ b/Packets/ParseArray.ih @@ -74,4 +74,5 @@ private: // indent-tabs-mode: nil // ispell-local-dictionary: "american" // compile-command: "scons -u test" +// comment-column: 40 // End: diff --git a/Packets/ParseArray.test.cc b/Packets/ParseArray.test.cc index fdef96510..8dc19ae1d 100644 --- a/Packets/ParseArray.test.cc +++ b/Packets/ParseArray.test.cc @@ -107,4 +107,5 @@ BOOST_AUTO_UNIT_TEST(parseArray_test) // indent-tabs-mode: nil // ispell-local-dictionary: "american" // compile-command: "scons -u test" +// comment-column: 40 // End: diff --git a/Packets/ParseVec.ct b/Packets/ParseVec.ct index 9aaefbed8..de1f131c7 100644 --- a/Packets/ParseVec.ct +++ b/Packets/ParseVec.ct @@ -118,4 +118,5 @@ prefix_ void senf::Parse_Vector_Container<ElementParser,Sizer>::resize(size_type // indent-tabs-mode: nil // ispell-local-dictionary: "american" // compile-command: "scons -u test" +// comment-column: 40 // End: diff --git a/Packets/ParseVec.cti b/Packets/ParseVec.cti index 66c6a93eb..b50e50b37 100644 --- a/Packets/ParseVec.cti +++ b/Packets/ParseVec.cti @@ -391,4 +391,5 @@ prefix_ void senf::Parse_Vector_Container<ElementParser,Sizer>::setSize(size_typ // indent-tabs-mode: nil // ispell-local-dictionary: "american" // compile-command: "scons -u test" +// comment-column: 40 // End: diff --git a/Packets/ParseVec.hh b/Packets/ParseVec.hh index 373903eea..21239e8be 100644 --- a/Packets/ParseVec.hh +++ b/Packets/ParseVec.hh @@ -211,4 +211,5 @@ namespace senf { // indent-tabs-mode: nil // ispell-local-dictionary: "american" // compile-command: "scons -u test" +// comment-column: 40 // End: diff --git a/Packets/ParseVec.test.cc b/Packets/ParseVec.test.cc index ffb22cac2..35079a76c 100644 --- a/Packets/ParseVec.test.cc +++ b/Packets/ParseVec.test.cc @@ -185,4 +185,5 @@ BOOST_AUTO_UNIT_TEST(parseVec_wrapper) // indent-tabs-mode: nil // ispell-local-dictionary: "american" // compile-command: "scons -u test" +// comment-column: 40 // End: diff --git a/Packets/main.test.hh b/Packets/main.test.hh index f7d6f7938..470fc57b0 100644 --- a/Packets/main.test.hh +++ b/Packets/main.test.hh @@ -64,4 +64,6 @@ namespace test { // c-file-style: "senf" // indent-tabs-mode: nil // ispell-local-dictionary: "american" +// compile-command: "scons -u test" +// comment-column: 40 // End: diff --git a/Utils/intrusive_refcount.cti b/Utils/intrusive_refcount.cti index bf3c744f8..7b5065581 100644 --- a/Utils/intrusive_refcount.cti +++ b/Utils/intrusive_refcount.cti @@ -66,4 +66,6 @@ prefix_ senf::intrusive_refcount_t<Self>::intrusive_refcount_t() // c-file-style: "senf" // indent-tabs-mode: nil // ispell-local-dictionary: "american" +// compile-command: "scons -u test" +// comment-column: 40 // End: diff --git a/Utils/pool_alloc_mixin.cti b/Utils/pool_alloc_mixin.cti index 613996179..a16314638 100644 --- a/Utils/pool_alloc_mixin.cti +++ b/Utils/pool_alloc_mixin.cti @@ -81,4 +81,6 @@ prefix_ unsigned long senf::pool_alloc_mixin<Self>::allocCounter(long delta) // c-file-style: "senf" // indent-tabs-mode: nil // ispell-local-dictionary: "american" +// compile-command: "scons -u test" +// comment-column: 40 // End: diff --git a/Utils/pool_alloc_mixin.hh b/Utils/pool_alloc_mixin.hh index fc1a2320d..61548732d 100644 --- a/Utils/pool_alloc_mixin.hh +++ b/Utils/pool_alloc_mixin.hh @@ -104,4 +104,6 @@ namespace senf { // c-file-style: "senf" // indent-tabs-mode: nil // ispell-local-dictionary: "american" +// compile-command: "scons -u test" +// comment-column: 40 // End: diff --git a/Utils/singleton.cti b/Utils/singleton.cti index 02c07dc73..1f3b5c0f8 100644 --- a/Utils/singleton.cti +++ b/Utils/singleton.cti @@ -62,4 +62,6 @@ typename senf::singleton<Self>::force_creation senf::singleton<Self>::create_; // c-file-style: "senf" // indent-tabs-mode: nil // ispell-local-dictionary: "american" +// compile-command: "scons -u test" +// comment-column: 40 // End: diff --git a/Utils/singleton.hh b/Utils/singleton.hh index d95b5184f..ade1fa343 100644 --- a/Utils/singleton.hh +++ b/Utils/singleton.hh @@ -104,4 +104,6 @@ namespace senf { // c-file-style: "senf" // indent-tabs-mode: nil // ispell-local-dictionary: "american" +// compile-command: "scons -u test" +// comment-column: 40 // End: diff --git a/find-sources.sh b/find-sources.sh index df2080baa..b28c390cc 100755 --- a/find-sources.sh +++ b/find-sources.sh @@ -1,4 +1,21 @@ -#!/bin/sh +#!/bin/sh -e + +if [ -z "$1" ]; then + echo "Usage:" + echo " $0 [-c] <commands>" + echo + echo "-c Only list C/C++ source files" + echo + echo "<commands> are any find commands (which should contain a -print somewhere)" + echo "which are matched for any file fond" + exit 1 +fi + +cond="" +if [ "$1" = "-c" ]; then + shift + cond='( -name *.h -o -name *.hh -o -name *.ih -o -name *.c -o -name *.cc -o -name *.cci -o -name *.ct -o -name *.cti )' +fi find . \ -name .svn -prune -o \ @@ -11,5 +28,5 @@ find . \ -name .test.bin -o \ -name "*.stamp" -o \ -name ".sconsign*" -o \ - -type f \( "$@" \) + -type f $cond \( "$@" \) -- GitLab