Add latest changes from gitlab-org/gitlab@master

2 files changed, 7 insertions, 43 deletions

diff --git a/scripts/ee-specific-lines-check b/scripts/ee-specific-lines-check
deleted file mode 100755
index 4114575168c..00000000000
--- a/scripts/ee-specific-lines-check
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/usr/bin/env ruby
-
-require_relative 'ee_specific_check/ee_specific_check'
-
-include EESpecificCheck # rubocop:disable Style/MixinUsage
-git_version
-
-base = find_compare_base
-
-current_numstat = updated_diff_numstat(base.ce_base, base.ee_base)
-updated_numstat = updated_diff_numstat(base.ce_head, base.ee_head)
-
-offenses = updated_numstat.select do |file, updated_delta|
-  current_delta = current_numstat[file]
-
-  more_lines = updated_delta > current_delta
-
-  more_lines &&
-    !WHITELIST.any? { |pattern| Dir.glob(pattern, File::FNM_DOTMATCH).include?(file) }
-end
-
-if offenses.empty?
-  say "🎉 All good, congrats! 🎉"
-else
-  puts
-
-  offenses.each do |(file, delta)|
-    puts "* 💥 #{file} has #{delta - current_numstat[file]} updated lines that differ between EE and CE! 💥"
-  end
-
-  say <<~MESSAGE
-    ℹ️ Make sure all lines in shared files have been updated in your backport merge request and the branch name includes #{minimal_ce_branch_name}.
-    ℹ️ Consider using an EE module to add the features you want.
-    ℹ️ See this for detail: https://docs.gitlab.com/ee/development/ee_features.html#ee-features-based-on-ce-features
-  MESSAGE
-end
-
-remove_remotes
-
-say "ℹ️ For more information on why, see https://gitlab.com/gitlab-org/gitlab/issues/2952"
-
-exit(offenses.size)
diff --git a/scripts/frontend/check_no_partial_karma_jest.sh b/scripts/frontend/check_no_partial_karma_jest.sh
index 0d0c897bb18..c5fffa5900b 100755
--- a/scripts/frontend/check_no_partial_karma_jest.sh
+++ b/scripts/frontend/check_no_partial_karma_jest.sh
@@ -1,6 +1,12 @@
 #!/usr/bin/env bash
 
-karma_files=$(find spec/javascripts ee/spec/javascripts -type f -name '*_spec.js' -not -path '*/helpers/*')
+karma_directory=spec/javascripts
+
+if [ -d ee ]; then
+  karma_directory="$karma_directory ee/$karma_directory"
+fi
+
+karma_files=$(find $karma_directory -type f -name '*_spec.js' -not -path '*/helpers/*')
 violations=""
 
 for karma_file in $karma_files; do