Skip to content
GitLab
Next
Menu
Why GitLab
Pricing
Contact Sales
Explore
Why GitLab
Pricing
Contact Sales
Explore
Sign in
Get free trial
Primary navigation
Search or go to…
Project
GitLab FOSS
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Privacy statement
Keyboard shortcuts
?
What's new
4
Snippets
Groups
Projects
Show more breadcrumbs
GitLab.org
GitLab FOSS
Commits
98b87a6e
There was a problem fetching the pipeline summary.
Commit
98b87a6e
authored
7 years ago
by
Rémy Coutable
Browse files
Options
Downloads
Patches
Plain Diff
Put banners in constants
Signed-off-by:
Rémy Coutable
<
remy@rymai.me
>
parent
8720f1d6
No related branches found
No related tags found
Loading
Pipeline
#
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
lib/gitlab/ee_compat_check.rb
+27
-29
27 additions, 29 deletions
lib/gitlab/ee_compat_check.rb
with
27 additions
and
29 deletions
lib/gitlab/ee_compat_check.rb
+
27
−
29
View file @
98b87a6e
...
...
@@ -6,6 +6,16 @@ class EeCompatCheck
EE_REPO
=
'https://gitlab.com/gitlab-org/gitlab-ee.git'
.
freeze
CHECK_DIR
=
Rails
.
root
.
join
(
'ee_compat_check'
)
IGNORED_FILES_REGEX
=
/(VERSION|CHANGELOG\.md:\d+)/
.
freeze
PLEASE_READ_THIS_BANNER
=
%Q{
============================================================
===================== PLEASE READ THIS =====================
============================================================
}
.
freeze
THANKS_FOR_READING_BANNER
=
%Q{
============================================================
==================== THANKS FOR READING ====================
============================================================
\n
}
.
freeze
attr_reader
:ee_repo_dir
,
:patches_dir
,
:ce_repo
,
:ce_branch
,
:ee_branch_found
attr_reader
:failed_files
...
...
@@ -239,37 +249,31 @@ def command(cmd)
end
def
applies_cleanly_msg
(
branch
)
<<-
MSG
.
strip_heredoc
============================================================
===================== PLEASE READ THIS =====================
============================================================
%Q{
#{
PLEASE_READ_THIS_BANNER
}
🎉 Congratulations!! 🎉
The
#{
branch
}
branch applies cleanly to EE/master!
The
`
#{
branch
}
`
branch applies cleanly to EE/master!
Much ❤️! For more information, see
https://docs.gitlab.com/ce/development/limit_ee_conflicts.html#check-the-rake-ee_compat_check-in-your-merge-requests
============================================================
==================== THANKS FOR READING ====================
============================================================
\n
MSG
#{
THANKS_FOR_READING_BANNER
}
}
end
def
ce_branch_doesnt_apply_cleanly_and_no_ee_branch_msg
<<-
MSG
.
strip_heredoc
============================================================
===================== PLEASE READ THIS =====================
============================================================
%Q{
#{
PLEASE_READ_THIS_BANNER
}
💥 Oh no! 💥
The
#{
ce_branch
}
branch does not apply cleanly to the current
The
`
#{
ce_branch
}
`
branch does not apply cleanly to the current
EE/master, and no `
#{
ee_branch_prefix
}
` or `
#{
ee_branch_suffix
}
` branch
was found in the EE repository.
#{
conflicting_files_msg
}
We advise you to create a `
#{
ee_branch_prefix
}
` or `
#{
ee_branch_suffix
}
`
branch that includes changes from
#{
ce_branch
}
but also specific changes
branch that includes changes from
`
#{
ce_branch
}
`
but also specific changes
than can be applied cleanly to EE/master. In some cases, the conflicts
are trivial and you can ignore the warning from this job. As always,
use your best judgment!
...
...
@@ -284,7 +288,7 @@ def ce_branch_doesnt_apply_cleanly_and_no_ee_branch_msg
$ git fetch
#{
ce_repo
}
#{
ce_branch
}
$ git cherry-pick SHA # Repeat for all the commits you want to pick
You can squash the
#{
ce_branch
}
commits into a single "Port of
#{
ce_branch
}
to EE" commit.
You can squash the
`
#{
ce_branch
}
`
commits into a single "Port of
#{
ce_branch
}
to EE" commit.
2. Apply your branch's patch to EE
...
...
@@ -318,20 +322,16 @@ def ce_branch_doesnt_apply_cleanly_and_no_ee_branch_msg
Stay 💪 ! For more information, see
https://docs.gitlab.com/ce/development/limit_ee_conflicts.html#check-the-rake-ee_compat_check-in-your-merge-requests
============================================================
==================== THANKS FOR READING ====================
============================================================
\n
MSG
#{
THANKS_FOR_READING_BANNER
}
}
end
def
ee_branch_doesnt_apply_cleanly_msg
<<-
MSG
.
strip_heredoc
============================================================
===================== PLEASE READ THIS =====================
============================================================
%Q{
#{
PLEASE_READ_THIS_BANNER
}
💥 Oh no! 💥
The
#{
ce_branch
}
does not apply cleanly to the current EE/master, and
The
`
#{
ce_branch
}
`
does not apply cleanly to the current EE/master, and
even though a `
#{
ee_branch_found
}
` branch
exists in the EE repository, it does not apply cleanly either to
EE/master!
...
...
@@ -343,10 +343,8 @@ def ee_branch_doesnt_apply_cleanly_msg
Stay 💪 ! For more information, see
https://docs.gitlab.com/ce/development/limit_ee_conflicts.html#check-the-rake-ee_compat_check-in-your-merge-requests
============================================================
==================== THANKS FOR READING ====================
============================================================
\n
MSG
#{
THANKS_FOR_READING_BANNER
}
}
end
def
conflicting_files_msg
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment