From c65ca2579c31c1335c0a259146ca6ab3468c793f Mon Sep 17 00:00:00 2001
From: echarp <manu@echarp.org>
Date: Sat, 15 Sep 2018 15:05:21 +0200
Subject: [PATCH] Bundle update
---
Gemfile.lock | 15 ++++++++-------
app/controllers/moderations_controller.rb | 1 +
app/helpers/digest_helper.rb | 1 +
app/models/event.rb | 1 +
app/models/event_callbacks.rb | 3 +++
app/models/orga.rb | 1 +
app/models/region.rb | 1 +
app/views/events/index.rss.builder | 1 +
.../20131114103118_devise_create_admin_users.rb | 1 +
...on_for_tag_names.acts_as_taggable_on_engine.rb | 1 +
db/migrate/20170701161358_add_lu_and_tn.rb | 1 +
11 files changed, 20 insertions(+), 7 deletions(-)
diff --git a/Gemfile.lock b/Gemfile.lock
index 95d48d84b..a27f2b71a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -205,7 +205,8 @@ GEM
concurrent-ruby (~> 1.0)
i18n-active_record (0.2.2)
i18n (>= 0.5.0)
- icalendar (2.4.1)
+ icalendar (2.5.0)
+ ice_cube (~> 0.16)
inherited_resources (1.9.0)
actionpack (>= 4.2, < 5.3)
has_scope (~> 0.6)
@@ -245,7 +246,7 @@ GEM
lumberjack (1.0.13)
mail (2.7.0)
mini_mime (>= 0.1.1)
- marcel (0.3.2)
+ marcel (0.3.3)
mimemagic (~> 0.3.2)
memoizable (0.4.2)
thread_safe (~> 0.3, >= 0.3.1)
@@ -308,7 +309,7 @@ GEM
rails-assets-jquery-visible (1.2.0)
rails-assets-jquery (> 1.6.0)
rails-assets-leaflet (1.3.4)
- rails-assets-leaflet.markercluster (1.4.0)
+ rails-assets-leaflet.markercluster (1.4.1)
rails-assets-leaflet (>= 1.3.1)
rails-controller-testing (1.0.2)
actionpack (~> 5.x, >= 5.0.1)
@@ -345,7 +346,7 @@ GEM
responders (2.4.0)
actionpack (>= 4.2.0, < 5.3)
railties (>= 4.2.0, < 5.3)
- rubocop (0.58.2)
+ rubocop (0.59.1)
jaro_winkler (~> 1.5.1)
parallel (~> 1.10)
parser (>= 2.5, != 2.5.1.1)
@@ -408,7 +409,7 @@ GEM
thor (0.20.0)
thread_safe (0.3.6)
tilt (2.0.8)
- tinymce-rails (4.8.2)
+ tinymce-rails (4.8.3)
railties (>= 3.1.1)
tinymce-rails-langs (4.20180103)
tinymce-rails (~> 4.1, >= 4.1.10)
@@ -428,7 +429,7 @@ GEM
simple_oauth (~> 0.3.0)
tzinfo (1.2.5)
thread_safe (~> 0.1)
- uglifier (4.1.18)
+ uglifier (4.1.19)
execjs (>= 0.3.0, < 3)
unf (0.1.4)
unf_ext
@@ -436,7 +437,7 @@ GEM
unicode-display_width (1.4.0)
warden (1.2.7)
rack (>= 1.0)
- web-console (3.6.2)
+ web-console (3.7.0)
actionview (>= 5.0)
activemodel (>= 5.0)
bindex (>= 0.4.0)
diff --git a/app/controllers/moderations_controller.rb b/app/controllers/moderations_controller.rb
index 5c0a5a566..c51d6031a 100644
--- a/app/controllers/moderations_controller.rb
+++ b/app/controllers/moderations_controller.rb
@@ -88,6 +88,7 @@ class ModerationsController < ApplicationController
def generate_destroy_reason
@moderation.attributes = moderation_params
return if params[:reason] == 'r_4'
+
@moderation.reason = t "moderations.refuse.reason_#{params[:reason]}_long"
end
end
diff --git a/app/helpers/digest_helper.rb b/app/helpers/digest_helper.rb
index c3435be2c..5237326e2 100644
--- a/app/helpers/digest_helper.rb
+++ b/app/helpers/digest_helper.rb
@@ -4,6 +4,7 @@ module DigestHelper
# link multiple times
def renumber_footnotes(id, description)
return if description.nil? || description.blank?
+
description.gsub(/\[(\d)+\]/, "[#{id}_\\1]")
end
end
diff --git a/app/models/event.rb b/app/models/event.rb
index a0b9540de..0cf84c780 100644
--- a/app/models/event.rb
+++ b/app/models/event.rb
@@ -64,6 +64,7 @@ class Event < ApplicationRecord
end)
scope :region, (lambda do |region|
return if region.nil? || region == 'all' || region.to_i.zero?
+
temp = Region.find region
where region: [temp, temp.regions].flatten
end)
diff --git a/app/models/event_callbacks.rb b/app/models/event_callbacks.rb
index e0e4af0b5..a4f31f51d 100644
--- a/app/models/event_callbacks.rb
+++ b/app/models/event_callbacks.rb
@@ -9,12 +9,14 @@ class EventCallbacks
def self.after_create(event)
return unless event.event.nil?
+
EventMailer.create(event).deliver_now!
ModerationMailer.create(event).deliver_now!
end
def self.before_update(event)
return unless event.will_save_change_to_moderated? && event.moderated?
+
event.decision_time = Time.zone.now
create_repeats event if event.repeat.try(:positive?) && event.rule
end
@@ -43,6 +45,7 @@ class EventCallbacks
def self.after_destroy(event)
return unless ActionMailer::Base.default_url_options[:host]
return if event.reason == 'r_0'
+
EventMailer.destroy(event).deliver_now
ModerationMailer.destroy(event).deliver_now
end
diff --git a/app/models/orga.rb b/app/models/orga.rb
index 3e3b7250a..2632ef976 100644
--- a/app/models/orga.rb
+++ b/app/models/orga.rb
@@ -34,6 +34,7 @@ class Orga < ApplicationRecord
scope :kind, ->(kind) { where kind: kind }
scope :region, (lambda do |region|
return if region.nil? || region == 'all' || region.to_i.zero?
+
temp = Region.find region
where region: [temp, temp.regions].flatten
end)
diff --git a/app/models/region.rb b/app/models/region.rb
index f093b9094..a73056cdc 100644
--- a/app/models/region.rb
+++ b/app/models/region.rb
@@ -9,6 +9,7 @@ class Region < ApplicationRecord
scope :local, ->(*) { where 'url IS NULL OR url = \'\'' }
scope :region, (lambda do |region|
return if region.nil? || region == 'all' || region.to_i.zero?
+
temp = Region.find region
where region: [temp, temp.regions].flatten
end)
diff --git a/app/views/events/index.rss.builder b/app/views/events/index.rss.builder
index a038bf271..ee0195cb5 100644
--- a/app/views/events/index.rss.builder
+++ b/app/views/events/index.rss.builder
@@ -3,6 +3,7 @@ def meta(xml, event)
xml.dc :date, event.start_time.iso8601
return unless event.latitude || event.longitude
+
xml.georss :point, event.latitude, ' ', event.longitude
end
diff --git a/db/migrate/20131114103118_devise_create_admin_users.rb b/db/migrate/20131114103118_devise_create_admin_users.rb
index 1d8651dd3..009f5624a 100644
--- a/db/migrate/20131114103118_devise_create_admin_users.rb
+++ b/db/migrate/20131114103118_devise_create_admin_users.rb
@@ -4,6 +4,7 @@ class DeviseCreateAdminUsers < ActiveRecord::Migration
super
# Create a default user
return unless direction == :up
+
AdminUser.create!(email: 'admin@example.com', password: 'password',
password_confirmation: 'password')
end
diff --git a/db/migrate/20161210105332_change_collation_for_tag_names.acts_as_taggable_on_engine.rb b/db/migrate/20161210105332_change_collation_for_tag_names.acts_as_taggable_on_engine.rb
index 279d3b55c..f7c61ce2b 100644
--- a/db/migrate/20161210105332_change_collation_for_tag_names.acts_as_taggable_on_engine.rb
+++ b/db/migrate/20161210105332_change_collation_for_tag_names.acts_as_taggable_on_engine.rb
@@ -4,6 +4,7 @@
class ChangeCollationForTagNames < ActiveRecord::Migration
def up
return unless ActsAsTaggableOn::Utils.using_mysql?
+
execute 'ALTER TABLE tags MODIFY name varchar(255)
CHARACTER SET utf8 COLLATE utf8_bin;'
end
diff --git a/db/migrate/20170701161358_add_lu_and_tn.rb b/db/migrate/20170701161358_add_lu_and_tn.rb
index 06a148790..5b4106e21 100644
--- a/db/migrate/20170701161358_add_lu_and_tn.rb
+++ b/db/migrate/20170701161358_add_lu_and_tn.rb
@@ -3,6 +3,7 @@ class AddLuAndTn < ActiveRecord::Migration
def self.up
say 'Creates LU and TN regions'
return if Region.exists? name: 'Luxembourg'
+
[
{ name: 'Luxembourg', code: :LU, url: '//www.agendadulibre.org' },
{ name: 'Tunisie', code: :TN, url: '//www.agendadulibre.org' }
--
GitLab