Commits · 3c57d68318e91ba08bd7d371771189fc0f4ce994 · gpt / large_projects / gitlabhq1

Apr 17, 2018

Ignore `locale/gitlab.pot` in ee_compat_check · 3c57d683

Bob Van Landuyt authored 6 years ago

Conflicts can be resolved by running
`bundle exec rake gettext:find; git checkout locale/*/gitlab.po`

3c57d683

Mar 29, 2018
- Improve the ee_compat_check_job to handle gitlab-ee forks · 0241c182
  Rémy Coutable authored 7 years ago
  
  Signed-off-by: Rémy Coutable <remy@rymai.me>
  0241c182
Jan 30, 2018

Ignore conflicts in db/schema.rb in Gitlab::EeCompatCheck · 804c6f93

Rémy Coutable authored 7 years ago


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>

Unverified

804c6f93

Jan 11, 2018
- Adds Rubocop rule for line break around conditionals · 729f05f0
  🙈 jacopo beschi 🙉 authored 7 years ago and Robert Speicher committed 7 years ago
  
  729f05f0
Dec 05, 2017
- Move the "Limit conflicts with EE" doc to "Automatic CE-> EE merge" · aaf16997
  Rémy Coutable authored 7 years ago
  
  Signed-off-by: Rémy Coutable <remy@rymai.me>
  Verified
  
  aaf16997
Nov 23, 2017
- In EeCompatCheck, always reset to canonical-ee/master when applying a patch · 3262378e
  Rémy Coutable authored 7 years ago
  
  Signed-off-by: Rémy Coutable <remy@rymai.me>
  Verified
  
  3262378e
Nov 22, 2017
- Generate the patch against `origin/#{branch}` instead of just `#{branch}` · f5ab0f52
  Rémy Coutable authored 7 years ago
  
  f5ab0f52
- Try to always find the merge base using `origin/#{branch}` instead of just `#{branch}` · eceec267
  Rémy Coutable authored 7 years ago
  
  eceec267
- Try to find the merge-base against the canonical master · 05e0c4c1
  Rémy Coutable authored 7 years ago
  
  Also, name the remotes in Gitlab::EeCompatCheck Signed-off-by: Rémy Coutable <remy@rymai.me>
  05e0c4c1
Nov 15, 2017

Always fetch master from the canonical remote · 54533920

Rémy Coutable authored 7 years ago


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>

Verified

54533920

Oct 31, 2017
- Ensure the ee-compat-check uses the correct patch URL for forks · b2373e3d
  Rémy Coutable authored 7 years ago
  
  Signed-off-by: Rémy Coutable <remy@rymai.me>
  Verified
  
  b2373e3d
Oct 06, 2017
- Fix the ee_compat_check task for forks · c2efb6b1
  Rémy Coutable authored 7 years ago
  
  Signed-off-by: Rémy Coutable <remy@rymai.me>
  Verified
  
  c2efb6b1
Sep 15, 2017
- Update ee_compat_check for community contributors · 82818650
  Lin Jen-Shin authored 7 years ago
  
  82818650
Aug 09, 2017
- Fix ee_compat_check when EE branch uses a prefix · 04c328f9
  Rémy Coutable authored 7 years ago
  
  Signed-off-by: Rémy Coutable <remy@rymai.me>
  04c328f9
Aug 01, 2017
- Always fetch branches before finding the merge base, otherwise we could find an outdated merge base · 4fa83bbe
  Rémy Coutable authored 7 years ago
  
  Signed-off-by: Rémy Coutable <remy@rymai.me>
  Verified
  
  4fa83bbe
Jul 19, 2017
- Developer can just download the patch from the `ee_compat_check` job's artifact · f9f33323
  Rémy Coutable authored 7 years ago
  
  Signed-off-by: Rémy Coutable <remy@rymai.me>
  Verified
  
  f9f33323
Jul 07, 2017
- Fix gitlab-ee reference in ee_compat_check · 6bd83a7b
  Pedro Moreira da Silva authored 7 years ago
  
  6bd83a7b
Jun 21, 2017
- Fix an uncaught throw in the ee_compat_check job · e69924c4
  Rémy Coutable authored 7 years ago
  
  Signed-off-by: Rémy Coutable <remy@rymai.me>
  Verified
  
  e69924c4
Jun 09, 2017

Generate patch with git diff instead of git format-patch · 4282e610

Rémy Coutable authored 7 years ago


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>

Verified

4282e610

May 17, 2017
- Fix invalid object reference in ee_compat_check script · 611c2fb0
  Robert Speicher authored 7 years ago
  
  611c2fb0
May 16, 2017
- Fetch CE/branch before running `git apply --check --3way patch` · 992dfd7e
  Rémy Coutable authored 7 years ago
  
  Signed-off-by: Rémy Coutable <remy@rymai.me>
  Verified
  
  992dfd7e
- Update ee_compat_check.rb to include `git apply --reject` suggestion · b3da5e15
  Luke "Jared" Bennett authored 7 years ago
  
  b3da5e15
Mar 28, 2017
- Fix Gitlab::EeCompatCheck: use `ee_branch_found` instead of `ee_branch` · 1dbd80d1
  Rémy Coutable authored 7 years ago
  
  Signed-off-by: Rémy Coutable <remy@rymai.me>
  1dbd80d1
Mar 23, 2017

Put banners in constants · 98b87a6e
Rémy Coutable authored 7 years ago
```
Signed-off-by: Rémy Coutable <remy@rymai.me>
```
98b87a6e

Fetch deeper the tested branch before fetching master · 8720f1d6

Rémy Coutable authored 8 years ago


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>

8720f1d6

Feb 22, 2017
- Improve `Gitlab::EeCompatCheck` by using the `git apply --3way` flag · 23e43ec5
  Rémy Coutable authored 8 years ago
  
  This should solve 99% of the false-positive of the `ee_compat_check` job.
  23e43ec5
Nov 23, 2016
- Ensure we sanitize branch names with path-unfriendly characters · cd78e020
  Rémy Coutable authored 8 years ago
  
  Signed-off-by: Rémy Coutable <remy@rymai.me>
  Verified
  
  cd78e020
Nov 10, 2016
- Improve EeCompatCheck, cache EE repo and keep artifacts for the ee_compat_check task · 88edbd11
  Rémy Coutable authored 8 years ago
  
  Signed-off-by: Rémy Coutable <remy@rymai.me>
  Verified
  
  88edbd11
Oct 24, 2016
- Disable Rails/Output cop since it makes no sense here · d38d4a9e
  Rémy Coutable authored 8 years ago
  
  Signed-off-by: Rémy Coutable <remy@rymai.me>
  Verified
  
  d38d4a9e
- Use File.write instead of File.open + File#write · 402dcab4
  Rémy Coutable authored 8 years ago
  
  Signed-off-by: Rémy Coutable <remy@rymai.me>
  Verified
  
  402dcab4
- Don't print out implementation detail step · c7af4cf8
  Rémy Coutable authored 8 years ago
  
  Signed-off-by: Rémy Coutable <remy@rymai.me>
  Verified
  
  c7af4cf8
Oct 21, 2016
- Change the approach to check if patches apply cleanly · af669cbe
  Rémy Coutable authored 8 years ago
  
  Signed-off-by: Rémy Coutable <remy@rymai.me>
  Verified
  
  af669cbe

Admin message

Admin message