Merge remote-tracking branch 'remotes/origin/master'

Conflicts: app/controllers/config_controller.rb app/views/config/index.html.erb config/routes.rb
2013-02-17 15:57:05 +01:00
parent 5b8b419fa1 6acd562297
commit f17b269458
3 changed files with 7 additions and 0 deletions
--- a/app/controllers/config_controller.rb
+++ b/app/controllers/config_controller.rb
@@ -4,8 +4,10 @@ class ConfigController < ApplicationController
  end
  def get_git_update
    g = Git.open(".")
+
    flash[:notice] =g.status
 #    flash[:notice] =g.remote("github").fetch
   redirect_to config_url
+
  end
 end