diff options
author | Tomer Kimia <tkimia@purdue.edu> | 2014-03-30 19:32:27 -0400 |
---|---|---|
committer | Tomer Kimia <tkimia@purdue.edu> | 2014-03-30 19:32:27 -0400 |
commit | cd6b94cfc989800d65acc0fbceeebe35da5be4af (patch) | |
tree | c1cf421ae1393f9f6172a6c0ba470f9a544ea4ba | |
parent | 93b69d2dd69f8fc9dc12bb0ec710891f9d660645 (diff) | |
parent | 13489e34d8a99e452ab10ee5659eb2a6704c8da3 (diff) |
Merge branch 'master' of https://github.com/LukeShu/leaguer
-rw-r--r-- | app/views/users/show.html.erb | 4 | ||||
-rwxr-xr-x | generate.sh | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index d8cc82b..dafa73e 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -1,4 +1,8 @@ <p> + <%= image_tag 'http://www.gravatar.com/avatar/' + Digest::MD5.hexdigest(@user.email) + '?s=100&d=mm' %> +</p> + +<p> <strong>Name:</strong> <%= @user.name %> </p> diff --git a/generate.sh b/generate.sh index bf0c18c..328a08f 100755 --- a/generate.sh +++ b/generate.sh @@ -33,6 +33,7 @@ bundle exec rails generate scaffold game \ set_rounds:integer randomized_teams:boolean bundle exec rails generate scaffold user name:string email:string:uniq user_name:string:uniq bundle exec rails generate scaffold session user:references +bundle exec rails generate scaffold remote_username game:references user:references user_name:string # Just models bundle exec rails generate model server_setting $NOTEST |