Skip to content
Snippets Groups Projects

WIP: Resolve "GitLab CE features to work with unlicensed EE instance"

Closed Rubén Dávila requested to merge 2500-dont-block-changes-for-unlicensed-ee into master
5 files
+ 6
52
Compare changes
  • Side-by-side
  • Inline
Files
5
@@ -19,38 +19,11 @@ def license_message(signed_in: signed_in?, is_admin: (current_user && current_us
@license_message =
if License.current
yes_license_message(signed_in, is_admin)
else
no_license_message(is_admin, in_html: in_html)
end
end
private
def no_license_message(is_admin, in_html: true)
upload_a_license =
if in_html
link_to('Upload a license', new_admin_license_path)
else
'Upload a license'
end
message = []
message << 'No GitLab Enterprise Edition license has been provided yet.'
message << 'Pushing code and creation of issues and merge requests has been disabled.'
message <<
if is_admin
"#{upload_a_license} in the admin area to activate this functionality."
else
'Ask an admin to upload a license to activate this functionality.'
end
if in_html
content_tag(:p, message.join(' ').html_safe)
else
message.join(' ')
end
end
def yes_license_message(signed_in, is_admin)
license = License.current
Loading