nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' of github.com:diaspora/diaspora into develop

Browse source
This commit is contained in:
Jonne Haß 2013-12-02 00:01:02 +01:00
commit b39b0f05d0
1 changed files with 1057 additions and 1057 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
config/initializers/rails_admin.rb
View file

@ -1,13 +1,13 @@
# RailsAdmin config file. Generated on March 24, 2012 15:34 # RailsAdmin config file. Generated on March 24, 2012 15:34
# See github.com/sferik/rails_admin for more informations # See github.com/sferik/rails_admin for more informations
if Rails.env.production? if Rails.env.production?
# Recommended way to deal with Kaminari vs. WillPaginate issues # Recommended way to deal with Kaminari vs. WillPaginate issues
if defined?(WillPaginate) if defined?(WillPaginate)
Kaminari.configure do |config| Kaminari.configure do |config|
config.page_method_name = :per_page_kaminari config.page_method_name = :per_page_kaminari
end end
end end
RailsAdmin.config do |config| RailsAdmin.config do |config|
config.authorize_with do config.authorize_with do
redirect_to main_app.root_path unless current_user.try(:admin?) redirect_to main_app.root_path unless current_user.try(:admin?)
end end
@ -40,7 +40,7 @@ RailsAdmin.config do |config|
# ==> Included models # ==> Included models
# Add all excluded models here: # Add all excluded models here:
config.excluded_models = [AspectMembership, AspectVisibility, ShareVisibility, ConversationVisibility, NotificationActor, Notifications::AlsoCommented, Notifications::CommentOnPost, Notifications::Liked, Notifications::Mentioned, Notifications::PrivateMessage, Notifications::RequestAccepted, Notifications::Reshared, Notifications::StartedSharing, Reshare, Services::Facebook, Services::Tumblr, Services::Twitter, UserPreference] config.excluded_models = [AspectMembership, AspectVisibility, ShareVisibility, ConversationVisibility, NotificationActor, Notifications::AlsoCommented, Notifications::CommentOnPost, Notifications::Liked, Notifications::Mentioned, Notifications::PrivateMessage, Notifications::RequestAccepted, Notifications::Reshared, Notifications::StartedSharing, Reshare, Services::Facebook, Services::Tumblr, Services::Twitter, UserPreference, ActsAsTaggableOn::Tag]
# Add models here if you want to go 'whitelist mode': # Add models here if you want to go 'whitelist mode':
# config.included_models = [AccountDeletion, ActsAsTaggableOn::Tag, Aspect, AspectMembership, AspectVisibility, Block, Comment, Contact, Conversation, ConversationVisibility, Invitation, InvitationCode, Like, Mention, Message, Notification, NotificationActor, Notifications::AlsoCommented, Notifications::CommentOnPost, Notifications::Liked, Notifications::Mentioned, Notifications::PrivateMessage, Notifications::RequestAccepted, Notifications::Reshared, Notifications::StartedSharing, OEmbedCache, Participation, Person, Photo, Pod, Post, Profile, Reshare, Service, ServiceUser, Services::Facebook, Services::Tumblr, Services::Twitter, ShareVisibility, StatusMessage, TagFollowing, User, UserPreference] # config.included_models = [AccountDeletion, ActsAsTaggableOn::Tag, Aspect, AspectMembership, AspectVisibility, Block, Comment, Contact, Conversation, ConversationVisibility, Invitation, InvitationCode, Like, Mention, Message, Notification, NotificationActor, Notifications::AlsoCommented, Notifications::CommentOnPost, Notifications::Liked, Notifications::Mentioned, Notifications::PrivateMessage, Notifications::RequestAccepted, Notifications::Reshared, Notifications::StartedSharing, OEmbedCache, Participation, Person, Photo, Pod, Post, Profile, Reshare, Service, ServiceUser, Services::Facebook, Services::Tumblr, Services::Twitter, ShareVisibility, StatusMessage, TagFollowing, User, UserPreference]
@ -1058,5 +1058,5 @@ RailsAdmin.config do |config|
# create do; end # create do; end
# update do; end # update do; end
# end # end
end end
end end