summaryrefslogtreecommitdiff
path: root/lib/gitlab/ee_compat_check.rb
Commit message (Collapse)AuthorAgeFilesLines
* Don't ignore conflicts in db/schema.rbdo-not-ignore-schema-conflictsYorick Peterse2019-01-041-1/+1
| | | | | | | 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.
* Don't ingore the `gitlab.pot` in ee_compat_checkBob Van Landuyt2019-01-041-1/+1
| | | | | | 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.
* Fix ee-compat-check by not modifying frozen strings53030-ee-compat-check-frozen-literalMario de la Ossa2018-10-231-4/+6
|
* Enable frozen string for lib/gitlab/*.rbgfyoung2018-10-221-0/+2
|
* Find the EE branch by searching the branchesLin Jen-Shin2018-07-111-8/+20
| | | | This uses a similar approach in ee_specific_check.rb
* Try to fetch the CE branch in EE because sometimes it has the same name6045-extract-ee-specific-specs-linesRémy Coutable2018-05-241-2/+2
| | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Ignore `locale/gitlab.pot` in ee_compat_checkBob Van Landuyt2018-04-171-1/+1
| | | | | Conflicts can be resolved by running `bundle exec rake gettext:find; git checkout locale/*/gitlab.po`
* Improve the ee_compat_check_job to handle gitlab-ee forksRémy Coutable2018-03-291-57/+91
| | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Ignore conflicts in db/schema.rb in Gitlab::EeCompatCheckrc/ignore-schema-in-ee_compat_checkRémy Coutable2018-01-301-1/+1
| | | | | | | 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>
* Adds Rubocop rule for line break around conditionals🙈 jacopo beschi 🙉2018-01-111-0/+2
|
* Move the "Limit conflicts with EE" doc to "Automatic CE-> EE merge"Rémy Coutable2017-12-051-3/+3
| | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* In EeCompatCheck, always reset to canonical-ee/master when applying a patch40463-ee-compatibility-check-job-fails-unexpectedlyRémy Coutable2017-11-231-4/+4
| | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Generate the patch against `origin/#{branch}` instead of just `#{branch}`Rémy Coutable2017-11-221-1/+1
|
* Try to always find the merge base using `origin/#{branch}` instead of just ↵Rémy Coutable2017-11-221-1/+1
| | | | `#{branch}`
* Try to find the merge-base against the canonical masterRémy Coutable2017-11-221-31/+38
| | | | | | Also, name the remotes in Gitlab::EeCompatCheck Signed-off-by: Rémy Coutable <remy@rymai.me>
* Always fetch master from the canonical remoteRémy Coutable2017-11-151-3/+3
| | | | | | | | 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>
* Ensure the ee-compat-check uses the correct patch URL for forks39628-bug-in-the-procedure-advised-from-ee_compat_checkRémy Coutable2017-10-311-11/+13
| | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Fix the ee_compat_check task for forksRémy Coutable2017-10-061-3/+3
| | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Update ee_compat_check for community contributors37713-enable-ee_compat_check-for-forksLin Jen-Shin2017-09-151-1/+6
|
* Fix ee_compat_check when EE branch uses a prefixRémy Coutable2017-08-091-2/+3
| | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Always fetch branches before finding the merge base, otherwise we could find ↵rc/fetch-before-finding-merge-base-in-ee_compat_checkRémy Coutable2017-08-011-2/+0
| | | | | | an outdated merge base Signed-off-by: Rémy Coutable <remy@rymai.me>
* Developer can just download the patch from the `ee_compat_check` job's artifactimprove-ee-compat-checkRémy Coutable2017-07-191-6/+7
| | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Fix gitlab-ee reference in ee_compat_checkPedro Moreira da Silva2017-07-071-1/+1
|
* Fix an uncaught throw in the ee_compat_check jobRémy Coutable2017-06-211-4/+17
| | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Generate patch with git diff instead of git format-patch33525-use-git-diff-instead-of-git-format-patchRémy Coutable2017-06-091-7/+3
| | | | | | | | | | 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>
* Fix invalid object reference in ee_compat_check scriptrs-fix-ee-compatRobert Speicher2017-05-171-1/+1
|
* Fetch CE/branch before running `git apply --check --3way patch`32085-improve-ee-compat-checkRémy Coutable2017-05-161-3/+5
| | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Update ee_compat_check.rb to include `git apply --reject` suggestionLuke "Jared" Bennett2017-05-161-0/+11
|
* Fix Gitlab::EeCompatCheck: use `ee_branch_found` instead of `ee_branch`Rémy Coutable2017-03-281-2/+2
| | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Put banners in constantsRémy Coutable2017-03-231-29/+27
| | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Fetch deeper the tested branch before fetching masterRémy Coutable2017-03-231-98/+181
| | | | | | | | | | 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>
* Improve `Gitlab::EeCompatCheck` by using the `git apply --3way` flag improve-ee_compat_check-by-using-git-apply-3way-flagRémy Coutable2017-02-221-1/+1
| | | This should solve 99% of the false-positive of the `ee_compat_check` job.
* Ensure we sanitize branch names with path-unfriendly charactersRémy Coutable2016-11-231-2/+6
| | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Improve EeCompatCheck, cache EE repo and keep artifacts for the ↵23945-improve-ee_compat_check-task-part-3Rémy Coutable2016-11-101-71/+81
| | | | | | ee_compat_check task Signed-off-by: Rémy Coutable <remy@rymai.me>
* Disable Rails/Output cop since it makes no sense here23372-fix-ce-to-ee-merge-check-taskRémy Coutable2016-10-241-0/+1
| | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Use File.write instead of File.open + File#writeRémy Coutable2016-10-241-1/+1
| | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Don't print out implementation detail stepRémy Coutable2016-10-241-1/+1
| | | | Signed-off-by: Rémy Coutable <remy@rymai.me>
* Change the approach to check if patches apply cleanlyRémy Coutable2016-10-211-0/+260
Signed-off-by: Rémy Coutable <remy@rymai.me>
View Lorry Controller Status