From 4e72e4563c4425b39714f068e3f94f1a6f7ed26f Mon Sep 17 00:00:00 2001
From: Eric Eastwood <contact@ericeastwood.com>
Date: Thu, 8 Feb 2018 23:07:28 -0600
Subject: Rename .scss files to use snake_case

See https://gitlab.com/gitlab-org/gitlab-ce/issues/42908
---
 lib/tasks/gemojione.rake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/tasks')

diff --git a/lib/tasks/gemojione.rake b/lib/tasks/gemojione.rake
index c2d3a6b6950..c6942d22926 100644
--- a/lib/tasks/gemojione.rake
+++ b/lib/tasks/gemojione.rake
@@ -115,7 +115,7 @@ namespace :gemojione do
         end
       end
 
-      style_path = Rails.root.join(*%w(app assets stylesheets framework emoji-sprites.scss))
+      style_path = Rails.root.join(*%w(app assets stylesheets framework emoji_sprites.scss))
 
       # Combine the resized assets into a packed sprite and re-generate the SCSS
       SpriteFactory.cssurl = "image-url('$IMAGE')"
-- 
cgit v1.2.1


From e4990b66df64f2e23502d161f411335c9a771a43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Coutable?= <remy@rymai.me>
Date: Fri, 26 Jan 2018 15:23:46 +0100
Subject: Combine all rake tasks in the static-analysis job
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Rémy Coutable <remy@rymai.me>
---
 lib/tasks/lint.rake | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

(limited to 'lib/tasks')

diff --git a/lib/tasks/lint.rake b/lib/tasks/lint.rake
index 3ab406eff2c..e7812ff3568 100644
--- a/lib/tasks/lint.rake
+++ b/lib/tasks/lint.rake
@@ -16,5 +16,33 @@ unless Rails.env.production?
     task :javascript do
       Rake::Task['eslint'].invoke
     end
+
+    desc "GitLab | lint | Run several lint checks"
+    task :all do
+      status = 0
+      original_stdout = $stdout
+
+      %w[
+        config_lint
+        haml_lint
+        scss_lint
+        flay
+        gettext:lint
+        lint:static_verification
+      ].each do |task|
+        begin
+          $stdout = StringIO.new
+          Rake::Task[task].invoke
+        rescue RuntimeError, SystemExit => ex
+          raise ex if ex.is_a?(RuntimeError) && task != 'haml_lint'
+          original_stdout << $stdout.string
+          status = 1
+        ensure
+          $stdout = original_stdout
+        end
+      end
+
+      exit status
+    end
   end
 end
-- 
cgit v1.2.1


From 2f0d2ab55b6deac79f81834f6724a676ceae94ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Coutable?= <remy@rymai.me>
Date: Mon, 12 Feb 2018 18:34:07 +0100
Subject: Run lint:all tasks in forks
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Rémy Coutable <remy@rymai.me>
---
 lib/tasks/lint.rake | 43 ++++++++++++++++++++++++++++++++-----------
 1 file changed, 32 insertions(+), 11 deletions(-)

(limited to 'lib/tasks')

diff --git a/lib/tasks/lint.rake b/lib/tasks/lint.rake
index e7812ff3568..fe5032cae18 100644
--- a/lib/tasks/lint.rake
+++ b/lib/tasks/lint.rake
@@ -20,7 +20,6 @@ unless Rails.env.production?
     desc "GitLab | lint | Run several lint checks"
     task :all do
       status = 0
-      original_stdout = $stdout
 
       %w[
         config_lint
@@ -30,19 +29,41 @@ unless Rails.env.production?
         gettext:lint
         lint:static_verification
       ].each do |task|
-        begin
-          $stdout = StringIO.new
-          Rake::Task[task].invoke
-        rescue RuntimeError, SystemExit => ex
-          raise ex if ex.is_a?(RuntimeError) && task != 'haml_lint'
-          original_stdout << $stdout.string
-          status = 1
-        ensure
-          $stdout = original_stdout
+        pid = Process.fork do
+          rd, wr = IO.pipe
+          stdout = $stdout.dup
+          stderr = $stderr.dup
+          $stdout.reopen(wr)
+          $stderr.reopen(wr)
+
+          begin
+            begin
+              Rake::Task[task].invoke
+            rescue RuntimeError # The haml_lint tasks raise a RuntimeError
+              exit(1)
+            end
+          rescue SystemExit => ex
+            msg = "*** Rake task #{task} failed with the following error(s):"
+            raise ex
+          ensure
+            $stdout.reopen(stdout)
+            $stderr.reopen(stderr)
+            wr.close
+
+            if msg
+              warn "\n#{msg}\n\n"
+              IO.copy_stream(rd, $stderr)
+            else
+              IO.copy_stream(rd, $stdout)
+            end
+          end
         end
+
+        Process.waitpid(pid)
+        status += $?.exitstatus
       end
 
-      exit status
+      exit(status)
     end
   end
 end
-- 
cgit v1.2.1