Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/lib/gitlab/ee_compat_check.rb
AgeCommit message (Collapse)Author
2019-01-04Don't ignore conflicts in db/schema.rbYorick Peterse
It's not entirely clear to me why we were ignoring db/schema.rb in the first place, but this should not be done now that we merge CE into EE automatically. Doing so can lead to changes being thrown away in the event of a conflict, which can then lead to EE pipelines failing.
2019-01-04Don't ingore the `gitlab.pot` in ee_compat_checkBob Van Landuyt
If there are new strings in CE, they need to be added to EE manually. As the `locale/gitlab.pot` file can't be merged automatically during the upstream merge.
2018-10-23Fix ee-compat-check by not modifying frozen stringsMario de la Ossa
2018-10-22Enable frozen string for lib/gitlab/*.rbgfyoung
2018-07-10Find the EE branch by searching the branchesLin Jen-Shin
This uses a similar approach in ee_specific_check.rb
2018-05-24Try to fetch the CE branch in EE because sometimes it has the same nameRémy Coutable
Signed-off-by: Rémy Coutable <remy@rymai.me>
2018-04-17Ignore `locale/gitlab.pot` in ee_compat_checkBob Van Landuyt
Conflicts can be resolved by running `bundle exec rake gettext:find; git checkout locale/*/gitlab.po`
2018-03-29Improve the ee_compat_check_job to handle gitlab-ee forksRémy Coutable
Signed-off-by: Rémy Coutable <remy@rymai.me>
2018-01-30Ignore conflicts in db/schema.rb in Gitlab::EeCompatCheckRémy Coutable
The conflicts are simple enought to resolve that we don't need to bother developers with those. Signed-off-by: Rémy Coutable <remy@rymai.me>
2018-01-11Adds Rubocop rule for line break around conditionals🙈 jacopo beschi 🙉
2017-12-05Move the "Limit conflicts with EE" doc to "Automatic CE-> EE merge"Rémy Coutable
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-11-23In EeCompatCheck, always reset to canonical-ee/master when applying a patchRémy Coutable
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-11-23Generate the patch against `origin/#{branch}` instead of just `#{branch}`Rémy Coutable
2017-11-23Try to always find the merge base using `origin/#{branch}` instead of just ↵Rémy Coutable
`#{branch}`
2017-11-22Try to find the merge-base against the canonical masterRémy Coutable
Also, name the remotes in Gitlab::EeCompatCheck Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-11-15Always fetch master from the canonical remoteRémy Coutable
This way, if a fork's master branch is far behind the canonical's master, it won't use the tip of the fork's master branch as merge base and thus won't create a huge and wrong patch file. Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-10-31Ensure the ee-compat-check uses the correct patch URL for forksRémy Coutable
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-10-06Fix the ee_compat_check task for forksRémy Coutable
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-09-15Update ee_compat_check for community contributorsLin Jen-Shin
2017-08-09Fix ee_compat_check when EE branch uses a prefixRémy Coutable
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-08-01Always fetch branches before finding the merge base, otherwise we could find ↵Rémy Coutable
an outdated merge base Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-07-19Developer can just download the patch from the `ee_compat_check` job's artifactRémy Coutable
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-07-07Fix gitlab-ee reference in ee_compat_checkPedro Moreira da Silva
2017-06-21Fix an uncaught throw in the ee_compat_check jobRémy Coutable
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-06-09Generate patch with git diff instead of git format-patchRémy Coutable
This will generate a patch: - that is smaller - that applies more cleanly since only the final diff will be applied instead of each commit's diff Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-05-17Fix invalid object reference in ee_compat_check scriptRobert Speicher
2017-05-16Fetch CE/branch before running `git apply --check --3way patch`Rémy Coutable
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-05-16Update ee_compat_check.rb to include `git apply --reject` suggestionLuke "Jared" Bennett
2017-03-28Fix Gitlab::EeCompatCheck: use `ee_branch_found` instead of `ee_branch`Rémy Coutable
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-03-24Put banners in constantsRémy Coutable
Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-03-24Fetch deeper the tested branch before fetching masterRémy Coutable
The tested branch is clone with a deep of 20 so if it has more than 20 commits, we need to deepen its hitory to be able to find the merge-base with origin/master. Also, detect prefixed EE branch as well, i.e. `ee-<branch>`. Signed-off-by: Rémy Coutable <remy@rymai.me>
2017-02-22Improve `Gitlab::EeCompatCheck` by using the `git apply --3way` flag Rémy Coutable
This should solve 99% of the false-positive of the `ee_compat_check` job.
2016-11-23Ensure we sanitize branch names with path-unfriendly charactersRémy Coutable
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-11-10Improve EeCompatCheck, cache EE repo and keep artifacts for the ↵Rémy Coutable
ee_compat_check task Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-10-24Disable Rails/Output cop since it makes no sense hereRémy Coutable
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-10-24Use File.write instead of File.open + File#writeRémy Coutable
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-10-24Don't print out implementation detail stepRémy Coutable
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-10-21Change the approach to check if patches apply cleanlyRémy Coutable
Signed-off-by: Rémy Coutable <remy@rymai.me>
    generated by cgit v1.2.3 (git 2.25.1) at 2024-08-16 06:30:14 +0300