Commit 8a9cbb47 authored by Stan Hu's avatar Stan Hu

Make it clear the license overusage is visible only to admins

Closes #607
parent 43c1e272
...@@ -3,6 +3,7 @@ Please view this file on the master branch, on stable branches it's out of date. ...@@ -3,6 +3,7 @@ Please view this file on the master branch, on stable branches it's out of date.
v 8.9.0 (unreleased) v 8.9.0 (unreleased)
v 8.8.3 v 8.8.3
- Make it clear the license overusage is visible only to admins
- Reduce load on DB for license upgrade check - Reduce load on DB for license upgrade check
v 8.8.2 v 8.8.2
......
...@@ -72,7 +72,7 @@ module LicenseHelper ...@@ -72,7 +72,7 @@ module LicenseHelper
message << "users, but it looks like your site has grown to" message << "users, but it looks like your site has grown to"
message << "#{current_active_user_count} users. Please contact" message << "#{current_active_user_count} users. Please contact"
message << "sales@gitlab.com to increase the seats on your license." message << "sales@gitlab.com to increase the seats on your license."
message << "Thank you for choosing GitLab." message << "Note: This message is only visible to you as an admin."
end end
message.join(" ") message.join(" ")
......
...@@ -35,7 +35,7 @@ describe LicenseHelper do ...@@ -35,7 +35,7 @@ describe LicenseHelper do
allow(license).to receive(:restrictions).and_return({ active_user_count: 50 }) allow(license).to receive(:restrictions).and_return({ active_user_count: 50 })
allow(User).to receive(:active).and_return(Array.new(100)) allow(User).to receive(:active).and_return(Array.new(100))
warn_msg = 'Your GitLab license currently covers 50 users, but it looks like your site has grown to 100 users. Please contact sales@gitlab.com to increase the seats on your license. Thank you for choosing GitLab.' warn_msg = 'Your GitLab license currently covers 50 users, but it looks like your site has grown to 100 users. Please contact sales@gitlab.com to increase the seats on your license. Note: This message is only visible to you as an admin.'
expect(license_message(signed_in: true, is_admin: true)).to eq(warn_msg) expect(license_message(signed_in: true, is_admin: true)).to eq(warn_msg)
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment