summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home>2016-04-16 16:00:30 -0400
committerJacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home>2016-04-16 16:00:30 -0400
commite79b0dd762719828203bd48c253a88d876bcf61a (patch)
tree7cb145df1d9d0f14d941bd52a1797a1f8a53ab38
parentffd2416c5636917c0da0a3376342d6c465bb1954 (diff)
downloadgitlab-ce-e79b0dd762719828203bd48c253a88d876bcf61a.tar.gz
Simplify random user generation.
-rw-r--r--app/controllers/help_controller.rb7
-rw-r--r--app/views/help/ui.html.haml12
2 files changed, 7 insertions, 12 deletions
diff --git a/app/controllers/help_controller.rb b/app/controllers/help_controller.rb
index 406142f29c7..9b5c43b17e2 100644
--- a/app/controllers/help_controller.rb
+++ b/app/controllers/help_controller.rb
@@ -51,12 +51,7 @@ class HelpController < ApplicationController
end
def ui
- # this will work on gitlab.com
- @some_user = User.find_by(username: 'dzaporozhets')
- if @some_user.nil?
- # this will work in dev
- @some_user = User.find(1)
- end
+ @user = User.new(id: 0, name: 'John Doe', username: '@johndoe')
end
private
diff --git a/app/views/help/ui.html.haml b/app/views/help/ui.html.haml
index 64414f5d8b2..f12df5c8ffe 100644
--- a/app/views/help/ui.html.haml
+++ b/app/views/help/ui.html.haml
@@ -345,11 +345,11 @@
%ul
%li
%a.dropdown-menu-user-link.is-active{href: "#"}
- = link_to_member_avatar(@some_user, size: 30)
+ = link_to_member_avatar(@user, size: 30)
%strong.dropdown-menu-user-full-name
- = @some_user.name
+ = @user.name
.dropdown-menu-user-username
- = @some_user.to_reference
+ = @user.to_reference
.example
%div
@@ -372,11 +372,11 @@
%ul
%li
%a.dropdown-menu-user-link.is-active{href: "#"}
- = link_to_member_avatar(@some_user, size: 30)
+ = link_to_member_avatar(@user, size: 30)
%strong.dropdown-menu-user-full-name
- = @some_user.name
+ = @user.name
.dropdown-menu-user-username
- = @some_user.to_reference
+ = @user.to_reference
.dropdown-page-two
.dropdown-title
%button.dropdown-title-button.dropdown-menu-back{aria: {label: "Go back"}}