Merge branch 'master' into moderation
This commit is contained in:
commit
effb1b7f41
438 changed files with 83811 additions and 57285 deletions
|
@ -8,6 +8,7 @@ class DiaryEntryController < ApplicationController
|
|||
before_action :check_database_readable
|
||||
before_action :check_database_writable, :only => [:new, :edit, :comment, :hide, :hidecomment, :subscribe, :unsubscribe]
|
||||
before_action :require_administrator, :only => [:hide, :hidecomment]
|
||||
before_action :allow_thirdparty_images, :only => [:new, :edit, :list, :view, :comments]
|
||||
|
||||
def new
|
||||
@title = t "diary_entry.new.title"
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue