parent
0f0e7ae75e
commit
8bfe455946
1
Gemfile
1
Gemfile
@ -18,6 +18,7 @@ gem 'autoprefixer-rails', '~> 6'
|
|||||||
gem 'settingslogic', '~> 2.0.9'
|
gem 'settingslogic', '~> 2.0.9'
|
||||||
gem 'turbolinks', '~> 5'
|
gem 'turbolinks', '~> 5'
|
||||||
gem 'uglifier', '>= 1.3.0'
|
gem 'uglifier', '>= 1.3.0'
|
||||||
|
gem 'local_time'
|
||||||
|
|
||||||
# Foundation for Emails
|
# Foundation for Emails
|
||||||
gem 'inky-rb', require: 'inky'
|
gem 'inky-rb', require: 'inky'
|
||||||
|
10
Gemfile.lock
10
Gemfile.lock
@ -58,6 +58,13 @@ GEM
|
|||||||
byebug (9.0.6)
|
byebug (9.0.6)
|
||||||
choice (0.2.0)
|
choice (0.2.0)
|
||||||
coderay (1.1.1)
|
coderay (1.1.1)
|
||||||
|
coffee-rails (4.2.1)
|
||||||
|
coffee-script (>= 2.2.0)
|
||||||
|
railties (>= 4.0.0, < 5.2.x)
|
||||||
|
coffee-script (2.4.1)
|
||||||
|
coffee-script-source
|
||||||
|
execjs
|
||||||
|
coffee-script-source (1.12.2)
|
||||||
concurrent-ruby (1.0.5)
|
concurrent-ruby (1.0.5)
|
||||||
css_parser (1.4.9)
|
css_parser (1.4.9)
|
||||||
addressable
|
addressable
|
||||||
@ -139,6 +146,8 @@ GEM
|
|||||||
rb-fsevent (~> 0.9, >= 0.9.4)
|
rb-fsevent (~> 0.9, >= 0.9.4)
|
||||||
rb-inotify (~> 0.9, >= 0.9.7)
|
rb-inotify (~> 0.9, >= 0.9.7)
|
||||||
ruby_dep (~> 1.2)
|
ruby_dep (~> 1.2)
|
||||||
|
local_time (1.0.3)
|
||||||
|
coffee-rails
|
||||||
loofah (2.0.3)
|
loofah (2.0.3)
|
||||||
nokogiri (>= 1.5.9)
|
nokogiri (>= 1.5.9)
|
||||||
lumberjack (1.0.11)
|
lumberjack (1.0.11)
|
||||||
@ -325,6 +334,7 @@ DEPENDENCIES
|
|||||||
json (~> 2.0.2)
|
json (~> 2.0.2)
|
||||||
kaminari
|
kaminari
|
||||||
listen
|
listen
|
||||||
|
local_time
|
||||||
mailjet (~> 1.3.8)
|
mailjet (~> 1.3.8)
|
||||||
minitest-reporters
|
minitest-reporters
|
||||||
mysql2 (>= 0.3.18, < 0.5)
|
mysql2 (>= 0.3.18, < 0.5)
|
||||||
|
@ -14,3 +14,4 @@
|
|||||||
//= require jquery_ujs
|
//= require jquery_ujs
|
||||||
//= require turbolinks
|
//= require turbolinks
|
||||||
//= require modernizr-lite/modernizr
|
//= require modernizr-lite/modernizr
|
||||||
|
//= require local_time
|
||||||
|
@ -6,9 +6,9 @@
|
|||||||
<% end %>
|
<% end %>
|
||||||
|
|
||||||
<% if comment.edits? %>
|
<% if comment.edits? %>
|
||||||
<div>Updated <%= time_ago_in_words(comment.updated_at) %> ago</div>
|
<div>Updated <%= local_time_ago(comment.updated_at) %></div>
|
||||||
<% else %>
|
<% else %>
|
||||||
<div><%= time_ago_in_words(comment.created_at) %> ago</div>
|
<div><%= local_time_ago(comment.created_at) %></div>
|
||||||
<% end %>
|
<% end %>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user