Skip to content
This repository has been archived by the owner on May 25, 2019. It is now read-only.

Commit

Permalink
Merge pull request #167 from sean0x42/hotfix-1.2.4
Browse files Browse the repository at this point in the history
Fixed a bug with generating new seasons
  • Loading branch information
sean0x42 authored Jan 19, 2019
2 parents 787aae3 + 5a4332b commit 52ebc67
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 2 deletions.
2 changes: 1 addition & 1 deletion app/models/season.rb
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,6 @@ def self.current(date = Time.zone.now)
end

def self.where_current(date = Time.zone.now)
Season.where('start_at <= ? AND end_at <= ?', date, date)
Season.where('start_at <= ? AND end_at >= ?', date, date)
end
end
11 changes: 11 additions & 0 deletions app/views/landing/release_notes.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,17 @@
<h1><%= t('landing.release_notes.title') %></h1>

<div class="release-notes">
<!-- 1.2.4 -->
<div class="release">
<h2><span class="version">1.2.4</span>January 19th, 2018</h2>
<ul>
<li>
<div class="change change-fixed">fixed</div>
<p>Resolved an issue where Seasons failed to be created. See <%= link_to '#164', 'https://github.com/sean0x42/riverrats.com.au/issues/164', class: 'anchor', target: '_blank' %></p>
</li>
</ul>
</div>

<!-- 1.2.3 -->
<div class="release">
<h2><span class="version">1.2.3</span>December 13th, 2018</h2>
Expand Down
2 changes: 1 addition & 1 deletion config/locales/en.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# available at http://guides.rubyonrails.org/i18n.html.

en:
version: "version 1.2.3"
version: "version 1.2.4"
notification:
game: "You placed %{position} in Game #%{game} at the %{venue}."
comment: "@%{sender} just commented on Game #%{game} at the %{venue}."
Expand Down

0 comments on commit 52ebc67

Please sign in to comment.