Commit 2990c23f authored by Lin Jen-Shin's avatar Lin Jen-Shin

Fix bad conflict resolution

parent d8fd8d84
...@@ -78,7 +78,8 @@ module LicenseHelper ...@@ -78,7 +78,8 @@ module LicenseHelper
def show_promotions?(selected_user = current_user) def show_promotions?(selected_user = current_user)
return false unless selected_user return false unless selected_user
if Gitlab::CurrentSettings.should_check_namespace_plan? if Gitlab::CurrentSettings.current_application_settings
.should_check_namespace_plan?
true true
else else
license = License.current license = License.current
......
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