Merge branch 'move-app-lib-ee' into 'master'

Move the rest EE files from app and lib See merge request gitlab-org/gitlab-ee!5057

Merge branch 'move-app-lib-ee' into 'master'
Move the rest EE files from app and lib See merge request gitlab-org/gitlab-ee!5057
c8a7aeab · Nick Thomas · 887af081 · 1a349102 · c8a7aeab · c8a7aeab
Commit c8a7aeab authored Mar 26, 2018 by Nick Thomas
3 changed files
--- a/app/assets/javascripts/pages/projects/merge_conflicts/index.js
+++ b/app/assets/javascripts/pages/projects/merge_conflicts/index.js
--- a/app/validators/untrusted_regexp_validator.rb
+++ b/app/validators/untrusted_regexp_validator.rb
--- a/lib/banzai/filter/cross_project_issuable_information_filter.rb
+++ b/lib/banzai/filter/cross_project_issuable_information_filter.rb