From: Tom Hughes Date: Wed, 3 Jun 2020 16:19:03 +0000 (+0100) Subject: Merge remote-tracking branch 'upstream/pull/2639' X-Git-Tag: live~3404 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/1739bf6832886c86b5bf111608982b10f1965c47?hp=f33f1f297e754d2383dba76d613a46427600d7bf Merge remote-tracking branch 'upstream/pull/2639' --- diff --git a/app/views/diary_entries/index.html.erb b/app/views/diary_entries/index.html.erb index 32a4e1e0f..96c052da6 100644 --- a/app/views/diary_entries/index.html.erb +++ b/app/views/diary_entries/index.html.erb @@ -10,14 +10,12 @@
  • <%= rss_link_to :action => "rss", :language => params[:language] %>
  • <% end -%> - <% if @user %> - <% if @user == current_user %> -
  • <%= link_to image_tag("new.png", :class => "small_icon") + t(".new"), new_diary_entry_path, :title => t(".new_title") %>
  • - <% end %> - <% else %> - <% if current_user %> -
  • <%= link_to image_tag("new.png", :class => "small_icon") + t(".new"), new_diary_entry_path, :title => t(".new_title") %>
  • - <% end %> + <% if @user && @user == current_user || !@user && current_user %> +
  • <%= link_to image_tag("new.png", :class => "small_icon") + t(".new"), new_diary_entry_path, :title => t(".new_title") %>
  • + <% end %> + + <% if !@user && current_user %> +
  • <%= link_to t(".my_diary"), :controller => "diary_entries", :action => "index", :display_name => current_user.display_name %>
  • <% end %> diff --git a/config/initializers/new_framework_defaults_5_2.rb b/config/initializers/new_framework_defaults_5_2.rb deleted file mode 100644 index c383d072b..000000000 --- a/config/initializers/new_framework_defaults_5_2.rb +++ /dev/null @@ -1,38 +0,0 @@ -# Be sure to restart your server when you modify this file. -# -# This file contains migration options to ease your Rails 5.2 upgrade. -# -# Once upgraded flip defaults one by one to migrate to the new default. -# -# Read the Guide for Upgrading Ruby on Rails for more info on each option. - -# Make Active Record use stable #cache_key alongside new #cache_version method. -# This is needed for recyclable cache keys. -# Rails.application.config.active_record.cache_versioning = true - -# Use AES-256-GCM authenticated encryption for encrypted cookies. -# Also, embed cookie expiry in signed or encrypted cookies for increased security. -# -# This option is not backwards compatible with earlier Rails versions. -# It's best enabled when your entire app is migrated and stable on 5.2. -# -# Existing cookies will be converted on read then written with the new scheme. -# Rails.application.config.action_dispatch.use_authenticated_cookie_encryption = true - -# Use AES-256-GCM authenticated encryption as default cipher for encrypting messages -# instead of AES-256-CBC, when use_authenticated_message_encryption is set to true. -# Rails.application.config.active_support.use_authenticated_message_encryption = true - -# Add default protection from forgery to ActionController::Base instead of in -# ApplicationController. -# Rails.application.config.action_controller.default_protect_from_forgery = true - -# Store boolean values are in sqlite3 databases as 1 and 0 instead of 't' and -# 'f' after migrating old data. -# Rails.application.config.active_record.sqlite3.represent_boolean_as_integer = true - -# Use SHA-1 instead of MD5 to generate non-sensitive digests, such as the ETag header. -# Rails.application.config.active_support.use_sha1_digests = true - -# Make `form_with` generate id attributes for any generated HTML tags. -# Rails.application.config.action_view.form_with_generates_ids = true diff --git a/config/initializers/query_cache.rb b/config/initializers/query_cache.rb deleted file mode 100644 index bb9c8b024..000000000 --- a/config/initializers/query_cache.rb +++ /dev/null @@ -1 +0,0 @@ -Rails.configuration.middleware.delete ActiveRecord::QueryCache diff --git a/config/locales/en.yml b/config/locales/en.yml index f9ea78ef3..1ee3f2378 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -373,6 +373,7 @@ en: in_language_title: "Diary Entries in %{language}" new: New Diary Entry new_title: Compose a new entry in my user diary + my_diary: My Diary no_entries: No diary entries recent_entries: "Recent diary entries" older_entries: Older Entries diff --git a/lib/tasks/add_version_to_nodes.rake b/lib/tasks/add_version_to_nodes.rake deleted file mode 100644 index 4762116f2..000000000 --- a/lib/tasks/add_version_to_nodes.rake +++ /dev/null @@ -1,38 +0,0 @@ -namespace "db" do - desc "Adds a version number to the nodes table" - task :node_version => :environment do - require File.dirname(__FILE__) + "/../../config/environment" - - increment = 1000 - offset = 0 - id_max = OldNode.find(:first, :order => "id desc").id - - while offset < (id_max + increment) - hash = {} - - # should be offsetting not selecting - OldNode.find(:all, :limit => increment, :offset => offset, :order => "timestamp").each do |node| - hash[node.id] ||= [] - hash[node.id] << node - end - - hash.each_value do |node_array| - n = 1 - node_array.each do |node| - temp_old_node = TempOldNode.new - temp_old_node.id = node.id - temp_old_node.latitude = node.latitude - temp_old_node.longitude = node.longitude - temp_old_node.user_id = node.user_id - temp_old_node.visible = node.visible - temp_old_node.timestamp = node.timestamp - temp_old_node.tile = node.tile - temp_old_node.version = n - temp_old_node.save! || raise - n += 1 - end - end - offset += increment - end - end -end diff --git a/script/daemons b/script/daemons deleted file mode 100755 index 4eb2fcf6a..000000000 --- a/script/daemons +++ /dev/null @@ -1,2 +0,0 @@ -#!/usr/bin/env ruby -Dir[File.dirname(__FILE__) + "/../lib/daemons/*_ctl"].each { |f| `#{f} #{ARGV.first}` } diff --git a/script/gravatar b/script/gravatar deleted file mode 100755 index 2c2c2bd4b..000000000 --- a/script/gravatar +++ /dev/null @@ -1,18 +0,0 @@ -#!/usr/bin/env ruby - -# require File.dirname(__FILE__) + "/../config/environment" - -start = 0 -User.where("image_use_gravatar AND id >=" + start.to_s).order("id").find_each do |user| - p "checked up to id " + user.id.to_s if (user.id % 1000).zero? # just give a rough indication where we are for restarting - next if user.avatar.attached? - - hash = Digest::MD5.hexdigest(user.email.downcase) - url = "https://www.gravatar.com/avatar/#{hash}?d=404" # without d=404 we will always get an image back - response = OSM.http_client.get(URI.parse(url)) - user.image_use_gravatar = response.success? - user.save - sleep(1) -end - -exit 0