diff options
author | Lin Jen-Shin <godfat@godfat.org> | 2017-05-18 15:33:52 +0800 |
---|---|---|
committer | Lin Jen-Shin <godfat@godfat.org> | 2017-05-18 15:33:52 +0800 |
commit | 54a8cbddb16338bf48aa04143566ccd33646d769 (patch) | |
tree | 82fe3eb4b1b6a8bade602f8f17e488564e6cd2a7 /lib | |
parent | 226b517ce70674a1c25084b8535dd6869addb21e (diff) | |
parent | c9e61fa3cd8eeb63aced9a55039dc4d17616cd42 (diff) | |
download | gitlab-ce-54a8cbddb16338bf48aa04143566ccd33646d769.tar.gz |
Merge remote-tracking branch 'upstream/master' into rename-builds-controller
* upstream/master: (31 commits)
Remove 'no changes' entries from changelog
Check if OLD is set when migrating issue assignees
Fix data migration from trigger schedules
Replace EFS section in AWS guide
Add warning about AWS EFS and performance
Consolidate opening text from about.gitlab.com and add active/passive note
Fix invalid object reference in ee_compat_check script
Fix Ordered Task List Items
Add auxiliary viewer for README
Update fe_guide testing.md
Add auxiliary blob viewer for CHANGELOG
Add spec for last commit info when browsing repository files
Show last commit for current tree on tree page
Use same last commit widget on project homepage and tree view
Fix unassigned checkmark
Add missing changelog for iPython notebook rendering feature
Convert fa-history to svg; tweak alignment
Get rid of pluck in app/services/members/authorized_destroy_service.rb
Removes duplicate environment variable in documentation
Fixed spacing issues in issue sidebar
...
Diffstat (limited to 'lib')
-rw-r--r-- | lib/gitlab/ee_compat_check.rb | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/gitlab/ee_compat_check.rb b/lib/gitlab/ee_compat_check.rb index 06438d2df41..38e27513281 100644 --- a/lib/gitlab/ee_compat_check.rb +++ b/lib/gitlab/ee_compat_check.rb @@ -131,10 +131,12 @@ module Gitlab def check_patch(patch_path) step("Checking out master", %w[git checkout master]) step("Resetting to latest master", %w[git reset --hard origin/master]) + step("Fetching CE/#{ce_branch}", %W[git fetch #{CE_REPO} #{ce_branch}]) step( "Checking if #{patch_path} applies cleanly to EE/master", %W[git apply --check --3way #{patch_path}] ) do |output, status| + puts output unless status.zero? @failed_files = output.lines.reduce([]) do |memo, line| if line.start_with?('error: patch failed:') @@ -309,12 +311,12 @@ module Gitlab U lib/gitlab/ee_compat_check.rb Resolve them, stage the changes and commit them. - + If the patch couldn't be applied cleanly, use the following command: - + # In the EE repo $ git apply --reject path/to/#{ce_branch}.patch - + This option makes git apply the parts of the patch that are applicable, and leave the rejected hunks in corresponding `.rej` files. You can then resolve the conflicts highlighted in `.rej` by |