diff options
| author | Douwe Maan <douwe@gitlab.com> | 2016-01-06 13:06:50 +0100 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2016-01-06 13:06:50 +0100 |
| commit | 2474a5921fe4ecad6e70785b5b956d8713a084bd (patch) | |
| tree | 4970e800a67f14f297f3f1bf83f1320b44df2204 /lib | |
| parent | 0b661516324862506d5ec30c44cac704346a90ad (diff) | |
| parent | 95b1adb3394851132ea7ecb3104e9a857bdad82f (diff) | |
| download | gitlab-ce-2474a5921fe4ecad6e70785b5b956d8713a084bd.tar.gz | |
Merge branch 'master' into milestone-ref
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/api/users.rb | 2 | ||||
| -rw-r--r-- | lib/version_check.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/api/users.rb b/lib/api/users.rb index 3400f0713ef..0d7813428e2 100644 --- a/lib/api/users.rb +++ b/lib/api/users.rb @@ -39,7 +39,7 @@ module API if current_user.is_admin? present @user, with: Entities::UserFull else - present @user, with: Entities::UserBasic + present @user, with: Entities::User end end diff --git a/lib/version_check.rb b/lib/version_check.rb index ea23344948c..91ad07feee5 100644 --- a/lib/version_check.rb +++ b/lib/version_check.rb @@ -13,6 +13,6 @@ class VersionCheck end def host - 'https://version.gitlab.com/check.png' + 'https://version.gitlab.com/check.svg' end end |