Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: nmunson/poffpool
base: 25b4f4f169
...
head fork: nmunson/poffpool
compare: 495235514a
Checking mergeability… Don't worry, you can still create the pull request.
  • 2 commits
  • 2 files changed
  • 0 commit comments
  • 1 contributor
Showing with 2 additions and 2 deletions.
  1. +1 −1  app/views/pages/index.html.erb
  2. +1 −1  config/application.rb
View
2  app/views/pages/index.html.erb
@@ -1,7 +1,7 @@
<div class="hero-unit">
<h1>The playoffs are back.</h1>
<p>Welcome to the 2012 NHL Playoff Pool. All entries must be submitted online before
- <%= Time.parse(ENV['SUBMISSION_DEADLINE']).strftime("%B %-d, %Y at %I:%M %p")%>.
+ <%= Time.parse(ENV['SUBMISSION_DEADLINE']).in_time_zone('Eastern Time (US & Canada)').strftime("%B %-d, %Y at %I:%M %p")%>.
Donec id elit non mi porta gravida at eget metus. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, ut fermentum massa justo sit amet risus. Etiam porta sem malesuada magna mollis euismod. Donec sed odio dui.</p>
<p><%= link_to "Submit Entry &raquo;".html_safe, new_entrant_path, :class => 'btn btn-primary btn-large' %></p>
</div>
View
2  config/application.rb
@@ -27,7 +27,7 @@ class Application < Rails::Application
# Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
# Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
- # config.time_zone = 'Central Time (US & Canada)'
+ config.time_zone = 'Eastern Time (US & Canada)'
# The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
# config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]

No commit comments for this range

Something went wrong with that request. Please try again.