diff --git a/app/views/issues/_issue_replies.html.erb b/app/views/issues/_issue_replies.html.erb index af498b83a..4c5c922f0 100644 --- a/app/views/issues/_issue_replies.html.erb +++ b/app/views/issues/_issue_replies.html.erb @@ -70,12 +70,11 @@
-
+
<%= render :partial => 'attachments/issue_reply', :locals => {:container => @issue} %>
-
- +
<% end %>
@@ -83,4 +82,5 @@
+
\ No newline at end of file diff --git a/db/schema.rb b/db/schema.rb index 9f8b75be4..d60f351dd 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -1213,6 +1213,7 @@ ActiveRecord::Schema.define(:version => 20160115125217) do create_table "org_members", :force => true do |t| t.integer "user_id" t.integer "organization_id" + t.string "role" t.datetime "created_at", :null => false t.datetime "updated_at", :null => false end @@ -1366,7 +1367,6 @@ ActiveRecord::Schema.define(:version => 20160115125217) do t.integer "changeset_num", :default => 0 t.integer "board_message_num", :default => 0 t.integer "board_num", :default => 0 - t.integer "act_num", :default => 0 t.integer "attach_num", :default => 0 end