Merge branch 'master' of https://github.com/LukeShu/leaguer

9 files changed, 7 insertions, 55 deletions

diff --git a/app/assets/images/.keep b/app/assets/images/.keep
deleted file mode 100644
index e69de29..0000000
--- a/app/assets/images/.keep
+++ /dev/null
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
deleted file mode 100644
index d6925fa..0000000
--- a/app/assets/javascripts/application.js
+++ /dev/null
@@ -1,16 +0,0 @@
-// This is a manifest file that'll be compiled into application.js, which will include all the files
-// listed below.
-//
-// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
-// or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path.
-//
-// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
-// compiled file.
-//
-// Read Sprockets README (https://github.com/sstephenson/sprockets#sprockets-directives) for details
-// about supported directives.
-//
-//= require jquery
-//= require jquery_ujs
-//= require turbolinks
-//= require_tree .
diff --git a/app/assets/stylesheets/scaffolds.css.scss b/app/assets/stylesheets/scaffolds.css.scss
index 252cb2b..2c8c009 100644
--- a/app/assets/stylesheets/scaffolds.css.scss
+++ b/app/assets/stylesheets/scaffolds.css.scss
@@ -1,5 +1,5 @@
 body {
-  background-color: #EEEEEE;
+  background-color: #fff;
   color: #333;
   font-family: verdana, arial, helvetica, sans-serif;
   font-size: 13px;
@@ -71,7 +71,6 @@ div {
     list-style: square;
   }
 }
-
 hr {
   -moz-border-bottom-colors: none;
   -moz-border-image: none;
diff --git a/app/models/game.rb b/app/models/game.rb
index b3b6977..a181c26 100644
--- a/app/models/game.rb
+++ b/app/models/game.rb
@@ -1,3 +1,2 @@
 class Game < ActiveRecord::Base
-  has_many :game_attributes
 end
diff --git a/app/models/user.rb b/app/models/user.rb
index 55ea60f..db65dc4 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -1,7 +1,7 @@
 class User < ActiveRecord::Base
 
 	before_save { self.email = email.downcase }
-	before_save { self.user_name = user_name.downcase }
+	before_save { self.user_name = user_name }
 
 	##
 	# Rails looks for the create_remember_token and runs the method
diff --git a/app/views/games/index.html.erb b/app/views/games/index.html.erb
index 6779307..ac362cd 100644
--- a/app/views/games/index.html.erb
+++ b/app/views/games/index.html.erb
@@ -1,6 +1,6 @@
 <h1>Listing games</h1>
 
-<table class="table table-hover">
+<table>
   <thead>
     <tr>
       <th>Name</th>
@@ -32,4 +32,8 @@
 
 <br>
 
+<<<<<<< HEAD
+<%= link_to 'New Game', new_game_path %>
+=======
 <%= link_to 'New Game', new_game_path, {:class => "btn btn-warning"} %>
+>>>>>>> aca85cf084702c29014a17eafb090421061fae8b
diff --git a/app/views/tournaments/index.html.erb b/app/views/tournaments/index.html.erb
deleted file mode 100644
index 6006cad..0000000
--- a/app/views/tournaments/index.html.erb
+++ /dev/null
@@ -1,27 +0,0 @@
-<h1>Listing tournaments</h1>
-
-<table>
-  <thead>
-    <tr>
-      <th></th>
-      <th></th>
-      <th></th>
-      <th></th>
-    </tr>
-  </thead>
-
-  <tbody>
-    <% @tournaments.each do |tournament| %>
-      <tr>
-        <td><%= tournament.game %></td>
-        <td><%= link_to 'Show', tournament %></td>
-        <td><%= link_to 'Edit', edit_tournament_path(tournament) %></td>
-        <td><%= link_to 'Destroy', tournament, method: :delete, data: { confirm: 'Are you sure?' } %></td>
-      </tr>
-    <% end %>
-  </tbody>
-</table>
-
-<br>
-
-<%= link_to 'New Tournament',  new_tournament_path, :class => "btn btn-warning btn-lg" %>
diff --git a/app/views/users/edit.html.erb b/app/views/users/edit.html.erb
deleted file mode 100644
index 99bd4cc..0000000
--- a/app/views/users/edit.html.erb
+++ /dev/null
@@ -1,6 +0,0 @@
-<h1>Editing user</h1>
-
-<%= render 'form' %>
-
-<%= link_to 'Show', @user %> |
-<%= link_to 'Back', users_path %>
diff --git a/app/views/users/show.json.jbuilder b/app/views/users/show.json.jbuilder
deleted file mode 100644
index 1262e80..0000000
--- a/app/views/users/show.json.jbuilder
+++ /dev/null
@@ -1 +0,0 @@
-json.extract! @user, :id, :name, :pw_hash, :created_at, :updated_at