Skip to content

GitLab

T
typo3.org
Unverified Commit 2bb4c871 authored by Sascha Marcel Schmidt's avatar Sascha Marcel Schmidt
Browse files
Options

Merge branch '9-add-deployment-on-staging-server' of... 

Merge branch '9-add-deployment-on-staging-server' of https://git-t3o.typo3.org/t3o/typo3.org into 9-add-deployment-on-staging-server
parents 78d6c183 9bf08b63
Pipeline #174 passed with stages
        in 2 minutes and 21 seconds
        Hide whitespace changes
        Inline Side-by-side
        Showing with 74 additions and 77 deletions
        composer.json
        View file @ 2bb4c871
        ......@@ -23,10 +23,10 @@
        }
        ],
        "require": {
        "typo3/cms": "8.6.1 as 8.5.1",
        "typo3/cms": "8.6.1",
        "helhum/typo3-console": "^4.2",
        "dmitryd/typo3-realurl": "^2.1",
        "t3o/t3olayout": "dev-master",
        "t3o/t3olayout": "dev-develop",
        "t3o/certifications": "dev-master"
        },
        "config": {
        ......
        composer.lock
        View file @ 2bb4c871
        ......@@ -4,8 +4,7 @@
        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
        "This file is @generated automatically"
        ],
        "hash": "40bc755338bf795eb09a7a4cfedc7945",
        "content-hash": "7b7ad56ff8ae0145f85f137f25c0a49a",
        "content-hash": "8b955cae365b7c18711e276c4c0a102f",
        "packages": [
        {
        "name": "cogpowered/finediff",
        ......@@ -56,20 +55,20 @@
        "string",
        "text"
        ],
        "time": "2014-05-19 10:25:02"
        "time": "2014-05-19T10:25:02+00:00"
        },
        {
        "name": "dmitryd/typo3-realurl",
        "version": "2.1.8",
        "version": "2.1.9",
        "source": {
        "type": "git",
        "url": "https://github.com/dmitryd/typo3-realurl.git",
        "reference": "5283341b56ec9f4212c6cdd4c54e82d06c0401dd"
        "reference": "da0772cf2c32dcc4a11529b19b7e8be284c54550"
        },
        "dist": {
        "type": "zip",
        "url": "https://api.github.com/repos/dmitryd/typo3-realurl/zipball/5283341b56ec9f4212c6cdd4c54e82d06c0401dd",
        "reference": "5283341b56ec9f4212c6cdd4c54e82d06c0401dd",
        "url": "https://api.github.com/repos/dmitryd/typo3-realurl/zipball/da0772cf2c32dcc4a11529b19b7e8be284c54550",
        "reference": "da0772cf2c32dcc4a11529b19b7e8be284c54550",
        "shasum": ""
        },
        "require": {
        ......@@ -121,7 +120,7 @@
        "cms",
        "typo3"
        ],
        "time": "2017-02-13 00:00:00"
        "time": "2017-03-09T00:00:00+00:00"
        },
        {
        "name": "doctrine/annotations",
        ......@@ -189,7 +188,7 @@
        "docblock",
        "parser"
        ],
        "time": "2017-02-24 16:22:25"
        "time": "2017-02-24T16:22:25+00:00"
        },
        {
        "name": "doctrine/cache",
        ......@@ -259,7 +258,7 @@
        "cache",
        "caching"
        ],
        "time": "2016-10-29 11:16:17"
        "time": "2016-10-29T11:16:17+00:00"
        },
        {
        "name": "doctrine/collections",
        ......@@ -326,7 +325,7 @@
        "collections",
        "iterator"
        ],
        "time": "2017-01-03 10:49:41"
        "time": "2017-01-03T10:49:41+00:00"
        },
        {
        "name": "doctrine/common",
        ......@@ -399,7 +398,7 @@
        "persistence",
        "spl"
        ],
        "time": "2017-01-13 14:02:13"
        "time": "2017-01-13T14:02:13+00:00"
        },
        {
        "name": "doctrine/dbal",
        ......@@ -470,7 +469,7 @@
        "persistence",
        "queryobject"
        ],
        "time": "2017-02-08 12:53:47"
        "time": "2017-02-08T12:53:47+00:00"
        },
        {
        "name": "doctrine/inflector",
        ......@@ -537,7 +536,7 @@
        "singularize",
        "string"
        ],
        "time": "2015-11-06 14:35:42"
        "time": "2015-11-06T14:35:42+00:00"
        },
        {
        "name": "doctrine/instantiator",
        ......@@ -591,7 +590,7 @@
        "constructor",
        "instantiate"
        ],
        "time": "2015-06-14 21:17:01"
        "time": "2015-06-14T21:17:01+00:00"
        },
        {
        "name": "doctrine/lexer",
        ......@@ -645,7 +644,7 @@
        "lexer",
        "parser"
        ],
        "time": "2014-09-09 13:34:57"
        "time": "2014-09-09T13:34:57+00:00"
        },
        {
        "name": "guzzlehttp/guzzle",
        ......@@ -707,7 +706,7 @@
        "rest",
        "web service"
        ],
        "time": "2017-02-28 22:50:30"
        "time": "2017-02-28T22:50:30+00:00"
        },
        {
        "name": "guzzlehttp/promises",
        ......@@ -758,7 +757,7 @@
        "keywords": [
        "promise"
        ],
        "time": "2016-12-20 10:07:11"
        "time": "2016-12-20T10:07:11+00:00"
        },
        {
        "name": "guzzlehttp/psr7",
        ......@@ -823,20 +822,20 @@
        "uri",
        "url"
        ],
        "time": "2017-02-27 10:51:17"
        "time": "2017-02-27T10:51:17+00:00"
        },
        {
        "name": "helhum/typo3-console",
        "version": "4.2.1",
        "version": "4.3.0",
        "source": {
        "type": "git",
        "url": "https://github.com/TYPO3-Console/typo3_console.git",
        "reference": "90cbf212ae35b7d9cbe7a849617d3d827c3b233c"
        "reference": "a38ac2ef12cf4b94fad69d40bdf9fd46f5703ed7"
        },
        "dist": {
        "type": "zip",
        "url": "https://api.github.com/repos/TYPO3-Console/typo3_console/zipball/90cbf212ae35b7d9cbe7a849617d3d827c3b233c",
        "reference": "90cbf212ae35b7d9cbe7a849617d3d827c3b233c",
        "url": "https://api.github.com/repos/TYPO3-Console/typo3_console/zipball/a38ac2ef12cf4b94fad69d40bdf9fd46f5703ed7",
        "reference": "a38ac2ef12cf4b94fad69d40bdf9fd46f5703ed7",
        "shasum": ""
        },
        "require": {
        ......@@ -860,7 +859,7 @@
        },
        "require-dev": {
        "mikey179/vfsstream": "~1.6.0",
        "nimut/testing-framework": "^0.1",
        "nimut/testing-framework": "^1.0",
        "phpunit/phpunit": "~4.8.0",
        "typo3-console/create-reference-command": "1.0.*@dev",
        "typo3/cms": "^8.6"
        ......@@ -910,7 +909,7 @@
        "console",
        "typo3"
        ],
        "time": "2017-02-23 00:44:43"
        "time": "2017-03-11T23:11:34+00:00"
        },
        {
        "name": "helhum/typo3-console-plugin",
        ......@@ -965,7 +964,7 @@
        "plugin",
        "typo3 console"
        ],
        "time": "2017-01-26 11:55:03"
        "time": "2017-01-26T11:55:03+00:00"
        },
        {
        "name": "mso/idna-convert",
        ......@@ -1014,7 +1013,7 @@
        "idna",
        "php"
        ],
        "time": "2016-06-19 18:08:43"
        "time": "2016-06-19T18:08:43+00:00"
        },
        {
        "name": "psr/http-message",
        ......@@ -1064,7 +1063,7 @@
        "request",
        "response"
        ],
        "time": "2016-08-06 14:39:51"
        "time": "2016-08-06T14:39:51+00:00"
        },
        {
        "name": "psr/log",
        ......@@ -1111,7 +1110,7 @@
        "psr",
        "psr-3"
        ],
        "time": "2016-10-10 12:19:37"
        "time": "2016-10-10T12:19:37+00:00"
        },
        {
        "name": "swiftmailer/swiftmailer",
        ......@@ -1165,20 +1164,20 @@
        "mail",
        "mailer"
        ],
        "time": "2017-02-13 07:52:53"
        "time": "2017-02-13T07:52:53+00:00"
        },
        {
        "name": "symfony/console",
        "version": "v3.2.4",
        "version": "v3.2.6",
        "source": {
        "type": "git",
        "url": "https://github.com/symfony/console.git",
        "reference": "0e5e6899f82230fcb1153bcaf0e106ffaa44b870"
        "reference": "28fb243a2b5727774ca309ec2d92da240f1af0dd"
        },
        "dist": {
        "type": "zip",
        "url": "https://api.github.com/repos/symfony/console/zipball/0e5e6899f82230fcb1153bcaf0e106ffaa44b870",
        "reference": "0e5e6899f82230fcb1153bcaf0e106ffaa44b870",
        "url": "https://api.github.com/repos/symfony/console/zipball/28fb243a2b5727774ca309ec2d92da240f1af0dd",
        "reference": "28fb243a2b5727774ca309ec2d92da240f1af0dd",
        "shasum": ""
        },
        "require": {
        ......@@ -1228,20 +1227,20 @@
        ],
        "description": "Symfony Console Component",
        "homepage": "https://symfony.com",
        "time": "2017-02-16 14:07:22"
        "time": "2017-03-06T19:30:27+00:00"
        },
        {
        "name": "symfony/debug",
        "version": "v3.2.4",
        "version": "v3.2.6",
        "source": {
        "type": "git",
        "url": "https://github.com/symfony/debug.git",
        "reference": "9b98854cb45bc59d100b7d4cc4cf9e05f21026b9"
        "reference": "b90c9f91ad8ac37d9f114e369042d3226b34dc1a"
        },
        "dist": {
        "type": "zip",
        "url": "https://api.github.com/repos/symfony/debug/zipball/9b98854cb45bc59d100b7d4cc4cf9e05f21026b9",
        "reference": "9b98854cb45bc59d100b7d4cc4cf9e05f21026b9",
        "url": "https://api.github.com/repos/symfony/debug/zipball/b90c9f91ad8ac37d9f114e369042d3226b34dc1a",
        "reference": "b90c9f91ad8ac37d9f114e369042d3226b34dc1a",
        "shasum": ""
        },
        "require": {
        ......@@ -1285,20 +1284,20 @@
        ],
        "description": "Symfony Debug Component",
        "homepage": "https://symfony.com",
        "time": "2017-02-16 16:34:18"
        "time": "2017-02-18T17:28:00+00:00"
        },
        {
        "name": "symfony/finder",
        "version": "v3.2.4",
        "version": "v3.2.6",
        "source": {
        "type": "git",
        "url": "https://github.com/symfony/finder.git",
        "reference": "8c71141cae8e2957946b403cc71a67213c0380d6"
        "reference": "92d7476d2df60cd851a3e13e078664b1deb8ce10"
        },
        "dist": {
        "type": "zip",
        "url": "https://api.github.com/repos/symfony/finder/zipball/8c71141cae8e2957946b403cc71a67213c0380d6",
        "reference": "8c71141cae8e2957946b403cc71a67213c0380d6",
        "url": "https://api.github.com/repos/symfony/finder/zipball/92d7476d2df60cd851a3e13e078664b1deb8ce10",
        "reference": "92d7476d2df60cd851a3e13e078664b1deb8ce10",
        "shasum": ""
        },
        "require": {
        ......@@ -1334,7 +1333,7 @@
        ],
        "description": "Symfony Finder Component",
        "homepage": "https://symfony.com",
        "time": "2017-01-02 20:32:22"
        "time": "2017-02-21T09:12:04+00:00"
        },
        {
        "name": "symfony/polyfill-mbstring",
        ......@@ -1393,20 +1392,20 @@
        "portable",
        "shim"
        ],
        "time": "2016-11-14 01:06:16"
        "time": "2016-11-14T01:06:16+00:00"
        },
        {
        "name": "symfony/process",
        "version": "v3.2.4",
        "version": "v3.2.6",
        "source": {
        "type": "git",
        "url": "https://github.com/symfony/process.git",
        "reference": "0ab87c1e7570b3534a6e51eb4ca8e9f6d7327856"
        "reference": "68bfa8c83f24c0ac04ea7193bcdcda4519f41892"
        },
        "dist": {
        "type": "zip",
        "url": "https://api.github.com/repos/symfony/process/zipball/0ab87c1e7570b3534a6e51eb4ca8e9f6d7327856",
        "reference": "0ab87c1e7570b3534a6e51eb4ca8e9f6d7327856",
        "url": "https://api.github.com/repos/symfony/process/zipball/68bfa8c83f24c0ac04ea7193bcdcda4519f41892",
        "reference": "68bfa8c83f24c0ac04ea7193bcdcda4519f41892",
        "shasum": ""
        },
        "require": {
        ......@@ -1442,20 +1441,20 @@
        ],
        "description": "Symfony Process Component",
        "homepage": "https://symfony.com",
        "time": "2017-02-16 14:07:22"
        "time": "2017-03-04T12:23:14+00:00"
        },
        {
        "name": "symfony/yaml",
        "version": "v3.2.4",
        "version": "v3.2.6",
        "source": {
        "type": "git",
        "url": "https://github.com/symfony/yaml.git",
        "reference": "9724c684646fcb5387d579b4bfaa63ee0b0c64c8"
        "reference": "093e416ad096355149e265ea2e4cc1f9ee40ab1a"
        },
        "dist": {
        "type": "zip",
        "url": "https://api.github.com/repos/symfony/yaml/zipball/9724c684646fcb5387d579b4bfaa63ee0b0c64c8",
        "reference": "9724c684646fcb5387d579b4bfaa63ee0b0c64c8",
        "url": "https://api.github.com/repos/symfony/yaml/zipball/093e416ad096355149e265ea2e4cc1f9ee40ab1a",
        "reference": "093e416ad096355149e265ea2e4cc1f9ee40ab1a",
        "shasum": ""
        },
        "require": {
        ......@@ -1497,7 +1496,7 @@
        ],
        "description": "Symfony Yaml Component",
        "homepage": "https://symfony.com",
        "time": "2017-02-16 22:46:52"
        "time": "2017-03-07T16:47:02+00:00"
        },
        {
        "name": "t3o/certifications",
        ......@@ -1505,15 +1504,20 @@
        "source": {
        "type": "git",
        "url": "https://github.com/TYPO3-typo3org/t3org-certifications.git",
        "reference": "31e0acb1c2a41645c68b2359b953415d891cdadd"
        "reference": "72d4d167999a6be588a442453ff51d8a819f890d"
        },
        "dist": {
        "type": "zip",
        "url": "https://api.github.com/repos/TYPO3-typo3org/t3org-certifications/zipball/31e0acb1c2a41645c68b2359b953415d891cdadd",
        "reference": "31e0acb1c2a41645c68b2359b953415d891cdadd",
        "url": "https://api.github.com/repos/TYPO3-typo3org/t3org-certifications/zipball/72d4d167999a6be588a442453ff51d8a819f890d",
        "reference": "72d4d167999a6be588a442453ff51d8a819f890d",
        "shasum": ""
        },
        "type": "typo3-cms-extension",
        "autoload": {
        "psr-4": {
        "T3o\\Certifications\\": "Classes/"
        }
        },
        "license": [
        "GPL-2.0+"
        ],
        ......@@ -1521,15 +1525,15 @@
        "support": {
        "source": "https://github.com/TYPO3-typo3org/t3org-certifications/tree/master"
        },
        "time": "2017-03-03 15:09:38"
        "time": "2017-03-03 18:10:23"
        },
        {
        "name": "t3o/t3olayout",
        "version": "dev-master",
        "version": "dev-develop",
        "source": {
        "type": "git",
        "url": "https://git-t3o.typo3.org/t3o/t3olayout.git",
        "reference": "2b98e1df2e6fff33d780967c674800e3a7ba7ce1"
        "reference": "abaab4aa2a1f2978fbaa57aaf2c5bf6172c59908"
        },
        "type": "typo3-cms-extension",
        "autoload": {
        ......@@ -1545,7 +1549,7 @@
        "keywords": [
        "TYPO3 CMS"
        ],
        "time": "2017-03-02 21:01:30"
        "time": "2017-03-17 08:05:55"
        },
        {
        "name": "typo3/class-alias-loader",
        ......@@ -1603,7 +1607,7 @@
        "classloader",
        "composer"
        ],
        "time": "2015-10-06 10:25:44"
        "time": "2015-10-06T10:25:44+00:00"
        },
        {
        "name": "typo3/cms",
        ......@@ -1815,7 +1819,7 @@
        "extbase",
        "typo3"
        ],
        "time": "2017-02-28 10:49:09"
        "time": "2017-02-28T10:49:09+00:00"
        },
        {
        "name": "typo3/cms-composer-installers",
        ......@@ -1883,7 +1887,7 @@
        "installer",
        "typo3"
        ],
        "time": "2016-07-05 09:38:42"
        "time": "2016-07-05T09:38:42+00:00"
        },
        {
        "name": "typo3fluid/fluid",
        ......@@ -1922,18 +1926,11 @@
        "LGPL-3.0"
        ],
        "description": "The TYPO3 Fluid template rendering engine",
        "time": "2017-02-22 05:27:39"
        "time": "2017-02-22T05:27:39+00:00"
        }
        ],
        "packages-dev": [],
        "aliases": [
        {
        "alias": "8.5.1",
        "alias_normalized": "8.5.1.0",
        "version": "8.6.1.0",
        "package": "typo3/cms"
        }
        ],
        "aliases": [],
        "minimum-stability": "stable",
        "stability-flags": {
        "t3o/t3olayout": 20,
        ......
        Markdown is supported
        0% or .
        You are about to add 0 people to the discussion. Proceed with caution.
        Finish editing this message first!
        Please register or to comment