Allow non-admin users to see version informationrs-help-page

We want users to know what features they have available (and to pressure
their admins to upgrade).

2 files changed, 6 insertions, 19 deletions

diff --git a/app/views/help/index.html.haml b/app/views/help/index.html.haml
index 2333e6fdf1d..57bc91ea5a9 100644
--- a/app/views/help/index.html.haml
+++ b/app/views/help/index.html.haml
@@ -2,7 +2,7 @@
   %h1
     GitLab
     Community Edition
-    - if current_user && current_user.admin?
+    - if user_signed_in?
       %span= Gitlab::VERSION
       %small= Gitlab::REVISION
       = version_status_badge
diff --git a/spec/views/help/index.html.haml_spec.rb b/spec/views/help/index.html.haml_spec.rb
index 91cf4cb98c0..6b07fcfc987 100644
--- a/spec/views/help/index.html.haml_spec.rb
+++ b/spec/views/help/index.html.haml_spec.rb
@@ -3,18 +3,7 @@ require 'rails_helper'
 describe 'help/index' do
   describe 'version information' do
     it 'is hidden from guests' do
-      stub_user
-      stub_version('8.0.2', 'abcdefg')
-      stub_helpers
-
-      render
-
-      expect(rendered).not_to match '8.0.2'
-      expect(rendered).not_to match 'abcdefg'
-    end
-
-    it 'is hidden from users' do
-      stub_user(admin?: false)
+      stub_user(nil)
       stub_version('8.0.2', 'abcdefg')
       stub_helpers
 
@@ -24,8 +13,8 @@ describe 'help/index' do
       expect(rendered).not_to match 'abcdefg'
     end
 
-    it 'is shown to admins' do
-      stub_user(admin?: true)
+    it 'is shown to users' do
+      stub_user
       stub_version('8.0.2', 'abcdefg')
       stub_helpers
 
@@ -36,10 +25,8 @@ describe 'help/index' do
     end
   end
 
-  def stub_user(messages = {})
-    user = messages.empty? ? nil : double(messages)
-
-    allow(view).to receive(:current_user).and_return(user)
+  def stub_user(user = double)
+    allow(view).to receive(:user_signed_in?).and_return(user)
   end
 
   def stub_version(version, revision)