summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2016-01-06 13:06:01 +0100
committerDouwe Maan <douwe@gitlab.com>2016-01-06 13:06:01 +0100
commitc0849101e6d79bed12c830986c7ff63b2e2f3d9e (patch)
tree23338ba74654a5cd8b75adc21921f5cd6621b459 /lib
parent097faeb481db2a4956b41049c041d55f5da4e2c1 (diff)
parent95b1adb3394851132ea7ecb3104e9a857bdad82f (diff)
downloadgitlab-ce-c0849101e6d79bed12c830986c7ff63b2e2f3d9e.tar.gz
Merge branch 'master' into merge-when-build-succeeds-uncheckedmerge-when-build-succeeds-unchecked
Diffstat (limited to 'lib')
-rw-r--r--lib/api/users.rb2
-rw-r--r--lib/version_check.rb2
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