diff --git a/Gemfile b/Gemfile index 400cdab3..f5d88fb4 100644 --- a/Gemfile +++ b/Gemfile @@ -85,7 +85,7 @@ if File.exist?(database_file) adapters.each do |adapter| case adapter when 'mysql2' - gem "mysql2", "~> 0.3.11", :platforms => [:mri, :mingw] + gem "mysql2", "= 0.3.11", :platforms => [:mri, :mingw] gem "activerecord-jdbcmysql-adapter", :platforms => :jruby when 'mysql' gem "mysql", "~> 2.8.1", :platforms => [:mri, :mingw] diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb index 79001a3f..16a4cbf2 100644 --- a/app/views/welcome/index.html.erb +++ b/app/views/welcome/index.html.erb @@ -54,7 +54,7 @@ @@ -88,7 +88,7 @@
<%activities = find_all_activities%> <% activities.each do |event| %> - <% cache cache_key_for_event(event) do %> +
  • <%= image_tag url_to_avatar(event.event_author), :class => "avatar-3" %> @@ -99,7 +99,7 @@

    <%= l(:field_updated_on) %><%= time_tag_welcome event.event_datetime %>前     <%= show_event_reply event %>

  • - <% end %> + <% end %>
    @@ -107,7 +107,7 @@