Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
gitlab-ce
Commits
f5ab0f52
Commit
f5ab0f52
authored
Nov 22, 2017
by
Rémy Coutable
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Generate the patch against `origin/#{branch}` instead of just `#{branch}`
parent
eceec267
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
lib/gitlab/ee_compat_check.rb
lib/gitlab/ee_compat_check.rb
+1
-1
No files found.
lib/gitlab/ee_compat_check.rb
View file @
f5ab0f52
...
@@ -91,7 +91,7 @@ module Gitlab
...
@@ -91,7 +91,7 @@ module Gitlab
step
(
step
(
"Generating the patch against
#{
remote
}
/master in
#{
patch_path
}
"
,
"Generating the patch against
#{
remote
}
/master in
#{
patch_path
}
"
,
%W[git diff --binary
#{
remote
}
/master...
#{
branch
}
]
%W[git diff --binary
#{
remote
}
/master...
origin/
#{
branch
}
]
)
do
|
output
,
status
|
)
do
|
output
,
status
|
throw
(
:halt_check
,
:ko
)
unless
status
.
zero?
throw
(
:halt_check
,
:ko
)
unless
status
.
zero?
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment