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
Jérome Perrin
gitlab-ce
Commits
82818650
Commit
82818650
authored
Sep 15, 2017
by
Lin Jen-Shin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update ee_compat_check for community contributors
parent
6be736a7
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
1 deletion
+6
-1
lib/gitlab/ee_compat_check.rb
lib/gitlab/ee_compat_check.rb
+6
-1
No files found.
lib/gitlab/ee_compat_check.rb
View file @
82818650
...
@@ -284,13 +284,18 @@ module Gitlab
...
@@ -284,13 +284,18 @@ module Gitlab
EE/master, and no `
#{
ee_branch_prefix
}
` or `
#{
ee_branch_suffix
}
` branch
EE/master, and no `
#{
ee_branch_prefix
}
` or `
#{
ee_branch_suffix
}
` branch
was found in the EE repository.
was found in the EE repository.
If you're a community contributor, don't worry, someone from
GitLab Inc. will take care of this, and you don't have to do anything.
If you're willing to help, and are ok to contribute to EE as well,
you're welcome to help. You could follow the instructions below.
#{
conflicting_files_msg
}
#{
conflicting_files_msg
}
We advise you to create a `
#{
ee_branch_prefix
}
` or `
#{
ee_branch_suffix
}
`
We advise you to create a `
#{
ee_branch_prefix
}
` or `
#{
ee_branch_suffix
}
`
branch that includes changes from `
#{
ce_branch
}
` but also specific changes
branch that includes changes from `
#{
ce_branch
}
` but also specific changes
than can be applied cleanly to EE/master. In some cases, the conflicts
than can be applied cleanly to EE/master. In some cases, the conflicts
are trivial and you can ignore the warning from this job. As always,
are trivial and you can ignore the warning from this job. As always,
use your best judgment!
use your best judg
e
ment!
There are different ways to create such branch:
There are different ways to create such branch:
...
...
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