Merge pull request #7079 from carusogabriel/misspelling

Fix misspelling

CHANGELOG.md

@@ -169,7 +169,7 @@
   * Added `COMPOSER_MIRROR_PATH_REPOS` env var to force mirroring of path repositories vs symlinking
   * Added `COMPOSER_DEV_MODE` env var that is set by Composer to forward the dev mode to script handlers
   * Fixed support for git 2.11
-  * Fixed output from zip and rar leaking out when an error occured
+  * Fixed output from zip and rar leaking out when an error occurred
   * Removed `hash` from composer.lock, only `content-hash` is now used which should reduce conflicts
   * Minor fixes and performance improvements
 

src/Composer/Repository/Vcs/GitLabDriver.php

@@ -129,7 +129,7 @@ class GitLabDriver extends VcsDriver
             return $this->gitDriver->getFileContent($file, $identifier);
         }
 
-        // Convert the root identifier to a cachable commit id
+        // Convert the root identifier to a cacheable commit id
         if (!preg_match('{[a-f0-9]{40}}i', $identifier)) {
             $branches = $this->getBranches();
             if (isset($branches[$identifier])) {