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

Conflicts:
	app/controllers/config_controller.rb
	app/views/config/index.html.erb
	config/routes.rb

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

app/views/config/index.html.erb

@@ -5,6 +5,7 @@
 </li>
 </ul>
 <%= link_to 'Update',config_getgitupdate_url %>
+<%= link_to 'Update',:controller =>"config",:action => "get_git_update" %>
 
 
 

config/routes.rb

@@ -5,6 +5,7 @@ Fetsite::Application.routes.draw do
   resources :beispiele
 
 
+  devise_for :users
 
 scope '(:locale)/admin' do
 resources :users
@@ -12,6 +13,9 @@ get 'config',:controller=>:config,:action=>:index , :as => 'config'
 get 'config/get_git_update',:controller=>:config,:action=>:get_git_update, :as=>'config_getgitupdate'
 
 
+get 'config/get_git_update',:controller=>:config,:action=>:get_git_update
+
+
 end
 
 devise_for :users