Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into acet-mr-diffs-autosave

2 files changed, 23 insertions, 1 deletions

diff --git a/scripts/frontend/postinstall.js b/scripts/frontend/postinstall.js
new file mode 100644
index 00000000000..682039a41b3
--- /dev/null
+++ b/scripts/frontend/postinstall.js
@@ -0,0 +1,22 @@
+const chalk = require('chalk');
+
+// check that fsevents is available if we're on macOS
+if (process.platform === 'darwin') {
+  try {
+    require.resolve('fsevents');
+  } catch (e) {
+    console.error(`${chalk.red('error')} Dependency postinstall check failed.`);
+    console.error(
+      chalk.red(`
+        The fsevents driver is not installed properly.
+        If you are running a new version of Node, please
+        ensure that it is supported by the fsevents library.
+
+        You can try installing again with \`${chalk.cyan('yarn install --force')}\`
+      `)
+    );
+    process.exit(1);
+  }
+}
+
+console.log(`${chalk.green('success')} Dependency postinstall check passed.`);
diff --git a/scripts/trigger-build-docs b/scripts/trigger-build-docs
index c9aaba91aa0..2a0e7f4d76e 100755
--- a/scripts/trigger-build-docs
+++ b/scripts/trigger-build-docs
@@ -27,7 +27,7 @@ def docs_branch
   # Prefix the remote branch with the slug of the project in order
   # to avoid name conflicts in the rare case the branch name already
   # exists in the docs repo and truncate to max length.
-  "#{slug}-#{ENV["CI_COMMIT_REF_SLUG"]}"[0...max]
+  "#{slug}-#{ENV["CI_ENVIRONMENT_SLUG"]}"[0...max]
 end
 
 #