From 4f8781061cb277e4bf48237e0239d359965a701f Mon Sep 17 00:00:00 2001
From: Baodong <wwwicbd@gmail.com>
Date: Mon, 20 Nov 2023 14:29:43 +0000
Subject: [PATCH] Remove shimo integration
Changelog: removed
---
.rubocop_todo/rspec/expect_change.yml | 1 -
.../rspec/factory_bot/avoid_create.yml | 1 -
.rubocop_todo/rspec/feature_category.yml | 2 -
app/assets/images/logos/shimo.svg | 1 -
.../integrations/shimos_controller.rb | 19 -----
app/models/integration.rb | 3 +-
app/models/integrations/shimo.rb | 39 -----------
app/models/project.rb | 4 +-
.../integrations/shimos/show.html.haml | 10 ---
.../20211028210001_projects_shimo_active.yml | 4 +-
.../20211028210002_groups_shimo_active.yml | 4 +-
.../20211028210003_instances_shimo_active.yml | 4 +-
...10004_projects_inheriting_shimo_active.yml | 4 +-
...8210005_groups_inheriting_shimo_active.yml | 4 +-
config/routes/project.rb | 4 --
.../15-7-deprecate-shimo-integration.yml | 3 +-
db/docs/integrations.yml | 1 -
doc/.vale/gitlab/spelling-exceptions.txt | 1 -
doc/api/graphql/reference/index.md | 1 -
doc/development/integrations/index.md | 1 -
doc/update/deprecations.md | 30 ++++----
doc/user/project/integrations/shimo.md | 36 ++--------
lib/api/helpers/integrations_helpers.rb | 9 ---
lib/sidebars/projects/menus/shimo_menu.rb | 41 -----------
lib/sidebars/projects/panel.rb | 4 +-
locale/gitlab.pot | 21 ------
spec/factories/integrations.rb | 6 --
spec/features/integrations_settings_spec.rb | 6 +-
.../types/projects/service_type_enum_spec.rb | 1 -
spec/lib/gitlab/import_export/all_models.yml | 1 -
.../import_export/safe_model_attributes.yml | 1 -
.../projects/menus/shimo_menu_spec.rb | 44 ------------
spec/lib/sidebars/projects/panel_spec.rb | 22 ------
spec/models/integration_spec.rb | 3 +-
.../base_third_party_wiki_spec.rb | 46 -------------
spec/models/integrations/shimo_spec.rb | 69 -------------------
spec/requests/api/integrations_spec.rb | 3 +-
.../integrations/shimos_controller_spec.rb | 37 ----------
spec/support/rspec_order_todo.yml | 3 -
39 files changed, 44 insertions(+), 450 deletions(-)
delete mode 100644 app/assets/images/logos/shimo.svg
delete mode 100644 app/controllers/projects/integrations/shimos_controller.rb
delete mode 100644 app/models/integrations/shimo.rb
delete mode 100644 app/views/projects/integrations/shimos/show.html.haml
delete mode 100644 lib/sidebars/projects/menus/shimo_menu.rb
delete mode 100644 spec/lib/sidebars/projects/menus/shimo_menu_spec.rb
delete mode 100644 spec/models/integrations/base_third_party_wiki_spec.rb
delete mode 100644 spec/models/integrations/shimo_spec.rb
delete mode 100644 spec/requests/projects/integrations/shimos_controller_spec.rb
diff --git a/.rubocop_todo/rspec/expect_change.yml b/.rubocop_todo/rspec/expect_change.yml
index ba2068d8117da..a8c4653049a7a 100644
--- a/.rubocop_todo/rspec/expect_change.yml
+++ b/.rubocop_todo/rspec/expect_change.yml
@@ -263,7 +263,6 @@ RSpec/ExpectChange:
- 'spec/models/integration_spec.rb'
- 'spec/models/integrations/confluence_spec.rb'
- 'spec/models/integrations/drone_ci_spec.rb'
- - 'spec/models/integrations/shimo_spec.rb'
- 'spec/models/label_spec.rb'
- 'spec/models/members/last_group_owner_assigner_spec.rb'
- 'spec/models/merge_request/cleanup_schedule_spec.rb'
diff --git a/.rubocop_todo/rspec/factory_bot/avoid_create.yml b/.rubocop_todo/rspec/factory_bot/avoid_create.yml
index 2243f7e61a886..d36df0b01de8b 100644
--- a/.rubocop_todo/rspec/factory_bot/avoid_create.yml
+++ b/.rubocop_todo/rspec/factory_bot/avoid_create.yml
@@ -348,7 +348,6 @@ RSpec/FactoryBot/AvoidCreate:
- 'spec/lib/sidebars/projects/menus/project_information_menu_spec.rb'
- 'spec/lib/sidebars/projects/menus/repository_menu_spec.rb'
- 'spec/lib/sidebars/projects/menus/security_compliance_menu_spec.rb'
- - 'spec/lib/sidebars/projects/menus/shimo_menu_spec.rb'
- 'spec/lib/sidebars/projects/panel_spec.rb'
- 'spec/mailers/abuse_report_mailer_spec.rb'
- 'spec/mailers/devise_mailer_spec.rb'
diff --git a/.rubocop_todo/rspec/feature_category.yml b/.rubocop_todo/rspec/feature_category.yml
index eb740c099c300..9e0ae7c96d986 100644
--- a/.rubocop_todo/rspec/feature_category.yml
+++ b/.rubocop_todo/rspec/feature_category.yml
@@ -4280,7 +4280,6 @@ RSpec/FeatureCategory:
- 'spec/lib/sidebars/projects/menus/monitor_menu_spec.rb'
- 'spec/lib/sidebars/projects/menus/security_compliance_menu_spec.rb'
- 'spec/lib/sidebars/projects/menus/settings_menu_spec.rb'
- - 'spec/lib/sidebars/projects/menus/shimo_menu_spec.rb'
- 'spec/lib/sidebars/projects/menus/zentao_menu_spec.rb'
- 'spec/lib/system_check/app/authorized_keys_permission_check_spec.rb'
- 'spec/lib/system_check/app/git_user_default_ssh_config_check_spec.rb'
@@ -4622,7 +4621,6 @@ RSpec/FeatureCategory:
- 'spec/models/integrations/pumble_spec.rb'
- 'spec/models/integrations/pushover_spec.rb'
- 'spec/models/integrations/redmine_spec.rb'
- - 'spec/models/integrations/shimo_spec.rb'
- 'spec/models/integrations/slack_spec.rb'
- 'spec/models/integrations/teamcity_spec.rb'
- 'spec/models/integrations/unify_circuit_spec.rb'
diff --git a/app/assets/images/logos/shimo.svg b/app/assets/images/logos/shimo.svg
deleted file mode 100644
index 65bd1cc716750..0000000000000
--- a/app/assets/images/logos/shimo.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg fill="none" height="16" viewBox="0 0 16 16" width="16" xmlns="http://www.w3.org/2000/svg"><path d="m7.99985 15.9997c4.41815 0 7.99985-3.5817 7.99985-7.99985 0-4.4182-3.5817-7.99985-7.99985-7.99985-4.4182 0-7.99985 3.58165-7.99985 7.99985 0 4.41815 3.58165 7.99985 7.99985 7.99985z" fill="#3f464a"/><g fill="#fff"><path d="m10.1501 3.13098c.0077.00805.017.01641.025.02601l.2988.34857c.0099.01099.0189.0228.0269.03529.0048.00966.0075.0202.0081.03096.0001.00853-.0027.01685-.0079.02359-.0053.00675-.0126.01153-.0209.01355-.0147.00206-.0295.0032-.0443.00341l-.70117.00991c-.24229.0035-.48457.0067-.72686.00959-.22104.00248-.44207.00372-.6631.00681-.20401.00248-.40801.0065-.61171.00991-.01269 0-.02538 0-.03807.00248-.00527 0-.01115.00959-.00867.01393.00455.00951.00972.01871.01548.02755.0552.07835.12273.14725.19998.204.0356.02662.07368.04984.11051.07523.01242.00804.02403.01727.03468.02755.00948.01029.01475.02377.01475.03777 0 .01399-.00527.02747-.01475.03776-.00419.00471-.00886.00896-.01394.0127-.01157.00943-.02097.02126-.02755.03467-.06748.11309-.13507.2266-.20276.34052-.10524.17487-.22146.34289-.34796.50305-.01089.01016-.01917.0228-.02415.03684-.00017.00237-.00017.00475 0 .00712.00497.00357.01026.00668.01579.00928.06192.0257.126.05077.18884.07678.01379.0055.02849.00834.04334.00836h.05758 1.5045.05108c.00857-.00025.01691-.00276.0242-.00727.00728-.00451.01325-.01087.01728-.01843.00743-.01284.01395-.02618.0195-.03993.02167-.0483.04303-.09721.0647-.1455.00487-.01181.01089-.02311.01796-.03374.00581-.00902.01482-.01551.02521-.01815.0104-.00264.02141-.00125.03082.00391l.02786.01548.33527.19688c.01106.00633.02144.0138.03095.02229.00321.00283.00551.00654.00661.01067s.00096.0085-.00042.01255c-.0034.0099-.00804.0195-.01238.0291-.0291.06191-.05696.12382-.08823.18388-.02023.03975-.03033.08388-.02941.12847v1.02003c0 .09999.00001.19998-.00247.29966-.00185.09338-.01054.1865-.02601.27861-.00686.04206-.01721.08348-.03095.12382-.02828.08507-.07696.16191-.14178.22382-.05123.04802-.10725.09065-.16717.12723-.01271.00783-.0275.01161-.04241.01084-.00639-.00011-.01258-.0022-.01773-.00596-.00516-.00377-.00902-.00904-.01106-.01509-.00248-.00805-.00403-.01641-.00588-.02477-.00918-.0392-.02055-.07785-.03406-.11578-.01986-.05201-.05688-.0957-.10494-.12382-.00743-.00402-.0157-.00625-.02415-.0065-.01485-.00078-.02972-.00078-.04457 0-.15912.00774-.31855.00743-.47798.00866l-.75875.00589c-.0743 0-.14859.00216-.22289.00402-.01637-.00159-.03289.00009-.0486.00495-.00376.00242-.00682.00578-.00888.00974-.00207.00397-.00306.0084-.00289.01286-.00557.03096-.0099.06192-.0164.09287-.01604.07268-.04132.14301-.07523.20927-.05921.11305-.13198.21846-.2167.3139-.0047.00582-.01055.01061-.01719.01407-.00663.00346-.01391.00551-.02137.00603-.00747.00053-.01496-.00049-.02201-.00299s-.01352-.00643-.01899-.01154c-.00892-.00618-.01504-.01564-.01702-.02631-.00186-.01023-.0031-.02057-.00372-.03096 0-.02321 0-.04674 0-.06996v-2.37841c0-.01702 0-.03436 0-.05107 0-.01672.00589-.03096-.0099-.04087-.01393.00279-.01951.01517-.02724.02477-.18029.22601-.37688.43853-.58818.63585-.29527.27883-.61431.53136-.95348.75473-.01764.01176-.0356.02321-.05386.03405-.00952.00504-.02063.00615-.03096.00309-.00515-.00121-.0099-.00373-.01381-.00731-.0039-.00357-.00682-.00809-.00848-.01312-.00253-.00507-.00335-.01082-.00234-.0164.001-.00558.00378-.01068.00792-.01455.01393-.01301.02848-.02539.04334-.03746.11722-.09494.23124-.19369.34207-.29626.3874-.36168.72258-.77551.99588-1.2296.16487-.27522.31301-.56013.44361-.85317.08668-.19162.16717-.38572.2458-.58075.02446-.06191.01207-.06191-.04055-.06191l-.34424.00898c-.20401.00557-.40771.01052-.61171.01671-.13157.00434-.26313.01084-.39501.01672-.01482.00051-.02963-.00115-.04396-.00495-.01457-.00344-.02781-.01109-.03808-.02198-.00588-.00619-.01145-.01239-.01702-.01889-.04768-.05407-.09525-.10845-.14271-.16314-.0068-.00812-.01271-.01694-.01765-.02631 0-.00217.00186-.00991.00372-.01022.0126-.00195.02532-.00299.03807-.00309h.31236.88629l.79033-.00248c.25715 0 .5143-.00093.77145-.00279l1.01383-.00247c.01268-.00078.0254-.00078.03808 0 .01271.00099.02548-.00098.03729-.00576.01182-.00478.02237-.01224.03081-.02179.08947-.08421.18017-.16779.27087-.25168.0105-.00929.0189-.0226.0378-.02446zm-2.54778 3.05791v.8476c0 .02105 0 .04241.00217.06191.00051.00421.00239.00813.00536.01115s.00685.00498.01105.00557c.01888 0 .03808.00185.05727.00185l1.44011-.00433h.03096c.01172.00058.02344-.00133.03438-.0056.01093-.00427.02085-.0108.02908-.01917.0125-.01146.02409-.02388.03467-.03714.03005-.03864.05291-.08237.06749-.12909.01811-.05894.02678-.12038.02569-.18203 0-.46745-.00062-.93489-.00186-1.40234 0-.01703 0-.03405 0-.05077-.0006-.00849-.00247-.01684-.00557-.02476-.00288-.0103-.0089-.01945-.01722-.02616-.00833-.00672-.01854-.01067-.02921-.0113-.01053 0-.02136 0-.03096 0-.10835 0-.2167-.00341-.32505-.00341-.32731 0-.65442 0-.98133 0-.08699 0-.17429.00403-.26127.00557-.01487.00085-.02941.00469-.04276.01129-.01335.00659-.02524.01581-.03495.0271-.01269.013-.0065.03096-.00712.04891-.00062.01796 0 .03096 0 .04458z"/><path d="m6.35047 8.7363c.01814-.00207.03651.00027.05356.00681.09287.02662.18574.05293.28046.08017.0365.01068.07435.016.11238.01579l1.99857.00186h.71695c.08978 0 .06904.0096.11269-.06377.02352-.04025.04674-.08049.07027-.12042.00261-.0047.00697-.00817.01212-.00968.00516-.00151.0107-.00092.01543.00163l.02786.01455c.0904.05077.18079.10154.27364.14766.0369.01827.0585.03096.0273.08389-.0217.03622-.0412.07399-.06195.11021-.01119.01807-.01659.03914-.01548.06037v.03095.686.03808c-.00102.00948-.00015.01906.00256.0282s.00721.01765.01323.02504c.00273.00326.00511.00679.00712.01053.00362.00653.00542.01385.00552.02129 0 .00745-.0018.01479-.00528.02136-.0035.00657-.00858.01217-.01479.01629-.0062.00412-.01333.00663-.02074.00731-.01681.00092-.03366.00092-.05046 0-.22413-.00155-.44857-.00403-.67269-.00496-.26221 0-.52441 0-.78661 0-.01889 0-.03808 0-.05696.00279-.00413.00087-.0079.00296-.01082.00599-.00293.00304-.00488.00688-.00559.01104v.01888.27864c-.00041.0103.00042.0207.00247.0309.00102.0029.00266.0055.00479.0077.00214.0022.00473.0039.0076.005.00802.0025.01639.0035.02476.0031h.91385.07058c.01269-.0118.02538-.0226.03715-.0343l.14704-.1496c.00743-.0074.01517-.0145.02291-.0216.00324-.0027.00729-.0041.01145-.0041.00417 0 .00821.0014.01146.0041.00495.0039.00971.0082.01424.0127l.26003.2513c.00873.0091.0168.0189.02415.0291.00302.0056.00381.0121.0022.0183-.00161.0061-.00549.0114-.01087.0148-.00971.005-.02017.0082-.03096.0096-.01888.0016-.03807 0-.05696 0l-1.36395.0062c-.10401 0-.09287-.0096-.09287.091v.2477c.00004.0104.00097.0207.00279.031.00141.0039.0043.0071.00804.0089.00382.0021.00805.0033.01239.0034h.04426l.69158.0034c.18822 0 .37643.0028.56465.0031.08699 0 .06625.0081.12878-.0489.05325-.0483.10587-.0972.15881-.1458.00864-.0105.02037-.018.03347-.0216.0063.0043.0124.0089.0182.0139.091.0913.1824.1826.2731.2743.0072.0075.0134.0159.0185.025.0016.0034.0025.007.0025.0107.0001.0037-.0007.0074-.0022.0108-.0015.0033-.0037.0063-.0065.0088-.0027.0024-.006.0043-.0095.0053-.0124.0025-.0249.0038-.0375.0041-.0551 0-.1099 0-.165 0-.36591-.0016-.73182-.0041-1.09742-.005-.82552-.0019-1.65041-.0032-2.47469-.004h-.35507c-.01084 0-.02136 0-.03096 0-.01145.0007-.02292-.0011-.03361-.0053s-.02034-.0106-.0283-.0189l-.10773-.1077c-.00121-.0016-.00194-.0035-.00212-.0055s.0002-.004.0011-.0058.00228-.0034.00399-.0044c.00171-.0011.00369-.0016.0057-.0016h.03807l.99619.0059.88815.0065h.05696c.00411-.0009.00789-.0029.01091-.0058s.00514-.0066.00612-.0107c0-.0065.00186-.0126.00186-.0188 0-.1016 0-.2031 0-.3047.00035-.0084-.00091-.0168-.00372-.0247-.00117-.0028-.00298-.0053-.00529-.0073s-.00506-.0034-.00802-.0042c-.02064-.0018-.04128-.0028-.06191-.0028-.20308 0-.40616 0-.60892 0-.22227 0-.44434-.0006-.66619-.0018-.00867 0-.01703 0-.02539 0-.01271.0007-.02541-.0016-.03715-.0065s-.02222-.0124-.03064-.022c-.03251-.0331-.06563-.0659-.09875-.0987-.00253-.0018-.00437-.0045-.00521-.0074-.00085-.003-.00065-.0062.00056-.0091.0031-.0068.00991-.0065.0161-.0065.13745 0 .2749 0 .41234.0016l1.04046.0093h.06346c.00406-.0008.00782-.0027.01088-.0055.00305-.0028.00529-.0063.00646-.0103.00128-.0083.00211-.0167.00247-.0251v-.27859c-.00036-.0084-.00119-.01677-.00247-.02508-.00083-.00414-.00291-.00793-.00595-.01087-.00304-.00293-.00691-.00486-.01108-.00554-.01269 0-.02538-.00185-.03808-.00185-.09503 0-.19038 0-.28542.00185-.29409.0031-.58817 0-.88195 0-.01672 0-.03375 0-.05077 0-.00839.00074-.01641.00373-.02322.00867-.01149.00973-.02244.02006-.03282.03096-.06408.05885-.13032.11455-.19936.16715-.01486.0118-.03095.0226-.04612.0334-.00516.0037-.01065.0068-.01641.0093-.00493.002-.01022.0027-.01549.0023s-.01038-.002-.01496-.0046c-.00457-.0026-.0085-.0063-.01148-.0106-.00298-.0044-.00494-.0094-.00574-.0146-.00155-.0254-.00186-.0508-.00186-.0762 0-.24515 0-.49053 0-.73612 0-.18388 0-.36787 0-.55196-.00287-.02176-.00329-.04377-.00124-.06562zm1.01724 1.09277h.53865.05696c.01888 0 .02693-.00805.02786-.02663.00093-.01857 0-.02941 0-.04426 0-.24085 0-.48169 0-.72253 0-.01703 0-.03375 0-.05077.00002-.00528-.00194-.01037-.0055-.01427-.00355-.0039-.00844-.00632-.01369-.00678-.0192 0-.03808 0-.05696 0h-1.10454-.04427c-.00315-.00036-.00635-.00003-.00937.00095-.00301.00098-.00579.00259-.00813.00473-.00235.00214-.00421.00476-.00546.00767-.00125.00292-.00187.00607-.0018.00925v.05696.70364.04427c.00019.00632.00071.01262.00154.01888.00054.00416.00234.00806.00516.01116.00283.0031.00654.00526.01063.00618.01888 0 .03808.00217.05696.00247zm1.6144-.86679h-.53401c-.07615 0-.07089-.00402-.07089.07337v.71571.04427c0 .02384.00774.03096.02941.03096h.25353c.00527.00006.01048-.00111.01521-.00342.00473-.00232.00885-.0057.01204-.00989l.00774-.00991c.08256-.11785.15112-.2449.20431-.3786.03491-.09285.06447-.18763.08854-.28387.00588-.0226.01083-.0452.01764-.06749.00366-.00982.00866-.0191.01486-.02755.00162-.00133.00353-.00225.00558-.00268s.00417-.00036.00618.00021c.00774.00295.01496.00713.02137.01238.05386.04736.10773.09534.16128.14302.03096.02662.06037.05293.08977.08018.01063.01026.02008.02168.02818.03405.00342.00436.00543.00966.00576.01519s-.00103.01103-.00391.01576c-.03387.06352-.07661.12189-.12692.17336-.03634.03538-.07502.06826-.11578.09844-.09345.06928-.19451.12765-.30121.17398-.01733.00774-.03436.0161-.05139.02446-.00136.00132-.00223.00307-.00247.00495 0 .00495.00186.00743.00743.00774s.01671 0 .02507 0h.75473c.01052 0 .02105 0 .03095-.00186.00413-.00058.00797-.00245.01097-.00534s.00501-.00666.00575-.01076c0-.02105.00217-.0421.00217-.06191 0-.23465 0-.4693 0-.70395 0-.01486 0-.02941 0-.04427 0-.0065 0-.01269-.00155-.01889-.00041-.00417-.00218-.00809-.00503-.01117-.00285-.00307-.00663-.00513-.01076-.00585-.01888 0-.03807-.00186-.05696-.00186z"/><path d="m9.7848 12.8222c.01332-.0133.02849-.0278.04304-.043.07181-.0749.14333-.1498.21666-.2241.0115-.0118.0208-.0273.0378-.031.0102.003.0192.0093.0254.018.1187.1238.237.2476.3551.3715.0056.0062.0108.0128.0154.0198.0021.0036.0034.0076.0036.0118.0003.0042-.0004.0083-.0019.0122-.0016.0038-.0041.0073-.0072.01-.0031.0028-.0068.0048-.0109.0059-.0062.0014-.0125.0023-.0189.0028h-.0507-.53403-2.46788c-.32133 0-.64277.0005-.9643.0015-.12909 0-.25787.0019-.38696.0028-.00836 0-.01703 0-.02539 0-.01167.0002-.02325-.0021-.03393-.0068-.01069-.0047-.02023-.0117-.02798-.0204-.03529-.0393-.0712-.078-.10649-.1173-.0009-.0018-.00137-.0037-.00137-.0056s.00047-.0039.00137-.0056c.00095-.0018.00231-.0033.00398-.0045s.00359-.002.00561-.0023c.01025-.0015.0206-.0022.03096-.0022h.29192c.12383 0 .24518.0016.36808.0019h.73584.64081c.01888 0 .03777 0 .05665-.0022.00412-.0007.0079-.0028.01084-.0057.00293-.003.00488-.0069.00557-.011 0-.0087.00155-.017.00186-.0254 0-.1238 0-.2486 0-.3742-.00017-.0105-.00142-.0208-.00372-.031 0-.0034-.00526-.0065-.00867-.0084-.00357-.0021-.0076-.0034-.01176-.0037-.01486 0-.03096 0-.04458 0-.25157.0023-.50315.0047-.75473.0072-.24332.0024-.48633.0058-.72965.0089h-.09504c-.00851.0005-.01703-.0008-.02503-.0038-.00799-.003-.01527-.0076-.0214-.0135-.04056-.0427-.07987-.0873-.11919-.1313-.00035-.0018-.00025-.0038.00029-.0056s.0015-.0035.00281-.0049c.00357-.0023.00782-.0034.01207-.0031h.05696 1.66208c.08544 0 .07987.0065.07987-.0777v-.5736c-.00217-.0216-.00017-.0433.00588-.0641.00849 0 .01698.0006.02538.0019l.36313.0882c.00433 0 .00804.0028.01207.0037.03436.0102.03808.0207.01641.048l-.03529.0446c-.00161.0026-.00306.0052-.00434.008v.0483.4059.0445c0 .0205.01238.0251.0291.026.01672.001.02539 0 .03808 0l1.10361.0019c.06625 0 .05263.0049.09968-.0406.05944-.0572.11826-.1151.17738-.1727.00898-.0084.01889-.0161.03096-.0251.01084.0093.02074.017.02941.026.08565.0877.17117.1757.25667.2638.0045.0044.0089.009.013.0139.0056.0048.0097.0113.0114.0185.0018.0073.0013.0149-.0015.0218-.003.0055-.0075.0102-.0129.0134-.0055.0031-.0118.0047-.0181.0045-.017 0-.0337 0-.0508 0l-.34884.0025-1.28781.0117c-.01671 0-.03374.0019-.05046.0028-.00407.0011-.00776.0032-.01062.0063s-.00476.0069-.00547.0111c-.00108.0083-.0017.0167-.00186.025v.3808.0189c.00025.0053.00238.0104.00601.0143.00362.0039.00851.0064.0138.0071.01239 0 .02508 0 .03777.0018h.13342l1.1355.0028c.02548.0022.05113.0016.07646-.0019z"/><path d="m10.1624 11.4382c0 .0068 0 .0173-.0034.0275-.0169.096-.0571.1864-.117.2632-.0199.0247-.04399.0456-.0712.0619-.01287.0073-.02646.0132-.04055.0176-.0171.0058-.03544.0069-.05309.0031-.01765-.0037-.03396-.0122-.04721-.0244-.02256-.0192-.04081-.0429-.05356-.0697-.00959-.0189-.01764-.0384-.02631-.0576-.03797-.087-.08086-.1719-.12847-.2541-.03249-.0568-.06912-.1111-.10958-.1625-.03991-.052-.08703-.0979-.13993-.1366-.00681-.0049-.01331-.0105-.01981-.0158-.0065-.0052-.00836-.0185-.0034-.0232.0041-.0044.00954-.0073.01547-.0083.01256-.0007.02514.0003.03746.0028.20435.0435.40349.1087.59405.1944.02293.0108.04583.0216.06813.0337.0148.008.0289.0173.0421.0279.0178.0144.0322.0328.0419.0536.0098.0208.0147.0435.0144.0665z"/><path d="m6.52884 11.8564c-.03474 0-.0692-.0061-.10185-.0179-.05603-.0186-.11082-.0406-.16593-.0619-.02512-.0109-.0466-.0287-.06191-.0514-.01313-.0178-.02058-.0392-.02135-.0613s.00516-.0439.01701-.0625c.01012-.0162.02313-.0304.03839-.0418.01362-.0102.02755-.0195.04148-.0294.06718-.0474.13374-.0957.1972-.1483.04368-.0362.08504-.075.12382-.1164.06313-.0654.11482-.141.15293-.2235.00464-.0096.00898-.0192.01393-.0285.00199-.0037.005-.0068.00867-.0089s.00786-.0031.01207-.0029c.00475.0022.0088.0056.0117.0099s.00453.0094.00471.0146v.0189c-.01207.1154-.02291.2309-.03715.3461-.01021.0817-.02414.1628-.03777.2439-.00493.027-.01207.0535-.02136.0793-.00757.0215-.01721.0422-.02879.0619-.01414.0258-.03538.0471-.06121.0613s-.05518.0208-.08459.0188z"/><path d="m8.77719 11.8183c-.01359 0-.02704-.0027-.03954-.008-.0125-.0054-.0238-.0131-.03321-.0229-.02061-.0215-.03597-.0475-.04489-.0759-.00619-.0176-.00991-.0365-.01486-.0548-.02659-.1042-.06042-.2065-.10123-.3061-.0195-.0469-.04204-.0924-.06749-.1362-.02726-.0477-.06067-.0917-.09937-.1307-.00743-.0074-.01398-.0158-.01951-.0247-.00151-.0038-.00151-.008 0-.0118.00118-.0029.00314-.0054.00565-.0073.00251-.0018.00548-.0029.00859-.0032.01082-.0005.02155.0021.03096.0074.13998.0538.27557.1184.40554.1932.05665.0331.11176.0684.16501.1065.01937.0129.03687.0284.052.0461.01496.0165.0256.0364.031.058.00541.0216.00539.0442-.00004.0658-.00271.0124-.00622.0246-.01052.0365-.0316.0787-.07999.1495-.14179.2074-.02664.0243-.05838.0423-.09287.0527-.01098.0033-.02214.006-.03343.008z"/><path d="m7.56893 11.8338c-.01297-.0002-.02575-.0032-.03742-.0088-.01166-.0057-.02193-.0139-.03006-.024-.01559-.0174-.02731-.0378-.03436-.0601-.00634-.0203-.01161-.041-.01579-.0619-.02196-.105-.05092-.2084-.08668-.3095-.01697-.0478-.03692-.0944-.05975-.1397-.02626-.053-.05981-.102-.09968-.1458-.0061-.0058-.01132-.0124-.01548-.0198-.00121-.0028-.00184-.0058-.00184-.0088s.00063-.006.00184-.0088c.00185-.0025.00417-.0045.00683-.0061.00266-.0015.0056-.0025.00865-.0029.0063-.0001.01251.0015.01796.0046.19823.0843.38537.1925.55722.3223.01674.0129.03266.0269.04767.0418.01878.0188.0319.0425.03787.0684.00596.0259.00453.0529-.00413.078-.00208.0082-.00488.0162-.00835.0239-.03509.0797-.08805.1504-.15479.2064-.02157.0169-.04544.0307-.07089.0409-.0188.007-.03876.0103-.05882.0099z"/><path d="m7.43301 9.75413c-.01598.00163-.0321-.0009-.04681-.00736-.0147-.00645-.02748-.01661-.03708-.02948-.01864-.02588-.03123-.0556-.03684-.08699-.01649-.08282-.03715-.16476-.06192-.24549-.01723-.0545-.03791-.10786-.06191-.15974-.02747-.06198-.06456-.11924-.1099-.16964-.00517-.00655-.00983-.01348-.01393-.02074-.00074-.00302-.00048-.00619.00075-.00904s.00336-.00522.00606-.00675c.0038-.00173.0079-.00268.01207-.00279.0083.00128.01641.00357.02415.00681.17685.07642.34421.17314.49872.28821.02291.01553.04371.03395.06191.0548.01255.0144.02159.0315.02642.04998.00483.01847.00533.03781.00145.05651-.00242.01464-.00647.02897-.01208.04272-.03176.07417-.08042.1399-.14209.19193-.01827.01444-.03836.02641-.05975.0356-.01563.0066-.03228.01048-.04922.01146z"/></g></svg>
diff --git a/app/controllers/projects/integrations/shimos_controller.rb b/app/controllers/projects/integrations/shimos_controller.rb
deleted file mode 100644
index 6c8313d08055c..0000000000000
--- a/app/controllers/projects/integrations/shimos_controller.rb
+++ /dev/null
@@ -1,19 +0,0 @@
-# frozen_string_literal: true
-
-module Projects
- module Integrations
- class ShimosController < Projects::ApplicationController
- feature_category :integrations
-
- before_action :ensure_renderable
-
- def show; end
-
- private
-
- def ensure_renderable
- render_404 unless project.has_shimo? && project.shimo_integration&.render?
- end
- end
- end
-end
diff --git a/app/models/integration.rb b/app/models/integration.rb
index 7c14c1b1716c5..2c5731deb58d6 100644
--- a/app/models/integration.rb
+++ b/app/models/integration.rb
@@ -25,10 +25,9 @@ class Integration < ApplicationRecord
unify_circuit webex_teams youtrack zentao
].freeze
- # TODO Shimo is temporary disabled on group and instance-levels.
# See: https://gitlab.com/gitlab-org/gitlab/-/issues/345677
PROJECT_SPECIFIC_INTEGRATION_NAMES = %w[
- apple_app_store gitlab_slack_application google_play jenkins shimo
+ apple_app_store gitlab_slack_application google_play jenkins
].freeze
# Fake integrations to help with local development.
diff --git a/app/models/integrations/shimo.rb b/app/models/integrations/shimo.rb
deleted file mode 100644
index 1d0043564691d..0000000000000
--- a/app/models/integrations/shimo.rb
+++ /dev/null
@@ -1,39 +0,0 @@
-# frozen_string_literal: true
-
-module Integrations
- class Shimo < BaseThirdPartyWiki
- validates :external_wiki_url, presence: true, public_url: true, if: :activated?
-
- field :external_wiki_url,
- title: -> { s_('Shimo|Shimo Workspace URL') },
- required: true
-
- def avatar_url
- ActionController::Base.helpers.image_path('logos/shimo.svg')
- end
-
- def render?
- valid? && activated?
- end
-
- def self.title
- s_('Shimo|Shimo')
- end
-
- def self.description
- s_('Shimo|Link to a Shimo Workspace from the sidebar.')
- end
-
- def self.to_param
- 'shimo'
- end
-
- # support for `test` method
- def execute(_data)
- response = Gitlab::HTTP.get(properties['external_wiki_url'], verify: true)
- response.body if response.code == 200
- rescue StandardError
- nil
- end
- end
-end
diff --git a/app/models/project.rb b/app/models/project.rb
index 7ff3270656604..9607a3067d8ab 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -232,7 +232,6 @@ def self.integration_association_name(name)
has_one :pumble_integration, class_name: 'Integrations::Pumble'
has_one :pushover_integration, class_name: 'Integrations::Pushover'
has_one :redmine_integration, class_name: 'Integrations::Redmine'
- has_one :shimo_integration, class_name: 'Integrations::Shimo'
has_one :slack_integration, class_name: 'Integrations::Slack'
has_one :slack_slash_commands_integration, class_name: 'Integrations::SlackSlashCommands'
has_one :squash_tm_integration, class_name: 'Integrations::SquashTm'
@@ -541,7 +540,6 @@ def self.integration_association_name(name)
delegate :allow_merge_on_skipped_pipeline, :allow_merge_on_skipped_pipeline?, :allow_merge_on_skipped_pipeline=
delegate :allow_merge_without_pipeline, :allow_merge_without_pipeline?, :allow_merge_without_pipeline=
delegate :has_confluence?
- delegate :has_shimo?
delegate :show_diff_preview_in_email, :show_diff_preview_in_email=, :show_diff_preview_in_email?
delegate :runner_registration_enabled, :runner_registration_enabled=, :runner_registration_enabled?
delegate :emails_enabled, :emails_enabled=, :emails_enabled?
@@ -1734,7 +1732,7 @@ def find_or_initialize_integrations
def disabled_integrations
return [] if Rails.env.development?
- names = %w[shimo zentao]
+ names = %w[zentao]
# The Slack Slash Commands integration is only available for customers who cannot use the GitLab for Slack app.
# The GitLab for Slack app integration is only available when enabled through settings.
diff --git a/app/views/projects/integrations/shimos/show.html.haml b/app/views/projects/integrations/shimos/show.html.haml
deleted file mode 100644
index 165e414f75bae..0000000000000
--- a/app/views/projects/integrations/shimos/show.html.haml
+++ /dev/null
@@ -1,10 +0,0 @@
-- breadcrumb_title s_('Shimo|Shimo Workspace')
-- page_title s_('Shimo|Shimo Workspace')
-- add_page_specific_style 'page_bundles/wiki'
-= render layout: 'shared/empty_states/wikis_layout', locals: { image_path: 'illustrations/empty-state/empty-wiki-md.svg' } do
- %h4
- = s_('Shimo|Shimo Workspace integration is enabled')
- %p
- = s_("Shimo|You've enabled the Shimo Workspace integration. You can view your wiki directly in Shimo.")
- = link_button_to @project.shimo_integration.external_wiki_url, target: '_blank', rel: 'noopener noreferrer', title: s_('Shimo|Go to Shimo Workspace'), variant: :confirm do
- = s_('Shimo|Go to Shimo Workspace')
diff --git a/config/metrics/counts_all/20211028210001_projects_shimo_active.yml b/config/metrics/counts_all/20211028210001_projects_shimo_active.yml
index 1deb27f14b1e3..fdb10ac57f950 100644
--- a/config/metrics/counts_all/20211028210001_projects_shimo_active.yml
+++ b/config/metrics/counts_all/20211028210001_projects_shimo_active.yml
@@ -5,7 +5,9 @@ product_section: dev
product_stage: manage
product_group: integrations
value_type: number
-status: active
+status: removed
+removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/136143
+milestone_removed: '16.7'
milestone: "14.5"
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/issues/343386
time_frame: all
diff --git a/config/metrics/counts_all/20211028210002_groups_shimo_active.yml b/config/metrics/counts_all/20211028210002_groups_shimo_active.yml
index efac7bb2ed779..95e2e7bbe922b 100644
--- a/config/metrics/counts_all/20211028210002_groups_shimo_active.yml
+++ b/config/metrics/counts_all/20211028210002_groups_shimo_active.yml
@@ -5,7 +5,9 @@ product_section: dev
product_stage: manage
product_group: integrations
value_type: number
-status: active
+status: removed
+removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/136143
+milestone_removed: '16.7'
milestone: "14.5"
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/issues/343386
time_frame: all
diff --git a/config/metrics/counts_all/20211028210003_instances_shimo_active.yml b/config/metrics/counts_all/20211028210003_instances_shimo_active.yml
index ad5e6b7beb232..fa31fb0a9fcca 100644
--- a/config/metrics/counts_all/20211028210003_instances_shimo_active.yml
+++ b/config/metrics/counts_all/20211028210003_instances_shimo_active.yml
@@ -5,7 +5,9 @@ product_section: dev
product_stage: manage
product_group: integrations
value_type: number
-status: active
+status: removed
+removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/136143
+milestone_removed: '16.7'
milestone: "14.5"
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/issues/343386
time_frame: all
diff --git a/config/metrics/counts_all/20211028210004_projects_inheriting_shimo_active.yml b/config/metrics/counts_all/20211028210004_projects_inheriting_shimo_active.yml
index a2fc5f528fb20..e247ccacc0adb 100644
--- a/config/metrics/counts_all/20211028210004_projects_inheriting_shimo_active.yml
+++ b/config/metrics/counts_all/20211028210004_projects_inheriting_shimo_active.yml
@@ -5,7 +5,9 @@ product_section: dev
product_stage: manage
product_group: integrations
value_type: number
-status: active
+status: removed
+removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/136143
+milestone_removed: '16.7'
milestone: "14.5"
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/issues/343386
time_frame: all
diff --git a/config/metrics/counts_all/20211028210005_groups_inheriting_shimo_active.yml b/config/metrics/counts_all/20211028210005_groups_inheriting_shimo_active.yml
index 5be37a39f47a7..e973871ed22d2 100644
--- a/config/metrics/counts_all/20211028210005_groups_inheriting_shimo_active.yml
+++ b/config/metrics/counts_all/20211028210005_groups_inheriting_shimo_active.yml
@@ -5,7 +5,9 @@ product_section: dev
product_stage: manage
product_group: integrations
value_type: number
-status: active
+status: removed
+removed_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/136143
+milestone_removed: '16.7'
milestone: "14.5"
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/issues/343386
time_frame: all
diff --git a/config/routes/project.rb b/config/routes/project.rb
index 947ed6b541349..9016a683404f3 100644
--- a/config/routes/project.rb
+++ b/config/routes/project.rb
@@ -437,10 +437,6 @@
end
end
- namespace :integrations do
- resource :shimo, only: [:show]
- end
-
get :planning_hierarchy
resources :badges, only: [] do
diff --git a/data/deprecations/15-7-deprecate-shimo-integration.yml b/data/deprecations/15-7-deprecate-shimo-integration.yml
index f9437a9f44efb..0a9d2dc482510 100644
--- a/data/deprecations/15-7-deprecate-shimo-integration.yml
+++ b/data/deprecations/15-7-deprecate-shimo-integration.yml
@@ -1,6 +1,6 @@
- title: "Shimo integration" # (required) Clearly explain the change, or planned change. For example, "The `confidential` field for a `Note` is deprecated" or "The maximum number of characters in a job name will be limited to 250."
announcement_milestone: "15.7" # (required) The milestone when this feature was first announced as deprecated.
- removal_milestone: "16.0" # (required) The milestone when this feature is planned to be removed
+ removal_milestone: "16.7" # (required) The milestone when this feature is planned to be removed
breaking_change: true # (required) If this deprecation is a breaking change, set this value to true
reporter: arturoherrero # (required) GitLab username of the person reporting the deprecation
stage: Manage # (required) String value of the stage that the feature was created in. e.g., Growth
@@ -19,6 +19,5 @@
# OTHER OPTIONAL FIELDS
#
tiers: [Core, Premium, Ultimate] # (optional - may be required in the future) An array of tiers that the feature is available in currently. e.g., [Free, Silver, Gold, Core, Premium, Ultimate]
- documentation_url: https://docs.gitlab.com/ee/user/project/integrations/shimo.html # (optional) This is a link to the current documentation page
image_url: # (optional) This is a link to a thumbnail image depicting the feature
video_url: # (optional) Use the youtube thumbnail URL with the structure of https://img.youtube.com/vi/UNIQUEID/hqdefault.jpg
diff --git a/db/docs/integrations.yml b/db/docs/integrations.yml
index d0246caaf127d..c087d49968a02 100644
--- a/db/docs/integrations.yml
+++ b/db/docs/integrations.yml
@@ -45,7 +45,6 @@ classes:
- Integrations::Pumble
- Integrations::Pushover
- Integrations::Redmine
-- Integrations::Shimo
- Integrations::Slack
- Integrations::SlackSlashCommands
- Integrations::SquashTm
diff --git a/doc/.vale/gitlab/spelling-exceptions.txt b/doc/.vale/gitlab/spelling-exceptions.txt
index 575dc713b51bc..f1d95dbd5f051 100644
--- a/doc/.vale/gitlab/spelling-exceptions.txt
+++ b/doc/.vale/gitlab/spelling-exceptions.txt
@@ -883,7 +883,6 @@ sharded
sharding
SHAs
shfmt
-Shimo
Shippo
Shopify
Sidekiq
diff --git a/doc/api/graphql/reference/index.md b/doc/api/graphql/reference/index.md
index ad97272efff2c..e65829a867621 100644
--- a/doc/api/graphql/reference/index.md
+++ b/doc/api/graphql/reference/index.md
@@ -30281,7 +30281,6 @@ State of a Sentry error.
| <a id="servicetypepumble_service"></a>`PUMBLE_SERVICE` | PumbleService type. |
| <a id="servicetypepushover_service"></a>`PUSHOVER_SERVICE` | PushoverService type. |
| <a id="servicetyperedmine_service"></a>`REDMINE_SERVICE` | RedmineService type. |
-| <a id="servicetypeshimo_service"></a>`SHIMO_SERVICE` | ShimoService type. |
| <a id="servicetypeslack_service"></a>`SLACK_SERVICE` | SlackService type. |
| <a id="servicetypeslack_slash_commands_service"></a>`SLACK_SLASH_COMMANDS_SERVICE` | SlackSlashCommandsService type. |
| <a id="servicetypesquash_tm_service"></a>`SQUASH_TM_SERVICE` | SquashTmService type. |
diff --git a/doc/development/integrations/index.md b/doc/development/integrations/index.md
index a2edb2aa1fb14..7538a5a0147d6 100644
--- a/doc/development/integrations/index.md
+++ b/doc/development/integrations/index.md
@@ -353,6 +353,5 @@ You can refer to these issues for examples of adding new integrations:
- [Datadog](https://gitlab.com/gitlab-org/gitlab/-/issues/270123): Metrics collector, similar to the Prometheus integration.
- [EWM/RTC](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/36662): External issue tracker.
-- [Shimo](https://gitlab.com/gitlab-org/gitlab/-/issues/343386): External wiki, similar to the Confluence and External Wiki integrations.
- [Webex Teams](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/31543): Chat notifications.
- [ZenTao](https://gitlab.com/gitlab-org/gitlab/-/issues/338178): External issue tracker with custom issue views, similar to the Jira integration.
diff --git a/doc/update/deprecations.md b/doc/update/deprecations.md
index 6431b8a70124d..a46a488bb35ad 100644
--- a/doc/update/deprecations.md
+++ b/doc/update/deprecations.md
@@ -1328,6 +1328,21 @@ To prepare for GitLab 15.8 and later, you should:
<div class="deprecation breaking-change" data-milestone="16.7">
+### Shimo integration
+
+<div class="deprecation-notes">
+- Announced in GitLab <span class="milestone">15.7</span>
+- Removal in GitLab <span class="milestone">16.7</span> ([breaking change](https://docs.gitlab.com/ee/update/terminology.html#breaking-change))
+- To discuss this change or learn more, see the [deprecation issue](https://gitlab.com/gitlab-org/gitlab/-/issues/377824).
+</div>
+
+The [Shimo Workspace integration](https://docs.gitlab.com/ee/user/project/integrations/shimo.html) has been deprecated
+and will be moved to the JiHu GitLab codebase.
+
+</div>
+
+<div class="deprecation breaking-change" data-milestone="16.7">
+
### `user_email_lookup_limit` API field
<div class="deprecation-notes">
@@ -2637,21 +2652,6 @@ For more information, refer to [security report validation](https://docs.gitlab.
<div class="deprecation breaking-change" data-milestone="16.0">
-### Shimo integration
-
-<div class="deprecation-notes">
-- Announced in GitLab <span class="milestone">15.7</span>
-- Removal in GitLab <span class="milestone">16.0</span> ([breaking change](https://docs.gitlab.com/ee/update/terminology.html#breaking-change))
-- To discuss this change or learn more, see the [deprecation issue](https://gitlab.com/gitlab-org/gitlab/-/issues/377824).
-</div>
-
-The [Shimo Workspace integration](https://docs.gitlab.com/ee/user/project/integrations/shimo.html) has been deprecated
-and will be moved to the JiHu GitLab codebase.
-
-</div>
-
-<div class="deprecation breaking-change" data-milestone="16.0">
-
### Starboard directive in the config for the GitLab Agent for Kubernetes
<div class="deprecation-notes">
diff --git a/doc/user/project/integrations/shimo.md b/doc/user/project/integrations/shimo.md
index 6ea0cfa6ffff4..0bf54d311f4b0 100644
--- a/doc/user/project/integrations/shimo.md
+++ b/doc/user/project/integrations/shimo.md
@@ -2,37 +2,11 @@
stage: Manage
group: Import and Integrate
info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
+remove_date: '2024-02-13'
+redirect_to: 'index.md'
---
-# Shimo (deprecated) **(FREE ALL)**
+# Shimo (removed) **(FREE ALL)**
-> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/343386) in GitLab 14.5 [with a flag](../../../administration/feature_flags.md) named `shimo_integration`. Disabled by default.
-> - [Generally available](https://gitlab.com/gitlab-org/gitlab/-/issues/345356) in GitLab 15.4. Feature flag `shimo_integration` removed.
-
-WARNING:
-This feature was [deprecated](https://gitlab.com/gitlab-org/gitlab/-/issues/377824) in GitLab 15.7.
-This change is a breaking change.
-
-[Shimo](https://shimo.im/) is a productivity suite that includes documents, spreadsheets, and slideshows in one interface.
-With this integration, you can use the Shimo wiki directly in GitLab instead of the [GitLab group or project wiki](../wiki/index.md).
-
-## Configure settings in GitLab
-
-To enable the Shimo integration for your project:
-
-1. On the left sidebar, select **Search or go to** and find your project.
-1. Select **Settings > Integrations**.
-1. Select **Shimo**.
-1. Under **Enable integration**, ensure the **Active** checkbox is selected.
-1. Provide the **Shimo Workspace URL** you want to link to your group or project (for example, `https://shimo.im/space/aBAYV6VvajUP873j`).
-1. Select **Save changes**.
-
-On the left sidebar, **Shimo** now appears instead of **Wiki**.
-
-## View the Shimo Workspace
-
-To view the Shimo Workspace from your group or project:
-
-1. On the left sidebar, select **Search or go to** and find your project.
-1. Select **Shimo**.
-1. On the **Shimo Workspace** page, select **Go to Shimo Workspace**.
+This feature was [deprecated](https://gitlab.com/gitlab-org/gitlab/-/issues/377824) in GitLab 15.7
+and [removed](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/136143) in 16.7.
diff --git a/lib/api/helpers/integrations_helpers.rb b/lib/api/helpers/integrations_helpers.rb
index a08337a86ac17..85d137abd5018 100644
--- a/lib/api/helpers/integrations_helpers.rb
+++ b/lib/api/helpers/integrations_helpers.rb
@@ -620,14 +620,6 @@ def self.integrations
desc: 'The Mattermost token'
}
],
- 'shimo' => [
- {
- required: true,
- name: :external_wiki_url,
- type: String,
- desc: 'Shimo workspace URL'
- }
- ],
'slack-slash-commands' => [
{
required: true,
@@ -995,7 +987,6 @@ def self.integration_classes
::Integrations::Pumble,
::Integrations::Pushover,
::Integrations::Redmine,
- ::Integrations::Shimo,
::Integrations::Slack,
::Integrations::SlackSlashCommands,
::Integrations::SquashTm,
diff --git a/lib/sidebars/projects/menus/shimo_menu.rb b/lib/sidebars/projects/menus/shimo_menu.rb
deleted file mode 100644
index c93c4f6a0a469..0000000000000
--- a/lib/sidebars/projects/menus/shimo_menu.rb
+++ /dev/null
@@ -1,41 +0,0 @@
-# frozen_string_literal: true
-
-module Sidebars
- module Projects
- module Menus
- class ShimoMenu < ::Sidebars::Menu
- override :link
- def link
- project_integrations_shimo_path(context.project)
- end
-
- override :title
- def title
- s_('Shimo|Shimo')
- end
-
- override :image_path
- def image_path
- 'logos/shimo.svg'
- end
-
- override :image_html_options
- def image_html_options
- {
- size: 16
- }
- end
-
- override :render?
- def render?
- context.project.has_shimo?
- end
-
- override :active_routes
- def active_routes
- { controller: :shimo }
- end
- end
- end
- end
-end
diff --git a/lib/sidebars/projects/panel.rb b/lib/sidebars/projects/panel.rb
index 5d8bc18ac8861..738a3fba9c6d6 100644
--- a/lib/sidebars/projects/panel.rb
+++ b/lib/sidebars/projects/panel.rb
@@ -42,9 +42,9 @@ def add_wiki_menus
end
def third_party_wiki_menu
- wiki_menu_list = [::Sidebars::Projects::Menus::ConfluenceMenu, ::Sidebars::Projects::Menus::ShimoMenu]
+ return unless ::Sidebars::Projects::Menus::ConfluenceMenu.new(context).render?
- wiki_menu_list.find { |wiki_menu| wiki_menu.new(context).render? }
+ ::Sidebars::Projects::Menus::ConfluenceMenu
end
end
end
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index e39cf624d939c..862d93c62929a 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -44999,27 +44999,6 @@ msgstr ""
msgid "ShellOperations|Maximum number of Git operations per minute"
msgstr ""
-msgid "Shimo|Go to Shimo Workspace"
-msgstr ""
-
-msgid "Shimo|Link to a Shimo Workspace from the sidebar."
-msgstr ""
-
-msgid "Shimo|Shimo"
-msgstr ""
-
-msgid "Shimo|Shimo Workspace"
-msgstr ""
-
-msgid "Shimo|Shimo Workspace URL"
-msgstr ""
-
-msgid "Shimo|Shimo Workspace integration is enabled"
-msgstr ""
-
-msgid "Shimo|You've enabled the Shimo Workspace integration. You can view your wiki directly in Shimo."
-msgstr ""
-
msgid "Short name"
msgstr ""
diff --git a/spec/factories/integrations.rb b/spec/factories/integrations.rb
index 68751e68f0527..74dfea585f26d 100644
--- a/spec/factories/integrations.rb
+++ b/spec/factories/integrations.rb
@@ -168,12 +168,6 @@
end
end
- factory :shimo_integration, class: 'Integrations::Shimo' do
- project
- active { true }
- external_wiki_url { 'https://shimo.example.com/desktop' }
- end
-
factory :confluence_integration, class: 'Integrations::Confluence' do
project
active { true }
diff --git a/spec/features/integrations_settings_spec.rb b/spec/features/integrations_settings_spec.rb
index 70ce2f551612d..f460e05151636 100644
--- a/spec/features/integrations_settings_spec.rb
+++ b/spec/features/integrations_settings_spec.rb
@@ -11,19 +11,17 @@
sign_in(user)
end
- context 'with Shimo Zentao integration records' do
+ context 'with Zentao integration records' do
before do
- create(:integration, project: project, type_new: 'Integrations::Shimo', category: 'issue_tracker')
create(:integration, project: project, type_new: 'Integrations::Zentao', category: 'issue_tracker')
end
- it 'shows settings without Shimo Zentao', :js do
+ it 'shows settings without Zentao', :js do
visit namespace_project_settings_integrations_path(namespace_id: project.namespace.full_path,
project_id: project.path)
expect(page).to have_content('Add an integration')
expect(page).not_to have_content('ZenTao')
- expect(page).not_to have_content('Shimo')
end
end
end
diff --git a/spec/graphql/types/projects/service_type_enum_spec.rb b/spec/graphql/types/projects/service_type_enum_spec.rb
index a5b1ba24a44a9..40376afc7f78f 100644
--- a/spec/graphql/types/projects/service_type_enum_spec.rb
+++ b/spec/graphql/types/projects/service_type_enum_spec.rb
@@ -38,7 +38,6 @@ def core_service_enums
PUMBLE_SERVICE
PUSHOVER_SERVICE
REDMINE_SERVICE
- SHIMO_SERVICE
SLACK_SERVICE
SLACK_SLASH_COMMANDS_SERVICE
TEAMCITY_SERVICE
diff --git a/spec/lib/gitlab/import_export/all_models.yml b/spec/lib/gitlab/import_export/all_models.yml
index 722b47ac9b8ad..d210b30424228 100644
--- a/spec/lib/gitlab/import_export/all_models.yml
+++ b/spec/lib/gitlab/import_export/all_models.yml
@@ -570,7 +570,6 @@ project:
- google_play_integration
- pipelines_email_integration
- mattermost_slash_commands_integration
-- shimo_integration
- slack_slash_commands_integration
- harbor_integration
- irker_integration
diff --git a/spec/lib/gitlab/import_export/safe_model_attributes.yml b/spec/lib/gitlab/import_export/safe_model_attributes.yml
index b6328994c5be8..e0efa1bfd38ac 100644
--- a/spec/lib/gitlab/import_export/safe_model_attributes.yml
+++ b/spec/lib/gitlab/import_export/safe_model_attributes.yml
@@ -820,7 +820,6 @@ ProjectSetting:
- allow_merge_on_skipped_pipeline
- only_allow_merge_if_all_status_checks_passed
- has_confluence
-- has_shimo
- has_vulnerabilities
ProtectedEnvironment:
- id
diff --git a/spec/lib/sidebars/projects/menus/shimo_menu_spec.rb b/spec/lib/sidebars/projects/menus/shimo_menu_spec.rb
deleted file mode 100644
index e74647894faea..0000000000000
--- a/spec/lib/sidebars/projects/menus/shimo_menu_spec.rb
+++ /dev/null
@@ -1,44 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-RSpec.describe Sidebars::Projects::Menus::ShimoMenu do
- let_it_be_with_reload(:project) { create(:project) }
-
- let(:context) { Sidebars::Projects::Context.new(current_user: project.first_owner, container: project) }
-
- subject(:shimo_menu) { described_class.new(context) }
-
- describe '#render?' do
- context 'without a valid Shimo integration' do
- it "doesn't render the menu" do
- expect(shimo_menu.render?).to be_falsey
- end
- end
-
- context 'with a valid Shimo integration' do
- let_it_be_with_reload(:shimo_integration) { create(:shimo_integration, project: project) }
-
- context 'when integration is active' do
- it 'renders the menu' do
- expect(shimo_menu.render?).to eq true
- end
-
- it 'renders menu link' do
- expected_url = Rails.application.routes.url_helpers.project_integrations_shimo_path(project)
- expect(shimo_menu.link).to eq expected_url
- end
- end
-
- context 'when integration is inactive' do
- before do
- shimo_integration.update!(active: false)
- end
-
- it "doesn't render the menu" do
- expect(shimo_menu.render?).to eq false
- end
- end
- end
- end
-end
diff --git a/spec/lib/sidebars/projects/panel_spec.rb b/spec/lib/sidebars/projects/panel_spec.rb
index ec1df438cf1d0..b6ff1acc176d0 100644
--- a/spec/lib/sidebars/projects/panel_spec.rb
+++ b/spec/lib/sidebars/projects/panel_spec.rb
@@ -30,28 +30,6 @@
expect(subject.index { |i| i.is_a?(Sidebars::Projects::Menus::WikiMenu) }).to be_nil
end
end
-
- context 'shimo only' do
- let_it_be(:shimo) { create(:shimo_integration, active: true) }
-
- let(:project) { shimo.project }
-
- it 'contains Shimo menu item' do
- expect(subject.index { |i| i.is_a?(Sidebars::Projects::Menus::ShimoMenu) }).not_to be_nil
- end
- end
-
- context 'confluence & shimo' do
- let_it_be(:confluence) { create(:confluence_integration, active: true) }
- let_it_be(:shimo) { create(:shimo_integration, active: true) }
-
- let(:project) { confluence.project }
-
- it 'contains Confluence menu item, not Shimo' do
- expect(subject.index { |i| i.is_a?(Sidebars::Projects::Menus::ConfluenceMenu) }).not_to be_nil
- expect(subject.index { |i| i.is_a?(Sidebars::Projects::Menus::ShimoMenu) }).to be_nil
- end
- end
end
context 'when integration is not present' do
diff --git a/spec/models/integration_spec.rb b/spec/models/integration_spec.rb
index 5af6a592c661b..3a96de4efe275 100644
--- a/spec/models/integration_spec.rb
+++ b/spec/models/integration_spec.rb
@@ -81,10 +81,9 @@
let!(:integration1) { create(:jira_integration, project: project) }
let!(:integration2) { create(:redmine_integration, project: project) }
let!(:integration3) { create(:confluence_integration, project: project) }
- let!(:integration4) { create(:shimo_integration, project: project) }
it 'returns the right group integration' do
- expect(described_class.third_party_wikis).to contain_exactly(integration3, integration4)
+ expect(described_class.third_party_wikis).to contain_exactly(integration3)
end
end
diff --git a/spec/models/integrations/base_third_party_wiki_spec.rb b/spec/models/integrations/base_third_party_wiki_spec.rb
deleted file mode 100644
index 763f7131b9464..0000000000000
--- a/spec/models/integrations/base_third_party_wiki_spec.rb
+++ /dev/null
@@ -1,46 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-RSpec.describe Integrations::BaseThirdPartyWiki, feature_category: :integrations do
- describe 'default values' do
- it { expect(subject.category).to eq(:third_party_wiki) }
- end
-
- describe 'Validations' do
- let_it_be_with_reload(:project) { create(:project) }
-
- describe 'only one third party wiki per project' do
- subject(:integration) { build(:shimo_integration, project: project, active: true) }
-
- before_all do
- create(:confluence_integration, project: project, active: true)
- end
-
- context 'when integration is changed manually by user' do
- it 'executes the validation' do
- valid = integration.valid?(:manual_change)
-
- expect(valid).to be_falsey
- error_message = 'Another third-party wiki is already in use. '\
- 'Only one third-party wiki integration can be active at a time'
- expect(integration.errors[:base]).to include _(error_message)
- end
- end
-
- context 'when integration is changed internally' do
- it 'does not execute the validation' do
- expect(integration.valid?).to be_truthy
- end
- end
-
- context 'when integration is not on the project level' do
- subject(:integration) { build(:shimo_integration, :instance, active: true) }
-
- it 'executes the validation' do
- expect(integration.valid?(:manual_change)).to be_truthy
- end
- end
- end
- end
-end
diff --git a/spec/models/integrations/shimo_spec.rb b/spec/models/integrations/shimo_spec.rb
deleted file mode 100644
index 95289343d0dc1..0000000000000
--- a/spec/models/integrations/shimo_spec.rb
+++ /dev/null
@@ -1,69 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-RSpec.describe ::Integrations::Shimo, feature_category: :integrations do
- describe '#fields' do
- let(:shimo_integration) { build(:shimo_integration) }
-
- it 'returns custom fields' do
- expect(shimo_integration.fields.pluck(:name)).to eq(%w[external_wiki_url])
- end
- end
-
- describe '#create' do
- let_it_be(:project) { create(:project, :repository) }
- let(:external_wiki_url) { 'https://shimo.example.com/desktop' }
- let(:params) { { active: true, project: project, external_wiki_url: external_wiki_url } }
-
- context 'with valid params' do
- it 'creates the Shimo integration' do
- shimo = described_class.create!(params)
-
- expect(shimo.valid?).to be true
- expect(shimo.render?).to be true
- expect(shimo.external_wiki_url).to eq(external_wiki_url)
- end
- end
-
- context 'with invalid params' do
- it 'cannot create the Shimo integration without external_wiki_url' do
- params['external_wiki_url'] = nil
- expect { described_class.create!(params) }.to raise_error(ActiveRecord::RecordInvalid)
- end
-
- it 'cannot create the Shimo integration with invalid external_wiki_url' do
- params['external_wiki_url'] = 'Fake Invalid URL'
- expect { described_class.create!(params) }.to raise_error(ActiveRecord::RecordInvalid)
- end
- end
- end
-
- describe 'Caching has_shimo on project_settings' do
- let_it_be(:project) { create(:project) }
-
- subject { project.project_setting.has_shimo? }
-
- it 'sets the property to true when integration is active' do
- create(:shimo_integration, project: project, active: true)
-
- is_expected.to be(true)
- end
-
- it 'sets the property to false when integration is not active' do
- create(:shimo_integration, project: project, active: false)
-
- is_expected.to be(false)
- end
-
- it 'creates a project_setting record if one was not already created' do
- expect { create(:shimo_integration) }.to change(ProjectSetting, :count).by(1)
- end
- end
-
- describe '#avatar_url' do
- it 'returns the avatar image path' do
- expect(subject.avatar_url).to eq(ActionController::Base.helpers.image_path('logos/shimo.svg'))
- end
- end
-end
diff --git a/spec/requests/api/integrations_spec.rb b/spec/requests/api/integrations_spec.rb
index d8ac9d5abf73f..4696be0704516 100644
--- a/spec/requests/api/integrations_spec.rb
+++ b/spec/requests/api/integrations_spec.rb
@@ -46,10 +46,9 @@
where(:integration) do
# The Project Integrations API supports all integrations except:
# - The GitLab Slack Application integration, as it must be installed via the UI.
- # - Shimo and ZenTao integrations, as new integrations are blocked from being created.
+ # - ZenTao integration, as new integration is blocked from being created.
unavailable_integration_names = [
Integrations::GitlabSlackApplication.to_param,
- Integrations::Shimo.to_param,
Integrations::Zentao.to_param
]
diff --git a/spec/requests/projects/integrations/shimos_controller_spec.rb b/spec/requests/projects/integrations/shimos_controller_spec.rb
deleted file mode 100644
index bd7af0bb4ac11..0000000000000
--- a/spec/requests/projects/integrations/shimos_controller_spec.rb
+++ /dev/null
@@ -1,37 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-RSpec.describe ::Projects::Integrations::ShimosController, feature_category: :integrations do
- let_it_be(:project) { create(:project) }
- let_it_be(:user) { create(:user, developer_projects: [project]) }
- let_it_be(:shimo_integration) { create(:shimo_integration, project: project) }
-
- before do
- sign_in(user)
- end
-
- describe 'GET #show' do
- context 'when Shimo integration is inactive' do
- before do
- shimo_integration.update!(active: false)
- end
-
- it 'returns 404 status' do
- get project_integrations_shimo_path(project)
-
- expect(response).to have_gitlab_http_status(:not_found)
- end
- end
-
- context 'when Shimo integration is active' do
- it 'renders the "show" template' do
- get project_integrations_shimo_path(project)
-
- expect(response).to have_gitlab_http_status(:ok)
- expect(response).to render_template(:show)
- expect(response.body).to include shimo_integration.external_wiki_url
- end
- end
- end
-end
diff --git a/spec/support/rspec_order_todo.yml b/spec/support/rspec_order_todo.yml
index fc6823352cd7d..19e8a037d5eda 100644
--- a/spec/support/rspec_order_todo.yml
+++ b/spec/support/rspec_order_todo.yml
@@ -6978,7 +6978,6 @@
- './spec/lib/sidebars/projects/menus/scope_menu_spec.rb'
- './spec/lib/sidebars/projects/menus/security_compliance_menu_spec.rb'
- './spec/lib/sidebars/projects/menus/settings_menu_spec.rb'
-- './spec/lib/sidebars/projects/menus/shimo_menu_spec.rb'
- './spec/lib/sidebars/projects/menus/snippets_menu_spec.rb'
- './spec/lib/sidebars/projects/menus/wiki_menu_spec.rb'
- './spec/lib/sidebars/projects/menus/zentao_menu_spec.rb'
@@ -7383,7 +7382,6 @@
- './spec/models/integrations/pumble_spec.rb'
- './spec/models/integrations/pushover_spec.rb'
- './spec/models/integrations/redmine_spec.rb'
-- './spec/models/integrations/shimo_spec.rb'
- './spec/models/integrations/slack_slash_commands_spec.rb'
- './spec/models/integrations/slack_spec.rb'
- './spec/models/integrations/teamcity_spec.rb'
@@ -8251,7 +8249,6 @@
- './spec/requests/projects/harbor/artifacts_controller_spec.rb'
- './spec/requests/projects/harbor/repositories_controller_spec.rb'
- './spec/requests/projects/harbor/tags_controller_spec.rb'
-- './spec/requests/projects/integrations/shimos_controller_spec.rb'
- './spec/requests/projects/issue_links_controller_spec.rb'
- './spec/requests/projects/issues_controller_spec.rb'
- './spec/requests/projects/issues/discussions_spec.rb'
--
GitLab