remove GIT part 1

Gemfile

@@ -61,7 +61,11 @@ gem "rolify"
 gem "cancan"
 
 # Fileupload
+<<<<<<< HEAD
 gem 'paperclip' ,'~>3.4.0'
 
 # Git
 gem 'git'
+=======
+gem 'paperclip' ,'~>3.4.0'
+>>>>>>> parent of 1085698... add GIT gem

Gemfile.lock

@@ -56,6 +56,7 @@ GEM
     formtastic-bootstrap (2.0.0)
       formtastic (~> 2.2)
       formtastic-bootstrap
+    git (1.2.5)
     globalize3 (0.3.0)
       activemodel (>= 3.0.0)
       activerecord (>= 3.0.0)
@@ -153,6 +154,7 @@ DEPENDENCIES
   execjs (~> 1.4.0)
   formtastic (~> 2.2.1)
   formtastic-bootstrap
+  git
   globalize3 (~> 0.3.0)
   jquery-rails
   paper_trail (>= 2.7.0)

app/controllers/config_controller.rb

@@ -2,5 +2,9 @@ class ConfigController < ApplicationController
   def index
     
   end
-
+  def get_git_update
+    g = Git.open(".")
+    flash[:notice] =g.remote("github").fetch
+    redirect_to url_for(:action => 'index', :controller => 'config')
+  end
 end

app/views/config/index.html.erb

@@ -4,4 +4,8 @@
 <%= link_to '<i class="icon-user"></i>'.html_safe + 'Userverwaltung',:controller =>"users",:action => "index" %>
 </li>
 </ul>
+<%= link_to 'Update',:controller =>"config",:action => "get_git_update" %>
+
+
+
 

config/routes.rb

@@ -9,6 +9,9 @@ Fetsite::Application.routes.draw do
 scope '(:locale)/admin' do
 resources :users
 get 'config',:controller=>:config,:action=>:index
+#get 'config/get_git_update',:controller=>:config,:action=>:get_git_update
+
+
 end