From 3a03aa7b4e1573f9226b9f59c712089254f94cd3 Mon Sep 17 00:00:00 2001
From: fastindian84 <fastindian84@gmail.com>
Date: Wed, 19 Mar 2014 10:11:31 +0200
Subject: [PATCH 1/7] gem file added without js

---
 Gemfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index c83c234..c68eef6 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,9 +2,10 @@ source 'https://rubygems.org'
 
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
 gem 'rails', '4.0.3'
+gem 'pg'
 
 # Use sqlite3 as the database for Active Record
-gem 'sqlite3'
+# gem 'sqlite3'
 
 # Use SCSS for stylesheets
 gem 'sass-rails', '~> 4.0.0'

From 7c1ee613538992286072b940ca7b720b75a064bd Mon Sep 17 00:00:00 2001
From: fastindian84 <fastindian84@gmail.com>
Date: Wed, 19 Mar 2014 10:23:20 +0200
Subject: [PATCH 2/7] app js changed

---
 app/assets/javascripts/application.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 12170aa..c13a51b 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -21,3 +21,8 @@
 
 $(function(){ $(document).foundation(); });
 
+
+
+
+alert('hi');
+

From 310400cb5618f662246e6f1bc20ecc6ba9529e02 Mon Sep 17 00:00:00 2001
From: fastindian84 <fastindian84@gmail.com>
Date: Wed, 19 Mar 2014 10:30:05 +0200
Subject: [PATCH 3/7] alert 2

---
 app/assets/javascripts/application.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index c13a51b..18a2417 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -25,4 +25,6 @@ $(function(){ $(document).foundation(); });
 
 
 alert('hi');
+alert('hi2');
+
 

From 15e3f3af46b0045c9d66e80ba8f5507b8cd2a21d Mon Sep 17 00:00:00 2001
From: fastindian84 <fastindian84@gmail.com>
Date: Wed, 19 Mar 2014 11:50:53 +0200
Subject: [PATCH 4/7] js changed

---
 app/assets/javascripts/application.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 18a2417..b12b8e2 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -26,5 +26,9 @@ $(function(){ $(document).foundation(); });
 
 alert('hi');
 alert('hi2');
+alert('hi2');
+alert('hi2');
+alert('hi2');
+alert('hi2');
 
 

From 02fc8270f8e5a2372d349e434c9d4653c048d3c7 Mon Sep 17 00:00:00 2001
From: fastindian84 <fastindian84@gmail.com>
Date: Wed, 19 Mar 2014 12:35:18 +0200
Subject: [PATCH 5/7] js changed again

---
 app/assets/javascripts/application.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index b12b8e2..6d9bfef 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -26,9 +26,9 @@ $(function(){ $(document).foundation(); });
 
 alert('hi');
 alert('hi2');
-alert('hi2');
-alert('hi2');
-alert('hi2');
-alert('hi2');
+alert('Sprockets');
+alert('Sprockets');
+
+
 
 

From 23abb0eb9ad9d6efa9c3084d780b2e9bb1d342df Mon Sep 17 00:00:00 2001
From: fastindian84 <fastindian84@gmail.com>
Date: Wed, 19 Mar 2014 12:44:21 +0200
Subject: [PATCH 6/7] rebase commit

---
 app/assets/javascripts/application.js | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 6d9bfef..1cc03af 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -24,10 +24,7 @@ $(function(){ $(document).foundation(); });
 
 
 
-alert('hi');
-alert('hi2');
-alert('Sprockets');
-alert('Sprockets');
+alert('after rebase');
 
 
 

From 4b431f4552ee52aa3dc622e2aec54342cffe3820 Mon Sep 17 00:00:00 2001
From: fastindian84 <fastindian84@gmail.com>
Date: Wed, 19 Mar 2014 12:48:30 +0200
Subject: [PATCH 7/7] last commit

---
 app/assets/javascripts/application.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 1cc03af..1bfe5c1 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -24,7 +24,7 @@ $(function(){ $(document).foundation(); });
 
 
 
-alert('after rebase');
+console.log('last commit');