diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-12-08 02:30:17 +0300 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-12-08 02:30:17 +0300 |
| commit | 22666b78080a02951d4c6a732ca4b0b6e1beb4b7 (patch) | |
| tree | 465bde07ccc632ce864a15e669dc9e11789a05d9 /lib | |
| parent | 73a79f7efbd8dec42b4a344faa3df5bf1c57a315 (diff) | |
| parent | e6ac6734c2f636d3d063718a95ba1169e299b51f (diff) | |
Merge branch '40825-use-relative-path-urls' into 'master'
Use relative _path helper URLs in the GitLab UI
Closes #40825
See merge request gitlab-org/gitlab-ce!15738
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/api/entities.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb index 62ee20bf7de..d96e7f2770f 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -16,10 +16,13 @@ module API class UserBasic < UserSafe expose :state + expose :avatar_url do |user, options| user.avatar_url(only_path: false) end + expose :avatar_path, if: ->(user, options) { options.fetch(:only_path, false) && user.avatar_path } + expose :web_url do |user, options| Gitlab::Routing.url_helpers.user_url(user) end |