Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Indentation/formatting changes

  • Loading branch information...
commit 7cc65c91e1d523df6127384fbb900df5b3754fa4 1 parent 12fd5b8
Joe Peck authored
View
2  Gemfile
@@ -20,8 +20,6 @@ group :assets do
gem 'uglifier', '>= 1.0.3'
end
-
-
# To use ActiveModel has_secure_password
# gem 'bcrypt-ruby', '~> 3.0.0'
View
1  app/models/event.rb
@@ -7,6 +7,7 @@ class Event < ActiveRecord::Base
def calculate_event_details
calculate_event_time
end
+
def calculate_event_time
timeslots.all(order: votes).first
end
View
20 app/views/layouts/application.html.erb
@@ -1,14 +1,12 @@
<!DOCTYPE html>
<html>
-<head>
- <title>Temptd</title>
- <%= stylesheet_link_tag "application", :media => "all" %>
- <%= javascript_include_tag "application" %>
- <%= csrf_meta_tags %>
-</head>
-<body>
-
-<%= yield %>
-
-</body>
+ <head>
+ <title>Temptd</title>
+ <%= stylesheet_link_tag "application", :media => "all" %>
+ <%= javascript_include_tag "application" %>
+ <%= csrf_meta_tags %>
+ </head>
+ <body>
+ <%= yield %>
+ </body>
</html>
View
2  config/routes.rb
@@ -1,9 +1,7 @@
Temptd::Application.routes.draw do
devise_for :users
-
resources :events
-
resources :votes
# The priority is based upon order of creation:
Please sign in to comment.
Something went wrong with that request. Please try again.