Merge pull request #1281 from NatLibFi/revert-1262-v2.13-maintenance

Revert "Allow plugin robloach/component-installer, because it is required by components/handlebars.js"
NatLibFi · Mar 2, 2022 · bb7de4e · bb7de4e
2 parents 68449a2 + 3cc466f
commit bb7de4e
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 5,241 deletions.
diff --git a/.gitignore b/.gitignore
@@ -6,10 +6,9 @@ components
 plugins/*
 !README
 composer.phar
+composer.lock
 tests/jena-fuseki*
 .vagrant
 .project
 .DS_Store
 .phpunit.result.cache
-/.idea
-
diff --git a/composer.json b/composer.json
@@ -61,7 +61,7 @@
     "easyrdf/easyrdf": "1.1.*",
     "etdsolutions/waypoints": "4.0.0",
     "symfony/polyfill-php80": "1.*",
-    "twig/twig": "2.14.*",
+    "twig/twig": "2.13.*",
     "twig/extensions": "1.5.*",
     "twitter/bootstrap": "3.3.*",
     "twitter/typeahead.js": "v0.10.5",
@@ -88,10 +88,5 @@
   },
   "autoload": {
     "classmap": ["controller/", "model/", "model/sparql/"]
-  },
-  "config": {
-    "allow-plugins": {
-      "robloach/component-installer": true
-    }
   }
 }