diff options
author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-06-13 15:19:14 +0300 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-06-13 15:19:14 +0300 |
commit | 15c27192c0fa4e33188c3f6663362faca02df8af (patch) | |
tree | 2cbac2abf10cb88afdf03319c58f65ebd88c6cfd /lib/api/entities.rb | |
parent | d3d0775acde8dbbb887665c3c52009d76e906d10 (diff) | |
parent | d593c98fcbd34789068a72c9386f69a152107139 (diff) | |
download | gitlab-ce-15c27192c0fa4e33188c3f6663362faca02df8af.tar.gz |
Merge branch 'remove-wall'
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Conflicts:
CHANGELOG
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 6bad6c74bca..f15fe185ae0 100644 --- a/lib/api/entities.rb +++ b/lib/api/entities.rb @@ -48,7 +48,7 @@ module API expose :owner, using: Entities::UserBasic, unless: ->(project, options) { project.group } expose :name, :name_with_namespace expose :path, :path_with_namespace - expose :issues_enabled, :merge_requests_enabled, :wall_enabled, :wiki_enabled, :snippets_enabled, :created_at, :last_activity_at + expose :issues_enabled, :merge_requests_enabled, :wiki_enabled, :snippets_enabled, :created_at, :last_activity_at expose :namespace expose :forked_from_project, using: Entities::ForkedFromProject, :if => lambda{ | project, options | project.forked? } end |