user can log out and added some css

drewtunney · Feb 18, 2014 · 8b26b38 · 8b26b38
1 parent 520b1ba
commit 8b26b38
Show file tree

Hide file tree

Showing 8 changed files with 463 additions and 22 deletions.
diff --git a/Gemfile b/Gemfile
@@ -19,7 +19,7 @@ gem 'coffee-rails', '~> 4.0.0'
 # gem 'therubyracer', platforms: :ruby
 
 # Use jquery as the JavaScript library
-gem 'jquery-rails'
+gem 'jquery-rails', '~> 2.1'
 
 # Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks
 gem 'turbolinks'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -50,7 +50,7 @@ GEM
     jbuilder (1.5.3)
       activesupport (>= 3.0.0)
       multi_json (>= 1.2.0)
-    jquery-rails (3.1.0)
+    jquery-rails (2.3.0)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
     json (1.8.1)
@@ -153,7 +153,7 @@ DEPENDENCIES
   coffee-rails (~> 4.0.0)
   httparty
   jbuilder (~> 1.2)
-  jquery-rails
+  jquery-rails (~> 2.1)
   omniauth
   omniauth-facebook
   pg

diff --git a/app/assets/images/gray_squares.png b/app/assets/images/gray_squares.png
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
@@ -14,3 +14,4 @@
 //= require jquery_ujs
 //= require turbolinks
 //= require_tree .
+
Original file line number	Diff line number	Diff line change
Expand Up		@@ -14,3 +14,4 @@
		//= require jquery_ujs
		//= require turbolinks
		//= require_tree .