From 70ee4e1b3ea9b5fa59fbe3e60733c5601804fc9e Mon Sep 17 00:00:00 2001
From: Ian Baum <ibaum@gitlab.com>
Date: Tue, 9 Oct 2018 13:26:43 -0500
Subject: Build a docker container storing only the frontent assets

* Run as part of gitlab:assets:compile job

* Will be used by omnibus-gitlab and the CNG images to avoid
compiling multiple times

https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/22235
---
 scripts/build_assets_image | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100755 scripts/build_assets_image

(limited to 'scripts')

diff --git a/scripts/build_assets_image b/scripts/build_assets_image
new file mode 100755
index 00000000000..218606b9a40
--- /dev/null
+++ b/scripts/build_assets_image
@@ -0,0 +1,21 @@
+#!/bin/bash
+
+# Generate the image name based on the project this is being run in
+ASSETS_IMAGE_NAME=$(echo ${CI_PROJECT_NAME} |
+   awk '{
+    split($1, p, "-");
+    interim = sprintf("%s-assets-%s", p[1], p[2]);
+    sub(/-$/, "", interim);
+    print interim
+  }'
+)
+
+ASSETS_IMAGE_PATH=${CI_REGISTRY}/${CI_PROJECT_PATH}/${ASSETS_IMAGE_NAME}
+
+mkdir -p assets_container.build/public
+cp -r public/assets assets_container.build/public/
+cp Dockerfile.assets assets_container.build/
+docker build -t ${ASSETS_IMAGE_PATH}:${CI_COMMIT_REF_NAME} -f assets_container.build/Dockerfile.assets assets_container.build/
+docker login -u gitlab-ci-token -p ${CI_JOB_TOKEN} ${CI_REGISTRY}
+docker push ${ASSETS_IMAGE_PATH}
+
-- 
cgit v1.2.1


From 31f26a9382a7dc20acc640ed8cad38ac66efa4f0 Mon Sep 17 00:00:00 2001
From: Mike Greiling <mike@pixelcog.com>
Date: Wed, 31 Oct 2018 10:22:36 -0500
Subject: Add prettier to static-analysis job

---
 scripts/static-analysis | 1 +
 1 file changed, 1 insertion(+)

(limited to 'scripts')

diff --git a/scripts/static-analysis b/scripts/static-analysis
index 0e67eabfec1..25ba7ec6c8e 100755
--- a/scripts/static-analysis
+++ b/scripts/static-analysis
@@ -29,6 +29,7 @@ tasks = [
   %w[bin/rake lint:all],
   %w[bundle exec license_finder],
   %w[yarn run eslint],
+  %w[yarn run prettier-all],
   %w[bundle exec rubocop --parallel],
   %w[scripts/lint-conflicts.sh],
   %w[scripts/lint-rugged]
-- 
cgit v1.2.1


From 733ae9492129e835f183902a97ee0886e2dbdc9b Mon Sep 17 00:00:00 2001
From: George Tsiolis <tsiolis.g@gmail.com>
Date: Tue, 30 Oct 2018 12:53:01 +0200
Subject: Fix typos in comments and specs

---
 scripts/trigger-build | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'scripts')

diff --git a/scripts/trigger-build b/scripts/trigger-build
index b76cd5dd6f0..dd0425b6472 100755
--- a/scripts/trigger-build
+++ b/scripts/trigger-build
@@ -32,32 +32,32 @@ module Trigger
 
     private
 
-    # Must be overriden
+    # Must be overridden
     def downstream_project_path
       raise NotImplementedError
     end
 
-    # Must be overriden
+    # Must be overridden
     def ref
       raise NotImplementedError
     end
 
-    # Must be overriden
+    # Must be overridden
     def trigger_token
       raise NotImplementedError
     end
 
-    # Must be overriden
+    # Must be overridden
     def access_token
       raise NotImplementedError
     end
 
-    # Can be overriden
+    # Can be overridden
     def extra_variables
       {}
     end
 
-    # Can be overriden
+    # Can be overridden
     def version_param_value(version_file)
       File.read(version_file).strip
     end
-- 
cgit v1.2.1