Commit 4314ab10 authored by Stan Hu's avatar Stan Hu

Make license nag text consistent

Closes #610
parent 8a9cbb47
...@@ -71,7 +71,7 @@ module LicenseHelper ...@@ -71,7 +71,7 @@ module LicenseHelper
message << "Your GitLab license currently covers #{license.user_count}" message << "Your GitLab license currently covers #{license.user_count}"
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 number of licensed users."
message << "Note: This message is only visible to you as an admin." message << "Note: This message is only visible to you as an admin."
end end
......
...@@ -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. Note: This message is only visible to you as an admin.' 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 number of licensed users. 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