fix changes, still wip

app/controllers/merged/cards_controller.rb

@@ -18,7 +18,7 @@ module Merged
       else
         @card.move_down
       end
-      @card.save
+      @card.save(current_member)
       redirect_to section_cards_url(@card.section.id),notice: "#{@card.header} moved"
     end
 

app/controllers/merged/changes_controller.rb

@@ -11,8 +11,8 @@ module Merged
     def commit
       raise "must have message" if params[:message].blank?
       git = Git.open(Rails.root)
-      git.add("cms")
+      git.add("merged")
-      git.add("app/assets/images/cms")
+      git.add( Image.root )
       begin
         git.commit(params[:message])
       rescue

app/helpers/merged/changes_helper.rb

@@ -1,4 +1,10 @@
 module Merged
   module ChangesHelper
+
+    def cms_part? name
+      return true if name.include?( Image.root )
+      return true if name.include?("merged/")
+      false
+    end
   end
 end

app/models/merged/image.rb

@@ -70,6 +70,10 @@ module Merged
       end
     end
 
+    def self.root
+      "app/assets/images/cms"
+    end
+
     private
 
     def asset_root

app/views/merged/changes/index.haml

@@ -11,25 +11,24 @@
   .relative.block.border.border-gray-100
     Changed Files
     [email protected] do |name , file|
-      -next unless name.include?("cms")
+      -next unless cms_part?(name)
       %p
         = name
 
   .relative.block.border.border-gray-100
     Deletions
     [email protected] do |name , file|
-      -next unless name.include?("cms")
+      -next unless cms_part?(name)
       %p= name
   .relative.block.border.border-gray-100
     Additions
     [email protected] do |name , file|
-      -next unless name.include?("cms")
+      -next unless cms_part?(name)
       %p= name
   .relative.block.border.border-gray-100
     New
     [email protected] do |name , file|
-      -next if name.starts_with?("merged")
+      -next unless cms_part?(name)
-      -next unless name.include?("cms")
       %p
         = name