diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2017-02-21 02:14:31 +0800 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2017-02-21 02:14:31 +0800 |
| commit | a538b0da9b34fb1b0f24607ff7dca2250ffdd4ea (patch) | |
| tree | 5a49647dcf20067a6e8053106b3a3d124b87243e /lib/api/entities.rb | |
| parent | eede4ab1a2509ef4aa14d21527386224c4116adc (diff) | |
| parent | 9fe863f43db93b5b8a4617cb1722d92d31c6ea5e (diff) | |
| download | gitlab-ce-a538b0da9b34fb1b0f24607ff7dca2250ffdd4ea.tar.gz | |
Merge remote-tracking branch 'upstream/master' into 27762-add-default-artifacts-expiration
* upstream/master: (234 commits)
Improve performance of User Agent Detail
Fix some grammar in the API docs
Remove shared example for pagination
API: Use POST to (un)block a user
API: Moved `DELETE /projects/:id/star` to `POST /projects/:id/unstar`
Use grape validation for dates
Change wording for LDAP doc that was moved to a new location
API: Remove `DELETE projects/:id/deploy_keys/:key_id/disable`
Download snippets with LF line-endings by default
utilize pre-minified Vue in production since no CJS distribution is available
Prevent project team from being truncated too early during project destruction
loading icon sometimes toggled alongside MR pipeline contents
fix failed spec because haml_lint
fix incorrect sidekiq concurrency count in admin background page
exclude rpc_pipefs from system disc info
Fix wrong line ending [ci-skip]
fix overlooked window binding in spec files
remove imports loader
replace implicit this == window with explicit binding
Todo done clicking is kind of unusable.
...
Diffstat (limited to 'lib/api/entities.rb')
| -rw-r--r-- | lib/api/entities.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/api/entities.rb b/lib/api/entities.rb index 94f5bd510c9..ff27856b800 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -26,7 +26,7 @@ module API expose :last_sign_in_at expose :confirmed_at expose :email - expose :theme_id, :color_scheme_id, :projects_limit, :current_sign_in_at + expose :color_scheme_id, :projects_limit, :current_sign_in_at expose :identities, using: Entities::Identity expose :can_create_group?, as: :can_create_group expose :can_create_project?, as: :can_create_project |