From c432a658dd174db8fbb772429e3884e0732aa343 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Wed, 12 Feb 2020 00:36:21 +0100 Subject: Start 0.7.14.0 cycle --- Changelog.md | 8 ++++++++ config/defaults.yml | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Changelog.md b/Changelog.md index 886b5cc40..61bf06894 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,3 +1,11 @@ +# 0.7.14.0 + +## Refactor + +## Bug fixes + +## Features + # 0.7.13.0 ## Security diff --git a/config/defaults.yml b/config/defaults.yml index 10bb019b7..d19b3acd2 100644 --- a/config/defaults.yml +++ b/config/defaults.yml @@ -4,7 +4,7 @@ defaults: version: - number: "0.7.13.0" # Do not touch unless doing a release, do not backport the version number that's in master + number: "0.7.13.99" # Do not touch unless doing a release, do not backport the version number that's in master heroku: false environment: url: "http://localhost:3000/" -- cgit v1.2.3 From 00c5f35190017507052b37de614cfbb87f5a0155 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Fri, 20 Mar 2020 12:44:31 +0100 Subject: Update Rails to 5.2.4.2 --- Gemfile | 2 +- Gemfile.lock | 74 ++++++++++++++++++++++++++++++------------------------------ 2 files changed, 38 insertions(+), 38 deletions(-) diff --git a/Gemfile b/Gemfile index 4416b5feb..30abce048 100644 --- a/Gemfile +++ b/Gemfile @@ -2,7 +2,7 @@ source "https://rubygems.org" -gem "rails", "5.2.4.1" +gem "rails", "5.2.4.2" # Legacy Rails features, remove me! # responders (class level) diff --git a/Gemfile.lock b/Gemfile.lock index dcfa93edc..28853ba08 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,25 +2,25 @@ GEM remote: https://rubygems.org/ remote: https://gems.diasporafoundation.org/ specs: - actioncable (5.2.4.1) - actionpack (= 5.2.4.1) + actioncable (5.2.4.2) + actionpack (= 5.2.4.2) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailer (5.2.4.1) - actionpack (= 5.2.4.1) - actionview (= 5.2.4.1) - activejob (= 5.2.4.1) + actionmailer (5.2.4.2) + actionpack (= 5.2.4.2) + actionview (= 5.2.4.2) + activejob (= 5.2.4.2) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.2.4.1) - actionview (= 5.2.4.1) - activesupport (= 5.2.4.1) + actionpack (5.2.4.2) + actionview (= 5.2.4.2) + activesupport (= 5.2.4.2) rack (~> 2.0, >= 2.0.8) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.2.4.1) - activesupport (= 5.2.4.1) + actionview (5.2.4.2) + activesupport (= 5.2.4.2) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) @@ -28,22 +28,22 @@ GEM active_model_serializers (0.9.7) activemodel (>= 3.2) concurrent-ruby (~> 1.0) - activejob (5.2.4.1) - activesupport (= 5.2.4.1) + activejob (5.2.4.2) + activesupport (= 5.2.4.2) globalid (>= 0.3.6) - activemodel (5.2.4.1) - activesupport (= 5.2.4.1) - activerecord (5.2.4.1) - activemodel (= 5.2.4.1) - activesupport (= 5.2.4.1) + activemodel (5.2.4.2) + activesupport (= 5.2.4.2) + activerecord (5.2.4.2) + activemodel (= 5.2.4.2) + activesupport (= 5.2.4.2) arel (>= 9.0) activerecord-import (1.0.2) activerecord (>= 3.2) - activestorage (5.2.4.1) - actionpack (= 5.2.4.1) - activerecord (= 5.2.4.1) + activestorage (5.2.4.2) + actionpack (= 5.2.4.2) + activerecord (= 5.2.4.2) marcel (~> 0.3.1) - activesupport (5.2.4.1) + activesupport (5.2.4.2) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) @@ -518,18 +518,18 @@ GEM rack rack-test (1.1.0) rack (>= 1.0, < 3) - rails (5.2.4.1) - actioncable (= 5.2.4.1) - actionmailer (= 5.2.4.1) - actionpack (= 5.2.4.1) - actionview (= 5.2.4.1) - activejob (= 5.2.4.1) - activemodel (= 5.2.4.1) - activerecord (= 5.2.4.1) - activestorage (= 5.2.4.1) - activesupport (= 5.2.4.1) + rails (5.2.4.2) + actioncable (= 5.2.4.2) + actionmailer (= 5.2.4.2) + actionpack (= 5.2.4.2) + actionview (= 5.2.4.2) + activejob (= 5.2.4.2) + activemodel (= 5.2.4.2) + activerecord (= 5.2.4.2) + activestorage (= 5.2.4.2) + activesupport (= 5.2.4.2) bundler (>= 1.3.0) - railties (= 5.2.4.1) + railties (= 5.2.4.2) sprockets-rails (>= 2.0.0) rails-assets-autosize (4.0.2) rails-assets-backbone (1.3.3) @@ -592,9 +592,9 @@ GEM rails-timeago (2.17.1) actionpack (>= 3.1) activesupport (>= 3.1) - railties (5.2.4.1) - actionpack (= 5.2.4.1) - activesupport (= 5.2.4.1) + railties (5.2.4.2) + actionpack (= 5.2.4.2) + activesupport (= 5.2.4.2) method_source rake (>= 0.8.7) thor (>= 0.19.0, < 2.0) @@ -867,7 +867,7 @@ DEPENDENCIES rack-piwik (= 0.3.0) rack-rewrite (= 1.5.1) rack-ssl (= 1.4.1) - rails (= 5.2.4.1) + rails (= 5.2.4.2) rails-assets-autosize (= 4.0.2)! rails-assets-backbone (= 1.3.3)! rails-assets-blueimp-gallery (= 2.33.0)! -- cgit v1.2.3 From 9211f930cdfbd022b0c88ecaee331558dfef04e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Fri, 20 Mar 2020 12:46:30 +0100 Subject: update json to 2.3.0 --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 30abce048..07ea270be 100644 --- a/Gemfile +++ b/Gemfile @@ -21,7 +21,7 @@ gem "diaspora_federation-rails", "0.2.6" # API and JSON gem "acts_as_api", "1.0.1" -gem "json", "2.2.0" +gem "json", "2.3.0" gem "json-schema", "2.8.1" # Authentication diff --git a/Gemfile.lock b/Gemfile.lock index 28853ba08..6526c87f6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -353,7 +353,7 @@ GEM js_image_paths (0.1.1) rails (>= 4.0, < 6.0) sprockets (>= 3.0.0) - json (2.2.0) + json (2.3.0) json-jwt (1.11.0) activesupport (>= 4.2) aes_key_wrap @@ -835,7 +835,7 @@ DEPENDENCIES jquery-rails (= 4.3.5) js-routes (= 1.4.7) js_image_paths (= 0.1.1) - json (= 2.2.0) + json (= 2.3.0) json-schema (= 2.8.1) json-schema-rspec (= 0.0.4) leaflet-rails (= 1.5.1) -- cgit v1.2.3 From b146c90e57ecd23dbd3930349f69b5c5e374da71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Fri, 20 Mar 2020 12:54:44 +0100 Subject: update cucumber-rails to 2.0 --- Gemfile | 2 +- Gemfile.lock | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Gemfile b/Gemfile index 07ea270be..e9dc544f4 100644 --- a/Gemfile +++ b/Gemfile @@ -307,7 +307,7 @@ group :development, :test do gem "rspec-rails", "3.8.2" # Cucumber (integration tests) - gem "cucumber-rails", "1.7.0", require: false + gem "cucumber-rails", "2.0.0", require: false # Jasmine (client side application tests (JS)) gem "jasmine", "3.4.0" diff --git a/Gemfile.lock b/Gemfile.lock index 6526c87f6..c50d1f191 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -69,7 +69,7 @@ GEM attr_required (1.0.1) autoprefixer-rails (8.6.5) execjs - backports (3.15.0) + backports (3.17.0) bcrypt (3.1.13) bindata (2.4.4) bootstrap-sass (3.4.1) @@ -160,10 +160,10 @@ GEM cucumber-tag_expressions (~> 1.1.0) gherkin (~> 5.0) cucumber-expressions (6.0.1) - cucumber-rails (1.7.0) - capybara (>= 2.3.0, < 4) + cucumber-rails (2.0.0) + capybara (>= 2.12, < 4) cucumber (>= 3.0.2, < 4) - mime-types (>= 1.17, < 4) + mime-types (>= 2.0, < 4) nokogiri (~> 1.8) railties (>= 4.2, < 7) cucumber-tag_expressions (1.1.1) @@ -396,9 +396,9 @@ GEM memoizable (0.4.2) thread_safe (~> 0.3, >= 0.3.1) method_source (0.9.2) - mime-types (3.2.2) + mime-types (3.3.1) mime-types-data (~> 3.2015) - mime-types-data (3.2019.0331) + mime-types-data (3.2019.1009) mimemagic (0.3.4) mini_magick (4.10.1) mini_mime (1.0.2) @@ -407,7 +407,7 @@ GEM mobile-fu (1.4.0) rack-mobile-detect rails - multi_json (1.13.1) + multi_json (1.14.1) multi_test (0.1.2) multi_xml (0.6.0) multipart-post (2.1.1) @@ -606,7 +606,7 @@ GEM ffi (~> 1.0) redcarpet (3.4.0) redis (3.3.5) - regexp_parser (1.5.1) + regexp_parser (1.7.0) request_store (1.4.1) rack (>= 1.4) responders (2.4.1) @@ -803,7 +803,7 @@ DEPENDENCIES configurate (= 0.3.1) coveralls (= 0.8.23) cucumber-api-steps (= 0.14) - cucumber-rails (= 1.7.0) + cucumber-rails (= 2.0.0) database_cleaner (= 1.7.0) devise (= 4.7.1) devise-two-factor (= 3.0.3) -- cgit v1.2.3 From b54679a6342454d5cfa8c81d223f1c7e768c6998 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Fri, 20 Mar 2020 12:56:06 +0100 Subject: update database_cleaner to 1.8.3 --- Gemfile | 2 +- Gemfile.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index e9dc544f4..686bc1632 100644 --- a/Gemfile +++ b/Gemfile @@ -284,7 +284,7 @@ group :test do # Cucumber (integration tests) gem "capybara", "3.15.0" - gem "database_cleaner", "1.7.0" + gem "database_cleaner", "1.8.3" gem "poltergeist", "1.18.1" gem "cucumber-api-steps", "0.14", require: false diff --git a/Gemfile.lock b/Gemfile.lock index c50d1f191..fb55de350 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -168,7 +168,7 @@ GEM railties (>= 4.2, < 7) cucumber-tag_expressions (1.1.1) cucumber-wire (0.0.1) - database_cleaner (1.7.0) + database_cleaner (1.8.3) devise (4.7.1) bcrypt (~> 3.0) orm_adapter (~> 0.1) @@ -797,14 +797,14 @@ DEPENDENCIES autoprefixer-rails (= 8.6.5) bootstrap-sass (= 3.4.1) bootstrap-switch-rails (= 3.3.3) - capybara (= 3.15.0) + capybara (= 3.31.0) carrierwave (= 1.3.1) compass-rails (= 3.1.0) configurate (= 0.3.1) coveralls (= 0.8.23) cucumber-api-steps (= 0.14) cucumber-rails (= 2.0.0) - database_cleaner (= 1.7.0) + database_cleaner (= 1.8.3) devise (= 4.7.1) devise-two-factor (= 3.0.3) devise_lastseenable (= 0.0.6) -- cgit v1.2.3 From 51e7eae2c339b2368a403a6de52daeeb799ce8a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Fri, 20 Mar 2020 13:00:55 +0100 Subject: update factory_girl_rails to 4.9.0 --- Gemfile | 2 +- Gemfile.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index 686bc1632..fc31946fc 100644 --- a/Gemfile +++ b/Gemfile @@ -291,7 +291,7 @@ group :test do # General helpers - gem "factory_girl_rails", "4.8.0" + gem "factory_girl_rails", "4.9.0" gem "shoulda-matchers", "4.0.1" gem "timecop", "0.9.1" gem "webmock", "3.6.0", require: false diff --git a/Gemfile.lock b/Gemfile.lock index fb55de350..176671d0d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -225,10 +225,10 @@ GEM state_machines thor fabrication (2.20.2) - factory_girl (4.8.0) + factory_girl (4.9.0) activesupport (>= 3.0.0) - factory_girl_rails (4.8.0) - factory_girl (~> 4.8.0) + factory_girl_rails (4.9.0) + factory_girl (~> 4.9.0) railties (>= 3.0.0) faraday (0.15.4) multipart-post (>= 1.2, < 3) @@ -814,7 +814,7 @@ DEPENDENCIES diaspora_federation-test (= 0.2.6) entypo-rails (= 3.0.0) eye (= 0.10.0) - factory_girl_rails (= 4.8.0) + factory_girl_rails (= 4.9.0) faraday (= 0.15.4) faraday-cookie_jar (= 0.0.6) faraday_middleware (= 0.13.1) -- cgit v1.2.3 From 67924fc4045560d2dd4fb37304bac349fa239ddb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Fri, 20 Mar 2020 13:04:48 +0100 Subject: update fixture_builder to 0.5.2 --- Gemfile | 2 +- Gemfile.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index fc31946fc..741c75d23 100644 --- a/Gemfile +++ b/Gemfile @@ -276,7 +276,7 @@ end group :test do # RSpec (unit tests, some integration tests) - gem "fixture_builder", "0.5.2.rc3" + gem "fixture_builder", "0.5.2" gem "fuubar", "2.4.1" gem "json-schema-rspec", "0.0.4" gem "rspec-json_expectations", "~> 2.1" diff --git a/Gemfile.lock b/Gemfile.lock index 176671d0d..d5ed2b738 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -238,7 +238,7 @@ GEM faraday_middleware (0.13.1) faraday (>= 0.7.4, < 1.0) ffi (1.11.1) - fixture_builder (0.5.2.rc3) + fixture_builder (0.5.2) activerecord (>= 2) activesupport (>= 2) hashdiff @@ -310,7 +310,7 @@ GEM execjs (~> 2.0) sprockets (>= 2.0.0) tilt (>= 1.2) - hashdiff (0.4.0) + hashdiff (1.0.1) hashie (3.6.0) http (3.3.0) addressable (~> 2.3) @@ -818,7 +818,7 @@ DEPENDENCIES faraday (= 0.15.4) faraday-cookie_jar (= 0.0.6) faraday_middleware (= 0.13.1) - fixture_builder (= 0.5.2.rc3) + fixture_builder (= 0.5.2) fog-aws (= 3.5.1) fuubar (= 2.4.1) gon (= 6.2.1) -- cgit v1.2.3 From d561d2caf1ccb329afa36e72f6c5c2a7edb55ade Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Fri, 20 Mar 2020 13:06:01 +0100 Subject: update fuubar to 2.5.0 --- Gemfile | 2 +- Gemfile.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index 741c75d23..7fe8b1af4 100644 --- a/Gemfile +++ b/Gemfile @@ -277,7 +277,7 @@ group :test do # RSpec (unit tests, some integration tests) gem "fixture_builder", "0.5.2" - gem "fuubar", "2.4.1" + gem "fuubar", "2.5.0" gem "json-schema-rspec", "0.0.4" gem "rspec-json_expectations", "~> 2.1" diff --git a/Gemfile.lock b/Gemfile.lock index d5ed2b738..a3f1c6f78 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -262,7 +262,7 @@ GEM fugit (1.2.2) et-orbi (~> 1.1, >= 1.1.8) raabro (~> 1.1) - fuubar (2.4.1) + fuubar (2.5.0) rspec-core (~> 3.0) ruby-progressbar (~> 1.4) get_process_mem (0.2.3) @@ -636,7 +636,7 @@ GEM rspec-expectations (~> 3.8.0) rspec-mocks (~> 3.8.0) rspec-support (~> 3.8.0) - rspec-support (3.8.2) + rspec-support (3.8.3) rubocop (0.72.0) jaro_winkler (~> 1.5.1) parallel (~> 1.10) @@ -820,7 +820,7 @@ DEPENDENCIES faraday_middleware (= 0.13.1) fixture_builder (= 0.5.2) fog-aws (= 3.5.1) - fuubar (= 2.4.1) + fuubar (= 2.5.0) gon (= 6.2.1) guard (= 2.15.0) guard-rspec (= 4.7.3) -- cgit v1.2.3 From 7ec921c9562f0c7fd42fc4674ae1e5aa3085fa29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Fri, 20 Mar 2020 13:06:51 +0100 Subject: update guard to 2.16.1 --- Gemfile | 2 +- Gemfile.lock | 18 ++++++++---------- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/Gemfile b/Gemfile index 7fe8b1af4..f1520315b 100644 --- a/Gemfile +++ b/Gemfile @@ -241,7 +241,7 @@ end group :development do # Automatic test runs - gem "guard", "2.15.0", require: false + gem "guard", "2.16.1", require: false gem "guard-rspec", "4.7.3", require: false gem "guard-rubocop", "1.3.0", require: false gem "rb-fsevent", "0.10.3", require: false diff --git a/Gemfile.lock b/Gemfile.lock index a3f1c6f78..0172b60f3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -237,7 +237,7 @@ GEM http-cookie (~> 1.0.0) faraday_middleware (0.13.1) faraday (>= 0.7.4, < 1.0) - ffi (1.11.1) + ffi (1.12.2) fixture_builder (0.5.2) activerecord (>= 2) activesupport (>= 2) @@ -276,7 +276,7 @@ GEM actionpack (>= 3.0) multi_json request_store (>= 1.0) - guard (2.15.0) + guard (2.16.1) formatador (>= 0.2.4) listen (>= 2.7, < 4.0) lumberjack (>= 1.0.12, < 2.0) @@ -371,10 +371,9 @@ GEM kostya-sigar (2.0.6) leaflet-rails (1.5.1) rails (>= 4.2.0) - listen (3.1.5) - rb-fsevent (~> 0.9, >= 0.9.4) - rb-inotify (~> 0.9, >= 0.9.7) - ruby_dep (~> 1.2) + listen (3.2.1) + rb-fsevent (~> 0.10, >= 0.10.3) + rb-inotify (~> 0.9, >= 0.9.10) little-plugger (1.1.4) logging (2.2.2) little-plugger (~> 1.1) @@ -384,7 +383,7 @@ GEM loofah (2.4.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) - lumberjack (1.0.13) + lumberjack (1.2.4) macaddr (1.7.2) systemu (~> 2.6.5) mail (2.7.1) @@ -417,7 +416,7 @@ GEM nio4r (2.5.2) nokogiri (1.10.8) mini_portile2 (~> 2.4.0) - notiffany (0.1.1) + notiffany (0.1.3) nenv (~> 0.1) shellany (~> 0.0) oauth (0.5.4) @@ -649,7 +648,6 @@ GEM rubocop (>= 0.72.0) ruby-oembed (0.12.0) ruby-progressbar (1.10.1) - ruby_dep (1.5.0) rubyzip (1.3.0) rugged (0.28.2) safe_yaml (1.0.5) @@ -822,7 +820,7 @@ DEPENDENCIES fog-aws (= 3.5.1) fuubar (= 2.5.0) gon (= 6.2.1) - guard (= 2.15.0) + guard (= 2.16.1) guard-rspec (= 4.7.3) guard-rubocop (= 1.3.0) haml_lint (= 0.28.0) -- cgit v1.2.3 From b325d2ca4327106d94e8b79eed64ea8d254f55b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Fri, 20 Mar 2020 13:13:20 +0100 Subject: update jasmine to 3.5.1 --- Gemfile | 2 +- Gemfile.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index f1520315b..9d24febc4 100644 --- a/Gemfile +++ b/Gemfile @@ -310,7 +310,7 @@ group :development, :test do gem "cucumber-rails", "2.0.0", require: false # Jasmine (client side application tests (JS)) - gem "jasmine", "3.4.0" + gem "jasmine", "3.5.1" gem "jasmine-jquery-rails", "2.0.3" gem "rails-assets-jasmine-ajax", "4.0.0", source: "https://gems.diasporafoundation.org" gem "sinon-rails", "1.15.0" diff --git a/Gemfile.lock b/Gemfile.lock index 0172b60f3..8e30a7c03 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -336,12 +336,12 @@ GEM railties (>= 3.0.0) ipaddress (0.8.3) jaro_winkler (1.5.3) - jasmine (3.4.0) - jasmine-core (~> 3.4.0) + jasmine (3.5.1) + jasmine-core (~> 3.5.0) phantomjs rack (>= 1.2.1) rake - jasmine-core (3.4.0) + jasmine-core (3.5.0) jasmine-jquery-rails (2.0.3) jquery-rails (4.3.5) rails-dom-testing (>= 1, < 3) @@ -828,7 +828,7 @@ DEPENDENCIES handlebars_assets (= 0.23.4) http_accept_language (= 2.1.1) i18n-inflector-rails (= 1.0.7) - jasmine (= 3.4.0) + jasmine (= 3.5.1) jasmine-jquery-rails (= 2.0.3) jquery-rails (= 4.3.5) js-routes (= 1.4.7) -- cgit v1.2.3 From eb7a71a2a56d4531cc527acd636e50f7cbde5fd1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Fri, 20 Mar 2020 13:14:33 +0100 Subject: update rb-inotify to 0.10.1 --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 9d24febc4..3f3c99994 100644 --- a/Gemfile +++ b/Gemfile @@ -245,7 +245,7 @@ group :development do gem "guard-rspec", "4.7.3", require: false gem "guard-rubocop", "1.3.0", require: false gem "rb-fsevent", "0.10.3", require: false - gem "rb-inotify", "0.10.0", require: false + gem "rb-inotify", "0.10.1", require: false # Linters gem "haml_lint", "0.28.0", require: false diff --git a/Gemfile.lock b/Gemfile.lock index 8e30a7c03..65867256e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -601,7 +601,7 @@ GEM raindrops (0.19.0) rake (12.3.3) rb-fsevent (0.10.3) - rb-inotify (0.10.0) + rb-inotify (0.10.1) ffi (~> 1.0) redcarpet (3.4.0) redis (3.3.5) @@ -892,7 +892,7 @@ DEPENDENCIES rails-i18n (= 5.1.3) rails-timeago (= 2.17.1) rb-fsevent (= 0.10.3) - rb-inotify (= 0.10.0) + rb-inotify (= 0.10.1) redcarpet (= 3.4.0) redis (= 3.3.5) responders (= 2.4.1) -- cgit v1.2.3 From 4ac1b9ae87757176184ae6873fce847714431027 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Fri, 20 Mar 2020 13:17:12 +0100 Subject: update spring to 2.1.0 --- Gemfile | 2 +- Gemfile.lock | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/Gemfile b/Gemfile index 3f3c99994..2fe8f2f7b 100644 --- a/Gemfile +++ b/Gemfile @@ -259,7 +259,7 @@ group :development do # Preloading environment - gem "spring", "2.0.2" + gem "spring", "2.1.0" gem "spring-commands-rspec", "1.0.4" gem "spring-commands-cucumber", "1.0.1" diff --git a/Gemfile.lock b/Gemfile.lock index 65867256e..c525f22f4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -78,7 +78,7 @@ GEM bootstrap-switch-rails (3.3.3) buftok (0.2.0) builder (3.2.4) - byebug (11.0.1) + byebug (11.1.1) capybara (3.15.0) addressable mini_mime (>= 0.1.3) @@ -490,7 +490,7 @@ GEM pry (0.12.2) coderay (~> 1.1.0) method_source (~> 0.9.0) - pry-byebug (3.7.0) + pry-byebug (3.8.0) byebug (~> 11.0) pry (~> 0.10) public_suffix (3.1.1) @@ -689,8 +689,7 @@ GEM simplecov-html (0.10.2) sinon-rails (1.15.0) railties (>= 3.1) - spring (2.0.2) - activesupport (>= 4.2) + spring (2.1.0) spring-commands-cucumber (1.0.1) spring (>= 0.9.1) spring-commands-rspec (1.0.4) @@ -795,7 +794,7 @@ DEPENDENCIES autoprefixer-rails (= 8.6.5) bootstrap-sass (= 3.4.1) bootstrap-switch-rails (= 3.3.3) - capybara (= 3.31.0) + capybara (= 3.15.0) carrierwave (= 1.3.1) compass-rails (= 3.1.0) configurate (= 0.3.1) @@ -911,7 +910,7 @@ DEPENDENCIES simple_captcha2 (= 0.4.3) simplecov (= 0.16.1) sinon-rails (= 1.15.0) - spring (= 2.0.2) + spring (= 2.1.0) spring-commands-cucumber (= 1.0.1) spring-commands-rspec (= 1.0.4) sprockets-rails (= 3.2.1) -- cgit v1.2.3 From e046a4cc3a0245c49f49a03847ec34a132e2f74e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Fri, 20 Mar 2020 13:27:48 +0100 Subject: update bindata to 2.4.6 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index c525f22f4..8ee080403 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -71,7 +71,7 @@ GEM execjs backports (3.17.0) bcrypt (3.1.13) - bindata (2.4.4) + bindata (2.4.6) bootstrap-sass (3.4.1) autoprefixer-rails (>= 5.2.1) sassc (>= 2.0.0) -- cgit v1.2.3 From 2149ebb2df829d8237e8f43b04c82accef2b9944 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Fri, 20 Mar 2020 13:28:10 +0100 Subject: update domain_name to 0.5.20190701 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 8ee080403..2f8877c37 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -201,7 +201,7 @@ GEM uuid (~> 2.3, >= 2.3.8) diff-lcs (1.3) docile (1.3.2) - domain_name (0.5.20180417) + domain_name (0.5.20190701) unf (>= 0.0.5, < 1.0.0) encryptor (3.0.0) entypo-rails (3.0.0) -- cgit v1.2.3 From fc6d736471e270fd2b7bf25488fadd0cb14c7a8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Fri, 20 Mar 2020 13:29:01 +0100 Subject: update et-orbi to 1.2.4 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 2f8877c37..bb1a93e8d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -212,7 +212,7 @@ GEM execjs multi_json (>= 1.3) rake - et-orbi (1.2.1) + et-orbi (1.2.4) tzinfo ethon (0.12.0) ffi (>= 1.3.0) -- cgit v1.2.3 From 95422c7566883b62f58e008b152ed54938a199c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Fri, 20 Mar 2020 13:29:22 +0100 Subject: update excon to 0.73.0 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index bb1a93e8d..07cf829c7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -216,7 +216,7 @@ GEM tzinfo ethon (0.12.0) ffi (>= 1.3.0) - excon (0.72.0) + excon (0.73.0) execjs (2.7.0) eye (0.10.0) celluloid (~> 0.17.3) -- cgit v1.2.3 From 2d742ec0ff422b2418b1bc736f72e838afb17605 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Fri, 20 Mar 2020 13:29:39 +0100 Subject: update fabrication to 2.21.0 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 07cf829c7..598378f4a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -224,7 +224,7 @@ GEM kostya-sigar (~> 2.0.0) state_machines thor - fabrication (2.20.2) + fabrication (2.21.0) factory_girl (4.9.0) activesupport (>= 3.0.0) factory_girl_rails (4.9.0) -- cgit v1.2.3 From ffa69df7041460d128b5ea9ac20dce52ec904ec2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Fri, 20 Mar 2020 13:29:57 +0100 Subject: update fog-core to 2.2.0 --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 598378f4a..6b1d8645f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -247,9 +247,9 @@ GEM fog-json (~> 1.1) fog-xml (~> 0.1) ipaddress (~> 0.8) - fog-core (2.1.2) + fog-core (2.2.0) builder - excon (~> 0.58) + excon (~> 0.71) formatador (~> 0.2) mime-types fog-json (1.2.0) -- cgit v1.2.3 From 659bdf4b7afa06579b9e7e1ec4b2ccf64193c899 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Fri, 20 Mar 2020 13:30:14 +0100 Subject: update fugit to 1.3.3 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 6b1d8645f..22871fde5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -259,7 +259,7 @@ GEM fog-core nokogiri (>= 1.5.11, < 2.0.0) formatador (0.2.5) - fugit (1.2.2) + fugit (1.3.3) et-orbi (~> 1.1, >= 1.1.8) raabro (~> 1.1) fuubar (2.5.0) -- cgit v1.2.3 From 403960811f4458578080d38b902373fff57f1fdc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Fri, 20 Mar 2020 13:30:31 +0100 Subject: update get_process_mem to 0.2.5 --- Gemfile.lock | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 22871fde5..d5b4c58bc 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -265,7 +265,8 @@ GEM fuubar (2.5.0) rspec-core (~> 3.0) ruby-progressbar (~> 1.4) - get_process_mem (0.2.3) + get_process_mem (0.2.5) + ffi (~> 1.0) gherkin (5.1.0) gitlab (4.11.0) httparty (~> 0.14, >= 0.14.0) -- cgit v1.2.3 From 195780122b2eb737a4a05806fe69395e90b04c0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Fri, 20 Mar 2020 13:30:48 +0100 Subject: update gitlab to 4.14.0 --- Gemfile.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index d5b4c58bc..ae6e2d0c6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -268,7 +268,7 @@ GEM get_process_mem (0.2.5) ffi (~> 1.0) gherkin (5.1.0) - gitlab (4.11.0) + gitlab (4.14.0) httparty (~> 0.14, >= 0.14.0) terminal-table (~> 1.5, >= 1.5.1) globalid (0.4.2) @@ -323,7 +323,7 @@ GEM http-form_data (2.1.1) http_accept_language (2.1.1) http_parser.rb (0.6.0) - httparty (0.17.0) + httparty (0.18.0) mime-types (~> 3.0) multi_xml (>= 0.5.2) httpclient (2.8.3) @@ -745,7 +745,7 @@ GEM unf (0.1.4) unf_ext unf_ext (0.0.7.6) - unicode-display_width (1.6.0) + unicode-display_width (1.6.1) unicorn (5.5.1) kgio (~> 2.6) raindrops (~> 0.7) -- cgit v1.2.3 From f0f8cf334c06e41a19a64be2641eaeb5c1c28b70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Fri, 20 Mar 2020 13:31:05 +0100 Subject: update http-form_data to 2.3.0 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index ae6e2d0c6..605254f9d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -320,7 +320,7 @@ GEM http_parser.rb (~> 0.6.0) http-cookie (1.0.3) domain_name (~> 0.5) - http-form_data (2.1.1) + http-form_data (2.3.0) http_accept_language (2.1.1) http_parser.rb (0.6.0) httparty (0.18.0) -- cgit v1.2.3 From 95f08ac9af2e0e6a28d5ff194ef8d2959d9a8e5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Fri, 20 Mar 2020 13:31:38 +0100 Subject: update jaro_winkler to 1.5.4 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 605254f9d..a104d4d56 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -336,7 +336,7 @@ GEM i18n-inflector (~> 2.6) railties (>= 3.0.0) ipaddress (0.8.3) - jaro_winkler (1.5.3) + jaro_winkler (1.5.4) jasmine (3.5.1) jasmine-core (~> 3.5.0) phantomjs -- cgit v1.2.3 From 95aaa7a140faf29097e5ee98a8991d34c7e881d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Fri, 20 Mar 2020 13:31:54 +0100 Subject: update jsonpath to 1.0.5 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index a104d4d56..8b6a6b010 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -364,7 +364,7 @@ GEM json-schema-rspec (0.0.4) json-schema (~> 2.5) rspec - jsonpath (1.0.4) + jsonpath (1.0.5) multi_json to_regexp (~> 0.2.1) jwt (2.2.1) -- cgit v1.2.3 From 90926d95e99b406b26d06f13f11f566c204cc3ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Fri, 20 Mar 2020 13:32:09 +0100 Subject: update kgio to 2.11.3 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 8b6a6b010..eb5ec348a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -368,7 +368,7 @@ GEM multi_json to_regexp (~> 0.2.1) jwt (2.2.1) - kgio (2.11.2) + kgio (2.11.3) kostya-sigar (2.0.6) leaflet-rails (1.5.1) rails (>= 4.2.0) -- cgit v1.2.3 From 19314f8a9466bff36a481e303f7da902c7c78ab9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Fri, 20 Mar 2020 13:32:25 +0100 Subject: update oauth2 to 1.4.4 --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index eb5ec348a..9d77f94de 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -421,8 +421,8 @@ GEM nenv (~> 0.1) shellany (~> 0.0) oauth (0.5.4) - oauth2 (1.4.1) - faraday (>= 0.8, < 0.16.0) + oauth2 (1.4.4) + faraday (>= 0.8, < 2.0) jwt (>= 1.0, < 3.0) multi_json (~> 1.3) multi_xml (~> 0.5) -- cgit v1.2.3 From 196f0699b0288d0bd66019f9431dd47b827ce7e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Fri, 20 Mar 2020 13:32:45 +0100 Subject: update octokit to 4.17.0 --- Gemfile.lock | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 9d77f94de..4013ce668 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -427,7 +427,8 @@ GEM multi_json (~> 1.3) multi_xml (~> 0.5) rack (>= 1.2, < 3) - octokit (4.14.0) + octokit (4.17.0) + faraday (>= 0.9) sawyer (~> 0.8.0, >= 0.5.3) omniauth (1.9.0) hashie (>= 3.4.6, < 3.7.0) -- cgit v1.2.3 From 8779a15e2752288a786c0893e03570681100a973 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Fri, 20 Mar 2020 13:33:01 +0100 Subject: update parallel to 1.19.1 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 4013ce668..2d995fdd3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -461,7 +461,7 @@ GEM validate_url webfinger (>= 1.0.1) orm_adapter (0.5.0) - parallel (1.17.0) + parallel (1.19.1) parser (2.6.3.0) ast (~> 2.4.0) pg (1.1.4) -- cgit v1.2.3 From 7f90110696b63ddcac52c4cd3d0e6b4903b6b3ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Fri, 20 Mar 2020 13:33:18 +0100 Subject: update parser to 2.7.0.4 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 2d995fdd3..4cb904bd7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -462,7 +462,7 @@ GEM webfinger (>= 1.0.1) orm_adapter (0.5.0) parallel (1.19.1) - parser (2.6.3.0) + parser (2.7.0.4) ast (~> 2.4.0) pg (1.1.4) phantomjs (2.1.1.0) -- cgit v1.2.3 From fa26c29bb2db5bec39b9cefafe67534d3d09f160 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Fri, 20 Mar 2020 13:33:35 +0100 Subject: update rack-oauth2 to 1.10.1 --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 4cb904bd7..290ae46ae 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -505,11 +505,11 @@ GEM activesupport rack-mobile-detect (0.4.0) rack - rack-oauth2 (1.10.0) + rack-oauth2 (1.10.1) activesupport attr_required httpclient - json-jwt (>= 1.9.0) + json-jwt (>= 1.11.0) rack rack-piwik (0.3.0) rack-protection (2.0.5) -- cgit v1.2.3 From 9c449b0298d0922b35822cebfc5c7cea78d5a72b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Fri, 20 Mar 2020 13:33:52 +0100 Subject: update rack-protection to 2.0.8.1 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 290ae46ae..e6359d0b4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -512,7 +512,7 @@ GEM json-jwt (>= 1.11.0) rack rack-piwik (0.3.0) - rack-protection (2.0.5) + rack-protection (2.0.8.1) rack rack-rewrite (1.5.1) rack-ssl (1.4.1) -- cgit v1.2.3 From ea4b670582e6a1ce53ceb14b68be0a491e5611e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Fri, 20 Mar 2020 13:34:09 +0100 Subject: update raindrops to 0.19.1 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index e6359d0b4..9dff552c5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -600,7 +600,7 @@ GEM rake (>= 0.8.7) thor (>= 0.19.0, < 2.0) rainbow (3.0.0) - raindrops (0.19.0) + raindrops (0.19.1) rake (12.3.3) rb-fsevent (0.10.3) rb-inotify (0.10.1) -- cgit v1.2.3 From d5c22c3e49ca5ffd54032b78375980d19620d06e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Fri, 20 Mar 2020 13:34:27 +0100 Subject: update request_store to 1.5.0 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 9dff552c5..f21c54bce 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -608,7 +608,7 @@ GEM redcarpet (3.4.0) redis (3.3.5) regexp_parser (1.7.0) - request_store (1.4.1) + request_store (1.5.0) rack (>= 1.4) responders (2.4.1) actionpack (>= 4.2.0, < 6.0) -- cgit v1.2.3 From d3210f1154dffe747896bca72282de0e60693eba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Fri, 20 Mar 2020 13:34:49 +0100 Subject: update rugged to 0.99.0 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index f21c54bce..0c4ce03d7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -651,7 +651,7 @@ GEM ruby-oembed (0.12.0) ruby-progressbar (1.10.1) rubyzip (1.3.0) - rugged (0.28.2) + rugged (0.99.0) safe_yaml (1.0.5) sass (3.4.25) sass-rails (5.0.7) -- cgit v1.2.3 From 9c7d9186f6dce20dfe9f76dd1da9ab5aff81b329 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Fri, 20 Mar 2020 13:35:09 +0100 Subject: update sassc to 2.2.1 --- Gemfile.lock | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 0c4ce03d7..35c5d5563 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -660,9 +660,8 @@ GEM sprockets (>= 2.8, < 4.0) sprockets-rails (>= 2.0, < 4.0) tilt (>= 1.1, < 3) - sassc (2.0.1) + sassc (2.2.1) ffi (~> 1.9) - rake sawyer (0.8.2) addressable (>= 2.3.5) faraday (> 0.8, < 2.0) -- cgit v1.2.3 From 8f0826a8bc3176b654336fdb45462e855e3e927d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Fri, 20 Mar 2020 13:35:26 +0100 Subject: update temple to 0.8.2 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 35c5d5563..a1d72094d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -710,7 +710,7 @@ GEM httpclient (>= 2.4) sysexits (1.2.0) systemu (2.6.5) - temple (0.8.1) + temple (0.8.2) term-ansicolor (1.7.1) tins (~> 1.0) terminal-table (1.8.0) -- cgit v1.2.3 From e5e4189569233c781cf50c06c707cee5dc1ea191 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Fri, 20 Mar 2020 13:35:47 +0100 Subject: update tilt to 2.0.10 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index a1d72094d..f9bc2c7fe 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -717,7 +717,7 @@ GEM unicode-display_width (~> 1.1, >= 1.1.1) thor (0.20.3) thread_safe (0.3.6) - tilt (2.0.9) + tilt (2.0.10) timecop (0.9.1) timers (4.3.0) tins (1.20.3) -- cgit v1.2.3 From 25a6c9583f545e3dc091fc659404c00e3cfa1c0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Fri, 20 Mar 2020 13:36:03 +0100 Subject: update tins to 1.24.1 --- Gemfile.lock | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index f9bc2c7fe..85c90cd7a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -708,6 +708,7 @@ GEM activesupport (>= 3) attr_required (>= 0.0.5) httpclient (>= 2.4) + sync (0.5.0) sysexits (1.2.0) systemu (2.6.5) temple (0.8.2) @@ -720,7 +721,8 @@ GEM tilt (2.0.10) timecop (0.9.1) timers (4.3.0) - tins (1.20.3) + tins (1.24.1) + sync to_regexp (0.2.1) turbo_dev_assets (0.0.2) twitter (6.2.0) -- cgit v1.2.3 From d0e5f90f845971875b7d7a7e659295e8c7ece8fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Fri, 20 Mar 2020 13:36:54 +0100 Subject: update yard to 0.9.24 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 85c90cd7a..d8ce7d9ad 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -782,7 +782,7 @@ GEM will_paginate (3.1.7) xpath (3.2.0) nokogiri (~> 1.8) - yard (0.9.20) + yard (0.9.24) PLATFORMS ruby -- cgit v1.2.3 From 27493cee41d7184aebbed6a977c8f0d12579acc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Fri, 20 Mar 2020 13:37:59 +0100 Subject: update rspec-rails to 3.9.1 --- Gemfile | 2 +- Gemfile.lock | 34 +++++++++++++++++----------------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/Gemfile b/Gemfile index 2fe8f2f7b..997d5dd72 100644 --- a/Gemfile +++ b/Gemfile @@ -304,7 +304,7 @@ end group :development, :test do # RSpec (unit tests, some integration tests) - gem "rspec-rails", "3.8.2" + gem "rspec-rails", "3.9.1" # Cucumber (integration tests) gem "cucumber-rails", "2.0.0", require: false diff --git a/Gemfile.lock b/Gemfile.lock index d8ce7d9ad..55931365a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -616,28 +616,28 @@ GEM rotp (2.1.2) rqrcode (0.10.1) chunky_png (~> 1.0) - rspec (3.8.0) - rspec-core (~> 3.8.0) - rspec-expectations (~> 3.8.0) - rspec-mocks (~> 3.8.0) - rspec-core (3.8.2) - rspec-support (~> 3.8.0) - rspec-expectations (3.8.4) + rspec (3.9.0) + rspec-core (~> 3.9.0) + rspec-expectations (~> 3.9.0) + rspec-mocks (~> 3.9.0) + rspec-core (3.9.1) + rspec-support (~> 3.9.1) + rspec-expectations (3.9.1) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.8.0) + rspec-support (~> 3.9.0) rspec-json_expectations (2.2.0) - rspec-mocks (3.8.1) + rspec-mocks (3.9.1) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.8.0) - rspec-rails (3.8.2) + rspec-support (~> 3.9.0) + rspec-rails (3.9.1) actionpack (>= 3.0) activesupport (>= 3.0) railties (>= 3.0) - rspec-core (~> 3.8.0) - rspec-expectations (~> 3.8.0) - rspec-mocks (~> 3.8.0) - rspec-support (~> 3.8.0) - rspec-support (3.8.3) + rspec-core (~> 3.9.0) + rspec-expectations (~> 3.9.0) + rspec-mocks (~> 3.9.0) + rspec-support (~> 3.9.0) + rspec-support (3.9.2) rubocop (0.72.0) jaro_winkler (~> 1.5.1) parallel (~> 1.10) @@ -900,7 +900,7 @@ DEPENDENCIES responders (= 2.4.1) rqrcode (= 0.10.1) rspec-json_expectations (~> 2.1) - rspec-rails (= 3.8.2) + rspec-rails (= 3.9.1) rubocop (= 0.72.0) rubocop-rails (= 2.1.0) ruby-oembed (= 0.12.0) -- cgit v1.2.3 From 872d87c772812ea04dac40a05923ddeaeead8e65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Fri, 20 Mar 2020 13:40:31 +0100 Subject: update webmock to 3.8.3 --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 997d5dd72..7f744b8c7 100644 --- a/Gemfile +++ b/Gemfile @@ -294,7 +294,7 @@ group :test do gem "factory_girl_rails", "4.9.0" gem "shoulda-matchers", "4.0.1" gem "timecop", "0.9.1" - gem "webmock", "3.6.0", require: false + gem "webmock", "3.8.3", require: false gem "diaspora_federation-test", "0.2.6" diff --git a/Gemfile.lock b/Gemfile.lock index 55931365a..d86212daf 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -772,7 +772,7 @@ GEM webfinger (1.1.0) activesupport httpclient (>= 2.4) - webmock (3.6.0) + webmock (3.8.3) addressable (>= 2.3.6) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) @@ -928,7 +928,7 @@ DEPENDENCIES unicorn-worker-killer (= 0.4.4) uuid (= 2.3.9) versionist (= 2.0.0) - webmock (= 3.6.0) + webmock (= 3.8.3) will_paginate (= 3.1.7) BUNDLED WITH -- cgit v1.2.3 From 05ee8f3db06f68253b1b246a10b3989a02fd6a44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Fri, 20 Mar 2020 13:48:00 +0100 Subject: update unicorn to 5.5.3 --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 7f744b8c7..a72f7bc94 100644 --- a/Gemfile +++ b/Gemfile @@ -10,7 +10,7 @@ gem "responders", "2.4.1" # Appserver -gem "unicorn", "5.5.1", require: false +gem "unicorn", "5.5.3", require: false gem "unicorn-worker-killer", "0.4.4" # Federation diff --git a/Gemfile.lock b/Gemfile.lock index d86212daf..976b49231 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -748,7 +748,7 @@ GEM unf_ext unf_ext (0.0.7.6) unicode-display_width (1.6.1) - unicorn (5.5.1) + unicorn (5.5.3) kgio (~> 2.6) raindrops (~> 0.7) unicorn-worker-killer (0.4.4) @@ -924,7 +924,7 @@ DEPENDENCIES twitter-text (= 1.14.7) typhoeus (= 1.3.1) uglifier (= 4.1.20) - unicorn (= 5.5.1) + unicorn (= 5.5.3) unicorn-worker-killer (= 0.4.4) uuid (= 2.3.9) versionist (= 2.0.0) -- cgit v1.2.3 From d9ef60b8b32365dc75cc95a4483325b9db102fe0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Fri, 20 Mar 2020 13:49:10 +0100 Subject: update uglifier to 4.2.0 --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index a72f7bc94..174f6d465 100644 --- a/Gemfile +++ b/Gemfile @@ -46,7 +46,7 @@ gem "sidekiq-cron", "1.1.0" # Compression -gem "uglifier", "4.1.20" +gem "uglifier", "4.2.0" # Configuration diff --git a/Gemfile.lock b/Gemfile.lock index 976b49231..205762abc 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -742,7 +742,7 @@ GEM ethon (>= 0.9.0) tzinfo (1.2.6) thread_safe (~> 0.1) - uglifier (4.1.20) + uglifier (4.2.0) execjs (>= 0.3.0, < 3) unf (0.1.4) unf_ext @@ -923,7 +923,7 @@ DEPENDENCIES twitter (= 6.2.0) twitter-text (= 1.14.7) typhoeus (= 1.3.1) - uglifier (= 4.1.20) + uglifier (= 4.2.0) unicorn (= 5.5.3) unicorn-worker-killer (= 0.4.4) uuid (= 2.3.9) -- cgit v1.2.3 From 3eba2f3fa3d6bb6a6bf939f60635b70f9902a746 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Fri, 20 Mar 2020 13:50:05 +0100 Subject: update fog-aws to 3.5.2 --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 174f6d465..fb97b0dac 100644 --- a/Gemfile +++ b/Gemfile @@ -80,7 +80,7 @@ gem "activerecord-import", "1.0.2" # File uploading gem "carrierwave", "1.3.1" -gem "fog-aws", "3.5.1" +gem "fog-aws", "3.5.2" gem "mini_magick", "4.10.1" # GUID generation diff --git a/Gemfile.lock b/Gemfile.lock index 205762abc..23f813b61 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -242,7 +242,7 @@ GEM activerecord (>= 2) activesupport (>= 2) hashdiff - fog-aws (3.5.1) + fog-aws (3.5.2) fog-core (~> 2.1) fog-json (~> 1.1) fog-xml (~> 0.1) @@ -819,7 +819,7 @@ DEPENDENCIES faraday-cookie_jar (= 0.0.6) faraday_middleware (= 0.13.1) fixture_builder (= 0.5.2) - fog-aws (= 3.5.1) + fog-aws (= 3.5.2) fuubar (= 2.5.0) gon (= 6.2.1) guard (= 2.16.1) -- cgit v1.2.3 From c74b0ab6118e09fd40d5ee632514b9ad3638b09d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Fri, 20 Mar 2020 13:50:21 +0100 Subject: update nokogiri to 1.10.9 --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index fb97b0dac..cb3ad0dc6 100644 --- a/Gemfile +++ b/Gemfile @@ -142,7 +142,7 @@ gem "leaflet-rails", "1.5.1" # Parsing -gem "nokogiri", "1.10.8" +gem "nokogiri", "1.10.9" gem "open_graph_reader", "0.7.0" # also update User-Agent in features/support/webmock.rb gem "redcarpet", "3.4.0" gem "ruby-oembed", "0.12.0" diff --git a/Gemfile.lock b/Gemfile.lock index 23f813b61..67c80e005 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -415,7 +415,7 @@ GEM naught (1.1.0) nenv (0.3.0) nio4r (2.5.2) - nokogiri (1.10.8) + nokogiri (1.10.9) mini_portile2 (~> 2.4.0) notiffany (0.1.3) nenv (~> 0.1) @@ -846,7 +846,7 @@ DEPENDENCIES minitest mobile-fu (= 1.4.0) mysql2 (= 0.5.2) - nokogiri (= 1.10.8) + nokogiri (= 1.10.9) omniauth (= 1.9.0) omniauth-tumblr (= 1.2) omniauth-twitter (= 1.4.0) -- cgit v1.2.3 From 78b62dd3edf421c6ef77107f115ef96423a1ba51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Fri, 20 Mar 2020 13:51:44 +0100 Subject: update addressable to 2.7.0 --- Gemfile | 2 +- Gemfile.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index cb3ad0dc6..56500d622 100644 --- a/Gemfile +++ b/Gemfile @@ -181,7 +181,7 @@ gem "acts-as-taggable-on", "6.0.0" # URIs and HTTP -gem "addressable", "2.6.0", require: "addressable/uri" +gem "addressable", "2.7.0", require: "addressable/uri" gem "faraday", "0.15.4" gem "faraday_middleware", "0.13.1" gem "faraday-cookie_jar", "0.0.6" diff --git a/Gemfile.lock b/Gemfile.lock index 67c80e005..f54412caa 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -54,8 +54,8 @@ GEM activemodel (>= 3.0.0) activesupport (>= 3.0.0) rack (>= 1.1.0) - addressable (2.6.0) - public_suffix (>= 2.0.2, < 4.0) + addressable (2.7.0) + public_suffix (>= 2.0.2, < 5.0) aes_key_wrap (1.0.1) arel (9.0.0) asset_sync (2.7.0) @@ -495,7 +495,7 @@ GEM pry-byebug (3.8.0) byebug (~> 11.0) pry (~> 0.10) - public_suffix (3.1.1) + public_suffix (4.0.3) raabro (1.1.6) rack (2.2.2) rack-cors (1.1.1) @@ -792,7 +792,7 @@ DEPENDENCIES activerecord-import (= 1.0.2) acts-as-taggable-on (= 6.0.0) acts_as_api (= 1.0.1) - addressable (= 2.6.0) + addressable (= 2.7.0) asset_sync (= 2.7.0) autoprefixer-rails (= 8.6.5) bootstrap-sass (= 3.4.1) -- cgit v1.2.3 From d6814878e9e213733d0ec11180e255861bb4f087 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Fri, 20 Mar 2020 13:53:21 +0100 Subject: update gon to 6.3.2 --- Gemfile | 2 +- Gemfile.lock | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index 56500d622..7abfb35fa 100644 --- a/Gemfile +++ b/Gemfile @@ -189,7 +189,7 @@ gem "typhoeus", "1.3.1" # Views -gem "gon", "6.2.1" +gem "gon", "6.3.2" gem "hamlit", "2.9.3" gem "mobile-fu", "1.4.0" gem "rails-timeago", "2.17.1" diff --git a/Gemfile.lock b/Gemfile.lock index f54412caa..ed360e494 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -273,8 +273,9 @@ GEM terminal-table (~> 1.5, >= 1.5.1) globalid (0.4.2) activesupport (>= 4.2.0) - gon (6.2.1) - actionpack (>= 3.0) + gon (6.3.2) + actionpack (>= 3.0.20) + i18n (>= 0.7) multi_json request_store (>= 1.0) guard (2.16.1) @@ -821,7 +822,7 @@ DEPENDENCIES fixture_builder (= 0.5.2) fog-aws (= 3.5.2) fuubar (= 2.5.0) - gon (= 6.2.1) + gon (= 6.3.2) guard (= 2.16.1) guard-rspec (= 4.7.3) guard-rubocop (= 1.3.0) -- cgit v1.2.3 From 8913a30d57d24289d3b71dd644b68f1180e08b18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Fri, 20 Mar 2020 13:55:10 +0100 Subject: update haml_lint to 0.35.0 --- Gemfile | 2 +- Gemfile.lock | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/Gemfile b/Gemfile index 7abfb35fa..128906a53 100644 --- a/Gemfile +++ b/Gemfile @@ -248,7 +248,7 @@ group :development do gem "rb-inotify", "0.10.1", require: false # Linters - gem "haml_lint", "0.28.0", require: false + gem "haml_lint", "0.35.0", require: false gem "pronto", "0.10.0", require: false gem "pronto-eslint", "0.10.0", require: false gem "pronto-haml", "0.10.0", require: false diff --git a/Gemfile.lock b/Gemfile.lock index ed360e494..7289a3061 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -295,13 +295,12 @@ GEM guard-rubocop (1.3.0) guard (~> 2.0) rubocop (~> 0.20) - haml (5.0.4) + haml (5.1.2) temple (>= 0.8.0) tilt - haml_lint (0.28.0) - haml (>= 4.0, < 5.1) + haml_lint (0.35.0) + haml (>= 4.0, < 5.2) rainbow - rake (>= 10, < 13) rubocop (>= 0.50.0) sysexits (~> 1.1) hamlit (2.9.3) @@ -826,7 +825,7 @@ DEPENDENCIES guard (= 2.16.1) guard-rspec (= 4.7.3) guard-rubocop (= 1.3.0) - haml_lint (= 0.28.0) + haml_lint (= 0.35.0) hamlit (= 2.9.3) handlebars_assets (= 0.23.4) http_accept_language (= 2.1.1) -- cgit v1.2.3 From a4dd210669fd9b33c307ffbc776e6068852cee58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Fri, 20 Mar 2020 13:56:01 +0100 Subject: update hamlit to 2.11.0 --- Gemfile | 2 +- Gemfile.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index 128906a53..2c772ff38 100644 --- a/Gemfile +++ b/Gemfile @@ -190,7 +190,7 @@ gem "typhoeus", "1.3.1" # Views gem "gon", "6.3.2" -gem "hamlit", "2.9.3" +gem "hamlit", "2.11.0" gem "mobile-fu", "1.4.0" gem "rails-timeago", "2.17.1" gem "will_paginate", "3.1.7" diff --git a/Gemfile.lock b/Gemfile.lock index 7289a3061..9850066a7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -303,8 +303,8 @@ GEM rainbow rubocop (>= 0.50.0) sysexits (~> 1.1) - hamlit (2.9.3) - temple (>= 0.8.0) + hamlit (2.11.0) + temple (>= 0.8.2) thor tilt handlebars_assets (0.23.4) @@ -826,7 +826,7 @@ DEPENDENCIES guard-rspec (= 4.7.3) guard-rubocop (= 1.3.0) haml_lint (= 0.35.0) - hamlit (= 2.9.3) + hamlit (= 2.11.0) handlebars_assets (= 0.23.4) http_accept_language (= 2.1.1) i18n-inflector-rails (= 1.0.7) -- cgit v1.2.3 From ecdf130bcd43c0f8d63a61e33f1c2ae241877e58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Fri, 20 Mar 2020 13:57:05 +0100 Subject: update handlebars_assets to 0.23.8 --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 2c772ff38..731d01523 100644 --- a/Gemfile +++ b/Gemfile @@ -92,7 +92,7 @@ gem "entypo-rails", "3.0.0" # JavaScript -gem "handlebars_assets", "0.23.4" +gem "handlebars_assets", "0.23.8" gem "jquery-rails", "4.3.5" gem "js-routes", "1.4.7" gem "js_image_paths", "0.1.1" diff --git a/Gemfile.lock b/Gemfile.lock index 9850066a7..c5e5ab643 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -307,7 +307,7 @@ GEM temple (>= 0.8.2) thor tilt - handlebars_assets (0.23.4) + handlebars_assets (0.23.8) execjs (~> 2.0) sprockets (>= 2.0.0) tilt (>= 1.2) @@ -827,7 +827,7 @@ DEPENDENCIES guard-rubocop (= 1.3.0) haml_lint (= 0.35.0) hamlit (= 2.11.0) - handlebars_assets (= 0.23.4) + handlebars_assets (= 0.23.8) http_accept_language (= 2.1.1) i18n-inflector-rails (= 1.0.7) jasmine (= 3.5.1) -- cgit v1.2.3 From 04c545ef7d363e7e581a52441163e895f3cba2f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Fri, 20 Mar 2020 13:57:39 +0100 Subject: update js-routes to 1.4.9 --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 731d01523..7f0e295d4 100644 --- a/Gemfile +++ b/Gemfile @@ -94,7 +94,7 @@ gem "entypo-rails", "3.0.0" gem "handlebars_assets", "0.23.8" gem "jquery-rails", "4.3.5" -gem "js-routes", "1.4.7" +gem "js-routes", "1.4.9" gem "js_image_paths", "0.1.1" source "https://gems.diasporafoundation.org" do diff --git a/Gemfile.lock b/Gemfile.lock index c5e5ab643..e6d40ec69 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -348,7 +348,7 @@ GEM rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) - js-routes (1.4.7) + js-routes (1.4.9) railties (>= 4) sprockets-rails js_image_paths (0.1.1) @@ -833,7 +833,7 @@ DEPENDENCIES jasmine (= 3.5.1) jasmine-jquery-rails (= 2.0.3) jquery-rails (= 4.3.5) - js-routes (= 1.4.7) + js-routes (= 1.4.9) js_image_paths (= 0.1.1) json (= 2.3.0) json-schema (= 2.8.1) -- cgit v1.2.3 From db8bc5d874a50d24c9ad5a02d1e30d2f702db544 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Fri, 20 Mar 2020 14:02:55 +0100 Subject: update leaflet-rails to 1.6.0 --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 7f0e295d4..25ebcf0a8 100644 --- a/Gemfile +++ b/Gemfile @@ -138,7 +138,7 @@ gem "rails-i18n", "5.1.3" gem "markerb", "1.1.0" # Map -gem "leaflet-rails", "1.5.1" +gem "leaflet-rails", "1.6.0" # Parsing diff --git a/Gemfile.lock b/Gemfile.lock index e6d40ec69..9a0104784 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -370,7 +370,7 @@ GEM jwt (2.2.1) kgio (2.11.3) kostya-sigar (2.0.6) - leaflet-rails (1.5.1) + leaflet-rails (1.6.0) rails (>= 4.2.0) listen (3.2.1) rb-fsevent (~> 0.10, >= 0.10.3) @@ -838,7 +838,7 @@ DEPENDENCIES json (= 2.3.0) json-schema (= 2.8.1) json-schema-rspec (= 0.0.4) - leaflet-rails (= 1.5.1) + leaflet-rails (= 1.6.0) logging-rails (= 0.6.0) markdown-it-html5-embed (= 1.0.0) markerb (= 1.1.0) -- cgit v1.2.3 From a681b317f375c0dd863845643cb9ea22b945de91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Fri, 20 Mar 2020 14:14:32 +0100 Subject: update mysql2 to 0.5.3 --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 25ebcf0a8..6a2d13ae9 100644 --- a/Gemfile +++ b/Gemfile @@ -68,7 +68,7 @@ gem "sprockets-rails", "3.2.1" # Database group :mysql, optional: true do - gem "mysql2", "0.5.2" + gem "mysql2", "0.5.3" end group :postgresql, optional: true do gem "pg", "1.1.4" diff --git a/Gemfile.lock b/Gemfile.lock index 9a0104784..ca4837965 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -411,7 +411,7 @@ GEM multi_test (0.1.2) multi_xml (0.6.0) multipart-post (2.1.1) - mysql2 (0.5.2) + mysql2 (0.5.3) naught (1.1.0) nenv (0.3.0) nio4r (2.5.2) @@ -845,7 +845,7 @@ DEPENDENCIES mini_magick (= 4.10.1) minitest mobile-fu (= 1.4.0) - mysql2 (= 0.5.2) + mysql2 (= 0.5.3) nokogiri (= 1.10.9) omniauth (= 1.9.0) omniauth-tumblr (= 1.2) -- cgit v1.2.3 From 33405d6ee63bd5ceb0ce0a8275d6636ccfe2149e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Fri, 20 Mar 2020 14:15:48 +0100 Subject: update pg to 1.2.3 --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 6a2d13ae9..97312c1cb 100644 --- a/Gemfile +++ b/Gemfile @@ -71,7 +71,7 @@ group :mysql, optional: true do gem "mysql2", "0.5.3" end group :postgresql, optional: true do - gem "pg", "1.1.4" + gem "pg", "1.2.3" end diff --git a/Gemfile.lock b/Gemfile.lock index ca4837965..fdbc053db 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -464,7 +464,7 @@ GEM parallel (1.19.1) parser (2.7.0.4) ast (~> 2.4.0) - pg (1.1.4) + pg (1.2.3) phantomjs (2.1.1.0) poltergeist (1.18.1) capybara (>= 2.1, < 4) @@ -853,7 +853,7 @@ DEPENDENCIES omniauth-wordpress (= 0.2.2) open_graph_reader (= 0.7.0) openid_connect (= 1.1.8) - pg (= 1.1.4) + pg (= 1.2.3) poltergeist (= 1.18.1) pronto (= 0.10.0) pronto-eslint (= 0.10.0) -- cgit v1.2.3 From a7f3ea976f74f8ff79edbec70d9cb1347839917f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Fri, 20 Mar 2020 14:17:02 +0100 Subject: update redcarpet to 3.5.0 --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 97312c1cb..442827f85 100644 --- a/Gemfile +++ b/Gemfile @@ -144,7 +144,7 @@ gem "leaflet-rails", "1.6.0" gem "nokogiri", "1.10.9" gem "open_graph_reader", "0.7.0" # also update User-Agent in features/support/webmock.rb -gem "redcarpet", "3.4.0" +gem "redcarpet", "3.5.0" gem "ruby-oembed", "0.12.0" gem "twitter-text", "1.14.7" diff --git a/Gemfile.lock b/Gemfile.lock index fdbc053db..bf440ebc4 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -605,7 +605,7 @@ GEM rb-fsevent (0.10.3) rb-inotify (0.10.1) ffi (~> 1.0) - redcarpet (3.4.0) + redcarpet (3.5.0) redis (3.3.5) regexp_parser (1.7.0) request_store (1.5.0) @@ -895,7 +895,7 @@ DEPENDENCIES rails-timeago (= 2.17.1) rb-fsevent (= 0.10.3) rb-inotify (= 0.10.1) - redcarpet (= 3.4.0) + redcarpet (= 3.5.0) redis (= 3.3.5) responders (= 2.4.1) rqrcode (= 0.10.1) -- cgit v1.2.3 From 3042b385c646ca3d39e330d6967ee2b711aa3a82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Fri, 20 Mar 2020 14:20:00 +0100 Subject: update string-direction to 1.2.2 --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 442827f85..3b259e266 100644 --- a/Gemfile +++ b/Gemfile @@ -150,7 +150,7 @@ gem "twitter-text", "1.14.7" # RTL support -gem "string-direction", "1.2.1" +gem "string-direction", "1.2.2" # Security Headers diff --git a/Gemfile.lock b/Gemfile.lock index bf440ebc4..8c420e4a2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -703,7 +703,7 @@ GEM activesupport (>= 4.0) sprockets (>= 3.0.0) state_machines (0.5.0) - string-direction (1.2.1) + string-direction (1.2.2) swd (1.1.2) activesupport (>= 3) attr_required (>= 0.0.5) @@ -917,7 +917,7 @@ DEPENDENCIES spring-commands-cucumber (= 1.0.1) spring-commands-rspec (= 1.0.4) sprockets-rails (= 3.2.1) - string-direction (= 1.2.1) + string-direction (= 1.2.2) timecop (= 0.9.1) turbo_dev_assets (= 0.0.2) twitter (= 6.2.0) -- cgit v1.2.3 From de4a416280481fa7d9b01df3316e83084dd0e368 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Fri, 20 Mar 2020 14:20:22 +0100 Subject: update versionist to 2.0.1 --- Gemfile | 2 +- Gemfile.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index 3b259e266..59a6ba525 100644 --- a/Gemfile +++ b/Gemfile @@ -210,7 +210,7 @@ gem "rubyzip", "1.3.0", require: "zip" # https://github.com/discourse/discourse/pull/238 gem "minitest" -gem "versionist", "2.0.0" +gem "versionist", "2.0.1" # Windows and OSX have an execjs compatible runtime built-in, Linux users should # install Node.js or use "therubyracer". diff --git a/Gemfile.lock b/Gemfile.lock index 8c420e4a2..c39792320 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -763,10 +763,10 @@ GEM validate_url (1.0.8) activemodel (>= 3.0.0) public_suffix - versionist (2.0.0) + versionist (2.0.1) activesupport (>= 3) railties (>= 3) - yard (~> 0.9.11) + yard (~> 0.9.20) warden (1.2.8) rack (>= 2.0.6) webfinger (1.1.0) @@ -927,7 +927,7 @@ DEPENDENCIES unicorn (= 5.5.3) unicorn-worker-killer (= 0.4.4) uuid (= 2.3.9) - versionist (= 2.0.0) + versionist (= 2.0.1) webmock (= 3.8.3) will_paginate (= 3.1.7) -- cgit v1.2.3 From 60a50c881d9324429dbedf03dfb627a94084e0a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Fri, 20 Mar 2020 14:21:55 +0100 Subject: update will_paginate to 3.3.0 --- Gemfile | 2 +- Gemfile.lock | 4 ++-- spec/integration/tag_people_spec.rb | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index 59a6ba525..0346e9e61 100644 --- a/Gemfile +++ b/Gemfile @@ -193,7 +193,7 @@ gem "gon", "6.3.2" gem "hamlit", "2.11.0" gem "mobile-fu", "1.4.0" gem "rails-timeago", "2.17.1" -gem "will_paginate", "3.1.7" +gem "will_paginate", "3.3.0" # Logging diff --git a/Gemfile.lock b/Gemfile.lock index c39792320..387777ea0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -779,7 +779,7 @@ GEM websocket-driver (0.7.1) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.4) - will_paginate (3.1.7) + will_paginate (3.3.0) xpath (3.2.0) nokogiri (~> 1.8) yard (0.9.24) @@ -929,7 +929,7 @@ DEPENDENCIES uuid (= 2.3.9) versionist (= 2.0.1) webmock (= 3.8.3) - will_paginate (= 3.1.7) + will_paginate (= 3.3.0) BUNDLED WITH 1.17.3 diff --git a/spec/integration/tag_people_spec.rb b/spec/integration/tag_people_spec.rb index ea8174e05..09ea0cb5b 100644 --- a/spec/integration/tag_people_spec.rb +++ b/spec/integration/tag_people_spec.rb @@ -14,7 +14,7 @@ describe TagsController, type: :request do get "/tags/#{tag}" expect(response.status).to eq(200) - expect(response.body).to match(/div class="pagination"/) + expect(response.body).to match(/class="pagination"/) expect(response.body).to match(/href="\/tags\/#{tag}\?page=2"/) end -- cgit v1.2.3 From abec056c0229ad0858eb85f4e918179880c104a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Fri, 20 Mar 2020 14:34:03 +0100 Subject: update omniauth to 1.9.1 --- Gemfile | 2 +- Gemfile.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index 0346e9e61..34f5f7510 100644 --- a/Gemfile +++ b/Gemfile @@ -158,7 +158,7 @@ gem "secure_headers", "6.3.0" # Services -gem "omniauth", "1.9.0" +gem "omniauth", "1.9.1" gem "omniauth-tumblr", "1.2" gem "omniauth-twitter", "1.4.0" gem "omniauth-wordpress", "0.2.2" diff --git a/Gemfile.lock b/Gemfile.lock index 387777ea0..2f03e8fc5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -312,7 +312,7 @@ GEM sprockets (>= 2.0.0) tilt (>= 1.2) hashdiff (1.0.1) - hashie (3.6.0) + hashie (4.1.0) http (3.3.0) addressable (~> 2.3) http-cookie (~> 1.0) @@ -430,8 +430,8 @@ GEM octokit (4.17.0) faraday (>= 0.9) sawyer (~> 0.8.0, >= 0.5.3) - omniauth (1.9.0) - hashie (>= 3.4.6, < 3.7.0) + omniauth (1.9.1) + hashie (>= 3.4.6) rack (>= 1.6.2, < 3) omniauth-oauth (1.1.0) oauth @@ -847,7 +847,7 @@ DEPENDENCIES mobile-fu (= 1.4.0) mysql2 (= 0.5.3) nokogiri (= 1.10.9) - omniauth (= 1.9.0) + omniauth (= 1.9.1) omniauth-tumblr (= 1.2) omniauth-twitter (= 1.4.0) omniauth-wordpress (= 0.2.2) -- cgit v1.2.3 From a7119fa7c1f2a54e723b181de630cfe05f37ac2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Fri, 20 Mar 2020 14:36:22 +0100 Subject: update activerecord-import to 1.0.4 --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 34f5f7510..b9c6c462d 100644 --- a/Gemfile +++ b/Gemfile @@ -75,7 +75,7 @@ group :postgresql, optional: true do end -gem "activerecord-import", "1.0.2" +gem "activerecord-import", "1.0.4" # File uploading diff --git a/Gemfile.lock b/Gemfile.lock index 2f03e8fc5..71a4c74cc 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -37,7 +37,7 @@ GEM activemodel (= 5.2.4.2) activesupport (= 5.2.4.2) arel (>= 9.0) - activerecord-import (1.0.2) + activerecord-import (1.0.4) activerecord (>= 3.2) activestorage (5.2.4.2) actionpack (= 5.2.4.2) @@ -789,7 +789,7 @@ PLATFORMS DEPENDENCIES active_model_serializers (= 0.9.7) - activerecord-import (= 1.0.2) + activerecord-import (= 1.0.4) acts-as-taggable-on (= 6.0.0) acts_as_api (= 1.0.1) addressable (= 2.7.0) -- cgit v1.2.3 From 4a5610df2fe23b267505a0895864205bbd689ad0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Fri, 20 Mar 2020 14:37:53 +0100 Subject: update acts-as-taggable-on to 6.5.0 --- Gemfile | 2 +- Gemfile.lock | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index b9c6c462d..72c3b61eb 100644 --- a/Gemfile +++ b/Gemfile @@ -177,7 +177,7 @@ gem "rails-assets-diaspora_jsxc", "0.1.5.develop.7", source: "https://gems.diasp # Tags -gem "acts-as-taggable-on", "6.0.0" +gem "acts-as-taggable-on", "6.5.0" # URIs and HTTP diff --git a/Gemfile.lock b/Gemfile.lock index 71a4c74cc..35ef8f50f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -48,8 +48,8 @@ GEM i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) - acts-as-taggable-on (6.0.0) - activerecord (~> 5.0) + acts-as-taggable-on (6.5.0) + activerecord (>= 5.0, < 6.1) acts_as_api (1.0.1) activemodel (>= 3.0.0) activesupport (>= 3.0.0) @@ -790,7 +790,7 @@ PLATFORMS DEPENDENCIES active_model_serializers (= 0.9.7) activerecord-import (= 1.0.4) - acts-as-taggable-on (= 6.0.0) + acts-as-taggable-on (= 6.5.0) acts_as_api (= 1.0.1) addressable (= 2.7.0) asset_sync (= 2.7.0) -- cgit v1.2.3 From bec7e77e9ee01c05723ea9b08e03d15b1e53d0ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Fri, 20 Mar 2020 14:38:55 +0100 Subject: update asset_sync to 2.11.0 --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 72c3b61eb..d6d7b145a 100644 --- a/Gemfile +++ b/Gemfile @@ -236,7 +236,7 @@ group :production do # we don"t install these on travis to speed up test runs # Third party asset hosting - gem "asset_sync", "2.7.0", require: false + gem "asset_sync", "2.11.0", require: false end group :development do diff --git a/Gemfile.lock b/Gemfile.lock index 35ef8f50f..dbab0d385 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -58,7 +58,7 @@ GEM public_suffix (>= 2.0.2, < 5.0) aes_key_wrap (1.0.1) arel (9.0.0) - asset_sync (2.7.0) + asset_sync (2.11.0) activemodel (>= 4.1.0) fog-core mime-types (>= 2.99) @@ -793,7 +793,7 @@ DEPENDENCIES acts-as-taggable-on (= 6.5.0) acts_as_api (= 1.0.1) addressable (= 2.7.0) - asset_sync (= 2.7.0) + asset_sync (= 2.11.0) autoprefixer-rails (= 8.6.5) bootstrap-sass (= 3.4.1) bootstrap-switch-rails (= 3.3.3) -- cgit v1.2.3 From 1da14f2ef766c3eb31308502cc51a4b77920c798 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Fri, 20 Mar 2020 14:49:21 +0100 Subject: update sidekiq to 5.2.8 --- Gemfile | 2 +- Gemfile.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index d6d7b145a..045efe099 100644 --- a/Gemfile +++ b/Gemfile @@ -38,7 +38,7 @@ gem "simple_captcha2", "0.4.3", require: "simple_captcha" # Background processing gem "redis", "3.3.5" # Pinned to 3.3.x because of https://github.com/antirez/redis/issues/4272 -gem "sidekiq", "5.2.7" +gem "sidekiq", "5.2.8" # Scheduled processing diff --git a/Gemfile.lock b/Gemfile.lock index dbab0d385..038d13aa6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -497,7 +497,7 @@ GEM pry (~> 0.10) public_suffix (4.0.3) raabro (1.1.6) - rack (2.2.2) + rack (2.0.9) rack-cors (1.1.1) rack (>= 2.0.0) rack-google-analytics (1.2.0) @@ -672,9 +672,9 @@ GEM shellany (0.0.1) shoulda-matchers (4.0.1) activesupport (>= 4.2.0) - sidekiq (5.2.7) + sidekiq (5.2.8) connection_pool (~> 2.2, >= 2.2.2) - rack (>= 1.5.0) + rack (< 2.1.0) rack-protection (>= 1.5.0) redis (>= 3.3.5, < 5) sidekiq-cron (1.1.0) @@ -908,7 +908,7 @@ DEPENDENCIES sass-rails (= 5.0.7) secure_headers (= 6.3.0) shoulda-matchers (= 4.0.1) - sidekiq (= 5.2.7) + sidekiq (= 5.2.8) sidekiq-cron (= 1.1.0) simple_captcha2 (= 0.4.3) simplecov (= 0.16.1) -- cgit v1.2.3 From 3a3a9008b62aedee381d1e8f932719c69d21e0a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Fri, 20 Mar 2020 14:50:40 +0100 Subject: update simple_captcha2 to 0.5.0 --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 045efe099..0b2d1b519 100644 --- a/Gemfile +++ b/Gemfile @@ -33,7 +33,7 @@ gem "rqrcode", "0.10.1" # Captcha -gem "simple_captcha2", "0.4.3", require: "simple_captcha" +gem "simple_captcha2", "0.5.0", require: "simple_captcha" # Background processing diff --git a/Gemfile.lock b/Gemfile.lock index 038d13aa6..6a8c96913 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -680,7 +680,7 @@ GEM sidekiq-cron (1.1.0) fugit (~> 1.1) sidekiq (>= 4.2.1) - simple_captcha2 (0.4.3) + simple_captcha2 (0.5.0) rails (>= 4.1) simple_oauth (0.3.1) simplecov (0.16.1) @@ -910,7 +910,7 @@ DEPENDENCIES shoulda-matchers (= 4.0.1) sidekiq (= 5.2.8) sidekiq-cron (= 1.1.0) - simple_captcha2 (= 0.4.3) + simple_captcha2 (= 0.5.0) simplecov (= 0.16.1) sinon-rails (= 1.15.0) spring (= 2.1.0) -- cgit v1.2.3 From 9b6bc598548bf2c14384c61c5f2a20e640dd31a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Fri, 20 Mar 2020 14:51:53 +0100 Subject: update twitter to 7.0.0 --- Gemfile | 2 +- Gemfile.lock | 17 +++++++++++------ 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/Gemfile b/Gemfile index 0b2d1b519..c4cf7ab04 100644 --- a/Gemfile +++ b/Gemfile @@ -162,7 +162,7 @@ gem "omniauth", "1.9.1" gem "omniauth-tumblr", "1.2" gem "omniauth-twitter", "1.4.0" gem "omniauth-wordpress", "0.2.2" -gem "twitter", "6.2.0" +gem "twitter", "7.0.0" # OpenID Connect gem "openid_connect", "1.1.8" diff --git a/Gemfile.lock b/Gemfile.lock index 6a8c96913..7aa2e84b5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -238,6 +238,9 @@ GEM faraday_middleware (0.13.1) faraday (>= 0.7.4, < 1.0) ffi (1.12.2) + ffi-compiler (1.0.1) + ffi (>= 1.0.0) + rake fixture_builder (0.5.2) activerecord (>= 2) activesupport (>= 2) @@ -313,14 +316,16 @@ GEM tilt (>= 1.2) hashdiff (1.0.1) hashie (4.1.0) - http (3.3.0) + http (4.3.0) addressable (~> 2.3) http-cookie (~> 1.0) - http-form_data (~> 2.0) - http_parser.rb (~> 0.6.0) + http-form_data (~> 2.2) + http-parser (~> 1.2.0) http-cookie (1.0.3) domain_name (~> 0.5) http-form_data (2.3.0) + http-parser (1.2.1) + ffi-compiler (>= 1.0, < 2.0) http_accept_language (2.1.1) http_parser.rb (0.6.0) httparty (0.18.0) @@ -725,11 +730,11 @@ GEM sync to_regexp (0.2.1) turbo_dev_assets (0.0.2) - twitter (6.2.0) + twitter (7.0.0) addressable (~> 2.3) buftok (~> 0.2.0) equalizer (~> 0.0.11) - http (~> 3.0) + http (~> 4.0) http-form_data (~> 2.0) http_parser.rb (~> 0.6.0) memoizable (~> 0.4.0) @@ -920,7 +925,7 @@ DEPENDENCIES string-direction (= 1.2.2) timecop (= 0.9.1) turbo_dev_assets (= 0.0.2) - twitter (= 6.2.0) + twitter (= 7.0.0) twitter-text (= 1.14.7) typhoeus (= 1.3.1) uglifier (= 4.2.0) -- cgit v1.2.3 From 813e6d4781e21115dcd687b2a73aa8451f49ef98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Fri, 20 Mar 2020 15:10:33 +0100 Subject: update rubocop to 0.80.1 and rubocop-rails to 2.4.1 --- .rubocop.yml | 17 +++++++++++++---- Gemfile | 4 ++-- Gemfile.lock | 12 +++++++----- 3 files changed, 22 insertions(+), 11 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index 28f9edea4..5b6980af4 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -12,7 +12,7 @@ Rails/HttpPositionalArguments: Enabled: false # Commonly used screens these days easily fit more than 80 characters. -Metrics/LineLength: +Layout/LineLength: Max: 120 # Too short methods lead to extraction of single-use methods, which can make @@ -62,7 +62,7 @@ Style/SymbolArray: Enabled: true # Most readable form. -Layout/AlignHash: +Layout/HashAlignment: EnforcedHashRocketStyle: table EnforcedColonStyle: table @@ -84,7 +84,6 @@ Style/CollectionMethods: # inject seems more common in the community. reduce: "inject" - # Either allow this style or don't. Marking it as safe with parenthesis # is silly. Let's try to live without them for now. Style/ParenthesesAroundCondition: @@ -111,7 +110,7 @@ Style/SignalException: # Suppressing exceptions can be perfectly fine, and be it to avoid to # explicitly type nil into the rescue since that's what you want to return, # or suppressing LoadError for optional dependencies -Lint/HandleExceptions: +Lint/SuppressedException: Enabled: false Layout/SpaceInsideBlockBraces: @@ -174,3 +173,13 @@ Style/NumericPredicate: # Reset some HoundCI changes back to Rubocop defaults Layout/DotPosition: EnforcedStyle: leading + +# Not enabled by default but good +Style/HashEachMethods: + Enabled: true + +# TODO: Enable with Ruby 2.5 +Style/HashTransformKeys: + Enabled: false +Style/HashTransformValues: + Enabled: false diff --git a/Gemfile b/Gemfile index c4cf7ab04..df7fb2d30 100644 --- a/Gemfile +++ b/Gemfile @@ -254,8 +254,8 @@ group :development do gem "pronto-haml", "0.10.0", require: false gem "pronto-rubocop", "0.10.0", require: false gem "pronto-scss", "0.10.0", require: false - gem "rubocop", "0.72.0", require: false - gem "rubocop-rails", "2.1.0", require: false + gem "rubocop", "0.80.1", require: false + gem "rubocop-rails", "2.4.1", require: false # Preloading environment diff --git a/Gemfile.lock b/Gemfile.lock index 7aa2e84b5..6ad403ea9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -618,6 +618,7 @@ GEM responders (2.4.1) actionpack (>= 4.2.0, < 6.0) railties (>= 4.2.0, < 6.0) + rexml (3.2.4) rotp (2.1.2) rqrcode (0.10.1) chunky_png (~> 1.0) @@ -643,14 +644,15 @@ GEM rspec-mocks (~> 3.9.0) rspec-support (~> 3.9.0) rspec-support (3.9.2) - rubocop (0.72.0) + rubocop (0.80.1) jaro_winkler (~> 1.5.1) parallel (~> 1.10) - parser (>= 2.6) + parser (>= 2.7.0.1) rainbow (>= 2.2.2, < 4.0) + rexml ruby-progressbar (~> 1.7) unicode-display_width (>= 1.4.0, < 1.7) - rubocop-rails (2.1.0) + rubocop-rails (2.4.1) rack (>= 1.1) rubocop (>= 0.72.0) ruby-oembed (0.12.0) @@ -906,8 +908,8 @@ DEPENDENCIES rqrcode (= 0.10.1) rspec-json_expectations (~> 2.1) rspec-rails (= 3.9.1) - rubocop (= 0.72.0) - rubocop-rails (= 2.1.0) + rubocop (= 0.80.1) + rubocop-rails (= 2.4.1) ruby-oembed (= 0.12.0) rubyzip (= 1.3.0) sass-rails (= 5.0.7) -- cgit v1.2.3 From bd7feb83a69aa51da729670cdc960f2d38edb947 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Fri, 20 Mar 2020 15:34:03 +0100 Subject: update rqrcode to 1.1.2 --- Gemfile | 2 +- Gemfile.lock | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index df7fb2d30..95e936015 100644 --- a/Gemfile +++ b/Gemfile @@ -29,7 +29,7 @@ gem "json-schema", "2.8.1" gem "devise", "4.7.1" gem "devise-two-factor", "3.0.3" gem "devise_lastseenable", "0.0.6" -gem "rqrcode", "0.10.1" +gem "rqrcode", "1.1.2" # Captcha diff --git a/Gemfile.lock b/Gemfile.lock index 6ad403ea9..ef1380388 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -620,8 +620,10 @@ GEM railties (>= 4.2.0, < 6.0) rexml (3.2.4) rotp (2.1.2) - rqrcode (0.10.1) + rqrcode (1.1.2) chunky_png (~> 1.0) + rqrcode_core (~> 0.1) + rqrcode_core (0.1.2) rspec (3.9.0) rspec-core (~> 3.9.0) rspec-expectations (~> 3.9.0) @@ -905,7 +907,7 @@ DEPENDENCIES redcarpet (= 3.5.0) redis (= 3.3.5) responders (= 2.4.1) - rqrcode (= 0.10.1) + rqrcode (= 1.1.2) rspec-json_expectations (~> 2.1) rspec-rails (= 3.9.1) rubocop (= 0.80.1) -- cgit v1.2.3 From 38d746b2408128a4275e2591e3cfe9712c40d12f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Fri, 20 Mar 2020 15:43:06 +0100 Subject: use latest ruby patch releases on travis --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index e32431bdd..135c5b9bd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,8 @@ language: ruby rvm: - - 2.4.2 - - 2.3.5 + - 2.4.9 + - 2.3.8 env: - DB=postgresql BUILD_TYPE=cucumber -- cgit v1.2.3 From ba8e0907cc6f112154476f12e9c2e37d8e7bd292 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Fri, 20 Mar 2020 18:24:08 +0100 Subject: update rails-timeago to 2.18.0 --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 95e936015..79b603a97 100644 --- a/Gemfile +++ b/Gemfile @@ -192,7 +192,7 @@ gem "typhoeus", "1.3.1" gem "gon", "6.3.2" gem "hamlit", "2.11.0" gem "mobile-fu", "1.4.0" -gem "rails-timeago", "2.17.1" +gem "rails-timeago", "2.18.0" gem "will_paginate", "3.3.0" # Logging diff --git a/Gemfile.lock b/Gemfile.lock index ef1380388..a76b22caf 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -595,7 +595,7 @@ GEM rails-i18n (5.1.3) i18n (>= 0.7, < 2) railties (>= 5.0, < 6) - rails-timeago (2.17.1) + rails-timeago (2.18.0) actionpack (>= 3.1) activesupport (>= 3.1) railties (5.2.4.2) @@ -901,7 +901,7 @@ DEPENDENCIES rails-assets-utatti-perfect-scrollbar (= 1.4.0)! rails-controller-testing (= 1.0.4) rails-i18n (= 5.1.3) - rails-timeago (= 2.17.1) + rails-timeago (= 2.18.0) rb-fsevent (= 0.10.3) rb-inotify (= 0.10.1) redcarpet (= 3.5.0) -- cgit v1.2.3 From 827a2ce991573d148fe66628f0eac852641a60bd Mon Sep 17 00:00:00 2001 From: Vitalie Ciubotaru Date: Tue, 1 Oct 2019 23:47:03 +0900 Subject: Remove links to deleted profiles in admin user stats closes #8063 closes #8061 --- Changelog.md | 1 + app/controllers/admins_controller.rb | 2 +- app/views/admins/_weekly_user_stats.haml | 6 +++++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Changelog.md b/Changelog.md index 61bf06894..4e39c99c0 100644 --- a/Changelog.md +++ b/Changelog.md @@ -3,6 +3,7 @@ ## Refactor ## Bug fixes +* Don't link to deleted users in admin user stats [#8063](https://github.com/diaspora/diaspora/pull/8063) ## Features diff --git a/app/controllers/admins_controller.rb b/app/controllers/admins_controller.rb index daad7c46f..3d00ff6e9 100644 --- a/app/controllers/admins_controller.rb +++ b/app/controllers/admins_controller.rb @@ -43,7 +43,7 @@ class AdminsController < Admin::AdminController @created_users = User.where("username IS NOT NULL and created_at IS NOT NULL") @created_users.find_each do |u| week = u.created_at.beginning_of_week.strftime("%Y-%m-%d") - @created_users_by_week[week] << u.username + @created_users_by_week[week] << {username: u.username, closed_account: u.person.closed_account} end @selected_week = params[:week] || @created_users_by_week.keys.last diff --git a/app/views/admins/_weekly_user_stats.haml b/app/views/admins/_weekly_user_stats.haml index a3a9eff07..51e8981d2 100644 --- a/app/views/admins/_weekly_user_stats.haml +++ b/app/views/admins/_weekly_user_stats.haml @@ -18,4 +18,8 @@ = t(".amount_of", count: counter) %br - created_users_by_week[selected_week].each do |m| - = link_to m, "/u/#{m}" + - if m[:closed_account] + %s + = m[:username] + - else + = link_to m[:username], "/u/#{m[:username]}" -- cgit v1.2.3 From f882dd2d6f82a55a9ddf4396314e8206c86fe416 Mon Sep 17 00:00:00 2001 From: Benjamin Neff Date: Sat, 28 Mar 2020 01:12:53 +0100 Subject: Bump octokit to 4.18.0 ... 4.17.0 was yanked :( See octokit/octokit.rb#1219 --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index a76b22caf..4cd16465b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -432,7 +432,7 @@ GEM multi_json (~> 1.3) multi_xml (~> 0.5) rack (>= 1.2, < 3) - octokit (4.17.0) + octokit (4.18.0) faraday (>= 0.9) sawyer (~> 0.8.0, >= 0.5.3) omniauth (1.9.1) -- cgit v1.2.3 From 7193099902486429b4fcbbb567bbca2f3cbef6d4 Mon Sep 17 00:00:00 2001 From: flaburgan Date: Sat, 13 Jun 2020 21:36:44 +0200 Subject: Bump ruby version to 2.6, drop support of 2.3 closes #7929 --- .ruby-version | 2 +- .travis.yml | 4 ++-- Changelog.md | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.ruby-version b/.ruby-version index 6b4950e3d..5154b3f68 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.4 +2.6 diff --git a/.travis.yml b/.travis.yml index 135c5b9bd..f3b0fd484 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,8 @@ language: ruby rvm: - - 2.4.9 - - 2.3.8 + - 2.6.6 + - 2.5.8 env: - DB=postgresql BUILD_TYPE=cucumber diff --git a/Changelog.md b/Changelog.md index 4e39c99c0..08ebdaacb 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,6 +1,7 @@ # 0.7.14.0 ## Refactor +* Update the suggested Ruby version to 2.6. If you run into trouble during the update and you followed our installation guides, run `rvm install 2.6`. [#7929](https://github.com/diaspora/diaspora/pull/7929) ## Bug fixes * Don't link to deleted users in admin user stats [#8063](https://github.com/diaspora/diaspora/pull/8063) -- cgit v1.2.3 From ad91dddd6319f837d06881d8ef2c20a9722354e6 Mon Sep 17 00:00:00 2001 From: Noah Leal Date: Thu, 11 Jun 2020 16:18:17 +0200 Subject: Issue #8119 - Add length validation to a profile's gender field. closes #8127 --- Changelog.md | 1 + app/models/profile.rb | 1 + spec/models/profile_spec.rb | 12 ++++++++++++ 3 files changed, 14 insertions(+) diff --git a/Changelog.md b/Changelog.md index 08ebdaacb..ece7eae94 100644 --- a/Changelog.md +++ b/Changelog.md @@ -5,6 +5,7 @@ ## Bug fixes * Don't link to deleted users in admin user stats [#8063](https://github.com/diaspora/diaspora/pull/8063) +* Properly validate a profile's gender field length instead of failing with a database error. [#8127](https://github.com/diaspora/diaspora/pull/8127) ## Features diff --git a/app/models/profile.rb b/app/models/profile.rb index 74ca9fec6..7a615ffae 100644 --- a/app/models/profile.rb +++ b/app/models/profile.rb @@ -21,6 +21,7 @@ class Profile < ApplicationRecord validates :first_name, :length => { :maximum => 32 } validates :last_name, :length => { :maximum => 32 } validates :location, :length => { :maximum =>255 } + validates :gender, length: {maximum: 255} validates_format_of :first_name, :with => /\A[^;]+\z/, :allow_blank => true validates_format_of :last_name, :with => /\A[^;]+\z/, :allow_blank => true diff --git a/spec/models/profile_spec.rb b/spec/models/profile_spec.rb index c1a83f13f..f0cafecf1 100644 --- a/spec/models/profile_spec.rb +++ b/spec/models/profile_spec.rb @@ -124,6 +124,18 @@ describe Profile, :type => :model do end end + describe "of gender" do + it "can be 255 characters long" do + profile = FactoryGirl.build(:profile, gender: "a" * 255) + expect(profile).to be_valid + end + + it "cannot be 256 characters" do + profile = FactoryGirl.build(:profile, gender: "a" * 256) + expect(profile).not_to be_valid + end + end + describe "image_url setters" do %i(image_url image_url_small image_url_medium).each do |method| describe "##{method}=" do -- cgit v1.2.3 From 77062cbcafa68dde58ca159b6305e3d42a694571 Mon Sep 17 00:00:00 2001 From: Dennis Schubert Date: Sat, 13 Jun 2020 23:49:57 +0200 Subject: Bump Rails --- Gemfile | 2 +- Gemfile.lock | 88 ++++++++++++++++++++++++++++++------------------------------ 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/Gemfile b/Gemfile index 79b603a97..e35e5da47 100644 --- a/Gemfile +++ b/Gemfile @@ -2,7 +2,7 @@ source "https://rubygems.org" -gem "rails", "5.2.4.2" +gem "rails", "5.2.4.3" # Legacy Rails features, remove me! # responders (class level) diff --git a/Gemfile.lock b/Gemfile.lock index 4cd16465b..c9783a4d2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -2,25 +2,25 @@ GEM remote: https://rubygems.org/ remote: https://gems.diasporafoundation.org/ specs: - actioncable (5.2.4.2) - actionpack (= 5.2.4.2) + actioncable (5.2.4.3) + actionpack (= 5.2.4.3) nio4r (~> 2.0) websocket-driver (>= 0.6.1) - actionmailer (5.2.4.2) - actionpack (= 5.2.4.2) - actionview (= 5.2.4.2) - activejob (= 5.2.4.2) + actionmailer (5.2.4.3) + actionpack (= 5.2.4.3) + actionview (= 5.2.4.3) + activejob (= 5.2.4.3) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 2.0) - actionpack (5.2.4.2) - actionview (= 5.2.4.2) - activesupport (= 5.2.4.2) + actionpack (5.2.4.3) + actionview (= 5.2.4.3) + activesupport (= 5.2.4.3) rack (~> 2.0, >= 2.0.8) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.2.4.2) - activesupport (= 5.2.4.2) + actionview (5.2.4.3) + activesupport (= 5.2.4.3) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) @@ -28,22 +28,22 @@ GEM active_model_serializers (0.9.7) activemodel (>= 3.2) concurrent-ruby (~> 1.0) - activejob (5.2.4.2) - activesupport (= 5.2.4.2) + activejob (5.2.4.3) + activesupport (= 5.2.4.3) globalid (>= 0.3.6) - activemodel (5.2.4.2) - activesupport (= 5.2.4.2) - activerecord (5.2.4.2) - activemodel (= 5.2.4.2) - activesupport (= 5.2.4.2) + activemodel (5.2.4.3) + activesupport (= 5.2.4.3) + activerecord (5.2.4.3) + activemodel (= 5.2.4.3) + activesupport (= 5.2.4.3) arel (>= 9.0) activerecord-import (1.0.4) activerecord (>= 3.2) - activestorage (5.2.4.2) - actionpack (= 5.2.4.2) - activerecord (= 5.2.4.2) + activestorage (5.2.4.3) + actionpack (= 5.2.4.3) + activerecord (= 5.2.4.3) marcel (~> 0.3.1) - activesupport (5.2.4.2) + activesupport (5.2.4.3) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) @@ -332,7 +332,7 @@ GEM mime-types (~> 3.0) multi_xml (>= 0.5.2) httpclient (2.8.3) - i18n (1.8.2) + i18n (1.8.3) concurrent-ruby (~> 1.0) i18n-inflector (2.6.7) i18n (>= 0.4.1) @@ -386,7 +386,7 @@ GEM multi_json (~> 1.10) logging-rails (0.6.0) logging (>= 1.8) - loofah (2.4.0) + loofah (2.5.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) lumberjack (1.2.4) @@ -404,11 +404,11 @@ GEM mime-types (3.3.1) mime-types-data (~> 3.2015) mime-types-data (3.2019.1009) - mimemagic (0.3.4) + mimemagic (0.3.5) mini_magick (4.10.1) mini_mime (1.0.2) mini_portile2 (2.4.0) - minitest (5.14.0) + minitest (5.14.1) mobile-fu (1.4.0) rack-mobile-detect rails @@ -524,18 +524,18 @@ GEM rack rack-test (1.1.0) rack (>= 1.0, < 3) - rails (5.2.4.2) - actioncable (= 5.2.4.2) - actionmailer (= 5.2.4.2) - actionpack (= 5.2.4.2) - actionview (= 5.2.4.2) - activejob (= 5.2.4.2) - activemodel (= 5.2.4.2) - activerecord (= 5.2.4.2) - activestorage (= 5.2.4.2) - activesupport (= 5.2.4.2) + rails (5.2.4.3) + actioncable (= 5.2.4.3) + actionmailer (= 5.2.4.3) + actionpack (= 5.2.4.3) + actionview (= 5.2.4.3) + activejob (= 5.2.4.3) + activemodel (= 5.2.4.3) + activerecord (= 5.2.4.3) + activestorage (= 5.2.4.3) + activesupport (= 5.2.4.3) bundler (>= 1.3.0) - railties (= 5.2.4.2) + railties (= 5.2.4.3) sprockets-rails (>= 2.0.0) rails-assets-autosize (4.0.2) rails-assets-backbone (1.3.3) @@ -598,9 +598,9 @@ GEM rails-timeago (2.18.0) actionpack (>= 3.1) activesupport (>= 3.1) - railties (5.2.4.2) - actionpack (= 5.2.4.2) - activesupport (= 5.2.4.2) + railties (5.2.4.3) + actionpack (= 5.2.4.3) + activesupport (= 5.2.4.3) method_source rake (>= 0.8.7) thor (>= 0.19.0, < 2.0) @@ -749,7 +749,7 @@ GEM unf (~> 0.1.0) typhoeus (1.3.1) ethon (>= 0.9.0) - tzinfo (1.2.6) + tzinfo (1.2.7) thread_safe (~> 0.1) uglifier (4.2.0) execjs (>= 0.3.0, < 3) @@ -785,9 +785,9 @@ GEM addressable (>= 2.3.6) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) - websocket-driver (0.7.1) + websocket-driver (0.7.2) websocket-extensions (>= 0.1.0) - websocket-extensions (0.1.4) + websocket-extensions (0.1.5) will_paginate (3.3.0) xpath (3.2.0) nokogiri (~> 1.8) @@ -876,7 +876,7 @@ DEPENDENCIES rack-piwik (= 0.3.0) rack-rewrite (= 1.5.1) rack-ssl (= 1.4.1) - rails (= 5.2.4.2) + rails (= 5.2.4.3) rails-assets-autosize (= 4.0.2)! rails-assets-backbone (= 1.3.3)! rails-assets-blueimp-gallery (= 2.33.0)! -- cgit v1.2.3 From 3c124cefc38c35e53e767fb1a17185fc93d7ac16 Mon Sep 17 00:00:00 2001 From: Dennis Schubert Date: Sun, 14 Jun 2020 22:07:59 +0200 Subject: updated 6 locale files [ci skip] --- config/locales/diaspora/el.yml | 4 + config/locales/diaspora/et.yml | 431 +++++++++++++++++++++++++++- config/locales/diaspora/ia.yml | 8 +- config/locales/diaspora/sc.yml | 42 +++ config/locales/diaspora/th.yml | 1 + config/locales/javascript/javascript.et.yml | 13 + 6 files changed, 494 insertions(+), 5 deletions(-) diff --git a/config/locales/diaspora/el.yml b/config/locales/diaspora/el.yml index 68b38f9f7..8d81ef71a 100644 --- a/config/locales/diaspora/el.yml +++ b/config/locales/diaspora/el.yml @@ -258,7 +258,11 @@ el: pods: use_search_box_q: "Πώς μπορώ να χρησιμοποιήσω το πλαίσιο αναζήτησης για να βρω συγκεκριμένα άτομα;" posts_and_posting: + format_text_q: "Πώς μπορώ να επεξεργαστώ το κείμενό στις δημοσιεύσεις μου (bold,italics, κτλ.);" + hide_posts_q: "Πώς μπορώ να κρύψω μία δημοσίευση;" + insert_images_comments_q: "Μπορώ να εισάγω εικόνες στα σχόλια;" insert_images_q: "Πώς μπορώ να εισάγω εικόνες στις αναρτήσεις;" + size_of_images_q: "Μπορώ να επεξεργαστώ το μέγεθος των εικόνων στις δημοσιεύσεις ή στα σχόλια;" private_posts: title: "Ιδιωτικές αναρτήσεις" third_party_tools: "Εργαλεία τρίτων" diff --git a/config/locales/diaspora/et.yml b/config/locales/diaspora/et.yml index 056efcbd8..d7bd36604 100644 --- a/config/locales/diaspora/et.yml +++ b/config/locales/diaspora/et.yml @@ -7,18 +7,447 @@ et: _applications: "Rakendused" _services: "Teenused" + _statistics: "Statistika" account: "Konto" + activerecord: + errors: + models: + person: + attributes: + diaspora_handle: + taken: "on juba võetud." + reshare: + attributes: + root_guid: + taken: "Tore, mis? Sa juba jagasid seda postitust!" + user: + attributes: + email: + taken: "on juba võetud." + person: + invalid: "on ebakorrektne." + username: + invalid: "on ebakorrektne. Lubatud vaid tähed, numbrid ja allakriipsutatud." + taken: "on juba võetud." + admins: + admin_bar: + pages: "Lehed" + report: "Aruanded" + user_search: "Kasutaja otsing" + stats: + 2weeks: "2 nädalat" + daily: "Päevane" + go: "Mine" + month: "Kuu" + usage_statistic: "Statistika" + week: "Nädal" + user_search: + are_you_sure_lock_account: "Oled kindel, et soovid selle konto lukustada?" + are_you_sure_unlock_account: "Oled kindel, et soovid selle konto lahti lukustada?" are_you_sure: "Oled kindel?" are_you_sure_delete_account: "Oled kindel, et soovid oma konto kustutada? Kontot ei saa taastada!" + aspects: + aspect_stream: + stay_updated: "Ole kursis" + edit: + confirm_remove_aspect: "Oled kindel, et soovid selle aspekti kustutada?" + rename: "Nimeta ümber" + update: "Uuenda" + updating: "Uuendan..." + index: + donate: "Anneta" + help: + do_you: "Kas soovid:" + need_help: "Vajad abi?" + tag_question: "küsimus" + introduce_yourself: "See on sinu voog. Hüppa sisse ja tutvusta end." + new_here: + follow: "Jälgi %{link} ja tervita uusi kasutajaid diasporas*!" + learn_more: "Uuri veel" + title: "Tere tulemast uued kasutajad" + services: + content: "Saad ühendada järgnevad teenused diaspoerag*:" + heading: "Ühenda teenused" + welcome_to_diaspora: "Tere tulemast diaspora*, %{name}!" + no_contacts_message: + you_should_add_some_more_contacts: "Peaksid lisama rohkem kontakte!" + seed: + acquaintances: "Tuttavad" + family: "Pere" + friends: "Sõbrad" + work: "Töö" cancel: "Tühista" + comments: + new_comment: + comment: "Kommenteeri" + commenting: "Kommenteerib..." + contacts: + index: + all_contacts: "Kõik kontaktid" + my_contacts: "Minu kontaktid" + no_contacts: "Näib, et pead lisama mõned kontaktid!" + only_sharing_with_me: "Jagab ainult minuga" + start_a_conversation: "Alusta uut vestlust" + spotlight: + suggest_member: "Soovita kasutajat" + conversations: + create: + fail: "Ebakorrektne sõnum" + sent: "Sõnum saadetud" + destroy: + delete_success: "Vestlus edukalt kustutatud" + hide_success: "Vestlus edukalt peidetud" + index: + conversations_inbox: "Vestlused - Postkast" + inbox: "Postkast" + new_conversation: "Uus vestlus" + no_messages: "Sõnumeid pole" + new: + send: "Saada" + sending: "Saadab..." + subject: "Teema" + to: "Kellele" + show: + delete: "Kustuta vestlus" + hide: "Peida ja vaigista vestlus" + reply: "Vasta" + replying: "Vastab..." delete: "Eemalda" email: "E-mail" + error_messages: + helper: + correct_the_following_errors_and_try_again: "Palun paranda järgnevad vead ja proovi uuesti:" find_people: "Otsi inimesi või #silte" + help: + chat: + contacts_page: "kontaktide leht" + title: "Vestlus" + home: + default: + choose_your_audience: "Vali oma publik" + invitations: + new: + invite_someone_to_join: "Kutsu kedagi diasporaga* liituma!" + paste_link: "Jaga seda linki oma sõpradega kutsumaks neid diasporasse*, või e-postita link neile otse." + send_an_invitation: "Saada kutse" + layouts: + application: + back_to_top: "Tagasi üles" + public_feed: "Avalik %{name} diaspora* voog" + whats_new: "Mis uudist?" + header: + code: "Kood" + logout: "Logi välja" + profile: "Profiil" + settings: "Seaded" limited: "Piiratud" + more: "Veel" + notifications: + index: + all_notifications: "Kõik teavitused" + also_commented: "Samuti kommenteeritud" + and: "ja" + and_others: + one: "ja üks veel" + other: "ja %{count} teist" + zero: "ja mitte keegi teine" + liked: "Meeldis" + mark_all_as_read: "Märgi kõik loetuks" + mark_read: "Märgi loetuks" + mark_unread: "Märgi mitteloetuks" + mentioned: "Mainitud postituses" + no_notifications: "Sul ei ole veel teavitusi." + notifications: "Teated" + reshared: "Jagatud" + show_all: "Näita kõiki" + show_unread: "Näita lugemata" + started_sharing: "Alustas jagamist" + notifier: + a_post_you_shared: "postitus." + a_private_message: "Sulle on diasporas* uus privaatsõnum." + click_here: "Kliki siia" + comment_on_post: + reply: "Vasta või kuva %{name} postitus>" + confirm_email: + click_link: "Uue eposti aadressi aktiveerimiseks järgi seda linki %{unconfirmed_email}:" + subject: "Palun aktiveeri oma uus eposti aadress %{unconfirmed_email}" + hello: "Tere %{name}!" + invite: + message: |- + Tere! + + Sind on kutsutud liituma diasporaga* %{user} poolt! + + Alustamiseks vajuta seda linki + + [%{invite_url}][1] + + Või saad lisada %{diaspora_id} oma kontaktidele kui sul juba on konto. + + + Päikest, + + Olen diaspora* eposti robot! + + P.S. Kui sa ei tea (veel) mis diaspora* on siis [here] [2] on vastus! + + [1] %{invite_url} + [2] %{diasporafoundation_url} + invited_you: "%{name} kutsub sind diasporasse*" + liked: + liked: "%{name} märkis sinu postituse meeldivaks" + view_post: "Kuva postitus>" + mentioned: + subject: "%{name} mainis sind diasporas*" + private_message: + reply_to_or_view: "Vasta või kuva see postitus>" + report_email: + type: + comment: "kommenteeri" + post: "Saada" + reshared: + reshared: "%{name} jagas sinu postitust" + view_post: "Kuva postitus>" + started_sharing: + sharing: "alustas sinuga jagmist!" + subject: "%{name} alustas sinuga diasporas* jagamist" + view_profile: "Kuva %{name} profiili" + thanks: "Tänud," ok: "Oki" + people: + add_contact: + invited_by: "Sind kutsub" + index: + couldnt_find_them: "Ei leidnud neid?" + looking_for: "Otsid postitusi sildiga %{tag_link}?" + no_one_found: "...ja kedagi ei leitud." + no_results: "Hei! Sa pead midagi otsima." + results_for: "%{search_term}-ga sobivad kasutajad" + search_handle: "Kasuta nende diaspora* ID-d (username@pod.tld) oma sõprade leidmiseks." + searching: "Otsib, palun ole kannatlik..." + send_invite: "Ikka ei midagi? Saada kutse!" + person: + thats_you: "See oled sina!" + profile_sidebar: + bio: "Biograafia" + born: "Sünnipäev" + location: "Asukoht" + show: + closed_account: "See konto on suletud." + does_not_exist: "Isikut ei eksisteeri!" + has_not_shared_with_you_yet: "%{name} ei ole sinuga veel ühtegi postitust jaganud!" + photos: + create: + integrity_error: "Foto üleslaadimine ebaõnnestus. Oled kindel, et see oli pilt?" + runtime_error: "Foto üleslaadimine ebaõnnestus. Oled kindel, et su turvavöö on kinni?" + type_error: "Foto üleslaadimine ebaõnnestus. Oled kindel, et pilt oli lisatud?" + destroy: + notice: "Foto kustutatud." + new_profile_photo: + upload: "Lae üles uus profiilipilt!" + posts: + presenter: + title: "Postitus %{name} -lt" + show: + photos_by: + one: "Üks foto %{author} -lt" + other: "%{count} fotot %{author} -lt" + zero: "Pole fotosid %{author} -lt" + reshare_by: "Edasijagamine %{author} -lt" privacy: "Privaatsus" profile: "Profiil" + profiles: + edit: + allow_search: "Luba inimestel sind diasporast* otsida" + basic: "Minu peamine profiil" + basic_hint: "Iga rida sinu profiilil on mittekohustuslik. Sinu peamine profiil on alati avalikult nähtav." + extended: "Minu laiendatud profiil" + extended_hint: "Klõpsa end laiendatud profiili teabe muutmiseks. Avalik tähendab, et ta on internetist nähtav, piiratud tähendab nähtavust vaid neile, kellega seda infot jagad." + extended_visibility_text: "Sinu laiendatud profiili nähtavus:" + first_name: "Eesnimi" + last_name: "Perenimi" + limited: "Piiratud" + nsfw_check: "Märgi kõik mida postitan kui NSFW" + nsfw_explanation: "NSFW (\"tööjuures ebaturvaline\") on kogukonna standard sisu kohta, mida ei ole soovitatav tööd tehes vaadata. Kui postitad sellist sisu tihti, palun vali see võimalus, et kõik mida postitad oleks varjatud inimeste uudisvoos v.a. kui nad soovivad seda vaadata." + nsfw_explanation2: "Kui valid seda võimalust mitte kasutada, palun lisa #nsfw silt iga kord kui sellist sisu postitad." + public: "Avalik" + settings: "Profiili seaded" + update_profile: "Uuenda profiili" + your_bio: "Sinu Biograafia" + your_birthday: "Sinu sünnipäev" + your_gender: "Sinu sugu" + your_location: "Sinu asukoht" + your_name: "Sinu nimi" + your_photo: "Sinu foto" + your_tags: "Kirjelda end 5-e sõnaga" + your_tags_placeholder: "Meeldib #privaatsus #kassid #muusika #loodus" + update: + failed: "Profiili uuendamine ebaõnnestus" + updated: "Profiil uuendatud" public: "Avalik" + registrations: + create: + success: "Oled liitunud diasporag*!" + invalid_invite: "Kutsumise link mille edastasid ei ole enam kehtiv!" + new: + email: "E-mail" + enter_email: "Sisesta oma e-posti aadress" + enter_password: "Sisesta parool (min kuus märki)" + enter_password_again: "Sisesta sama parool mis enne" + password: "Parool" + sign_up: "Loo konto" + username: "Kasutajanimi" + reshares: + comment_email_subject: "%{resharer} jagas %{author} postitust" + reshare: + deleted: "Originaalpostitus autori poolt kustutatud." + reshare_confirmation: "Jaga %{author} postitust?" + reshared_via: "Jagatud läbi" search: "Otsi" + services: + index: + disconnect: "Katkesta ühendus" + edit_services: "Muuda teenuseid" + logged_in_as: "Sisse logitud %{nickname} -na." + really_disconnect: "Katkesta ühendus %{service}?" settings: "Seaded" - username: "Kasutajanimi" \ No newline at end of file + shared: + aspect_dropdown: + mobile_row_checked: "(eemalda) %{name}" + mobile_row_unchecked: "(lisa) %{name}" + invitations: + by_email: "Kutsu inimesi e-postiga" + invite_your_friends: "Kutsu oma sõpru" + invites: "Kutsed" + public_explain: + control_your_audience: "Halda oma auditooriumi" + logged_in: "Sisse logitud %{service} -sse" + outside: "Avalikud postitused on nähtavad väljaspool diasporad*." + share: "Jaga" + visibility_dropdown: "Kasuta seda rippmenüüd muutmaks oma postituse nähtavust. (Soovitame selle esimese avalikuks määrata.)" + publisher: + discard_post: "Eira postitust" + new_user_prefill: + hello: "Tere kõigile.Olen %{new_user_tag} " + i_like: "Olen huvitatud %{tags} " + invited_by: "Tänan kutse eest, " + posting: "Postitab..." + remove_location: "Eemalda asukoht" + share: "Jaga" + whats_on_your_mind: "Millest mõtled?" + stream_element: + via_mobile: "Mobiililt" + statistics: + active_users_halfyear: "Aktiivseid kasutajaid poolaastas" + active_users_monthly: "Aktiivseid kasutajaid kuus" + closed: "Suletud" + disabled: "Pole saadaval" + enabled: "Saadaval" + local_comments: "Kohalikud kommentaarid" + local_posts: "Kohalikud postitused" + name: "Nimi" + network: "Võrk" + open: "Avatud" + registrations: "Registreeringuid" + services: "Teenused" + total_users: "Kasutajaid kokku" + version: "Versioon" + streams: + activity: + title: "Minu tegevus" + aspects: + all: "Kõik aspektid" + title: "Minu aspektid" + aspects_stream: "Aspektid" + comment_stream: + title: "Kommenteeritud postitused" + commented: + title: "Kommenteeritud postitused" + followed_tag: + add_a_tag: "Lisa silt" + all: "Kõik sildid" + follow: "Jälgi" + title: "#Jälgitavad sildid" + followed_tags_stream: "#Järgitavad sildid" + like_stream: + title: "Meeldimiste voog" + liked: + title: "Meeldinud postitused" + mentioned_stream: "@Mainimised" + mentions: + title: "@Mainimised" + multi: + title: "Voog" + public: + title: "Avalik tegevus" + tags: + title: "Postitused siltidega: %{tags}" + tags: + show: + follow: "Jälgi #%{tag}" + stop_following: "Lõpeta #%{tag} jälgimine" + username: "Kasutajanimi" + users: + confirm_email: + email_confirmed: "E-post %{email} aktiveeritud" + email_not_confirmed: "E-posti ei saa aktiveerida. Vale link?" + destroy: + no_password: "Palun sisesta oma kehtiv parool konto sulgemiseks." + wrong_password: "Sisestatud parool ei kattu kehtiva parooliga." + edit: + also_commented: "keegi kommenteerib postitust mida kommenteerisid" + auto_follow_aspect: "Aspekt kasutajatele kelleg automaatselt jagad:" + auto_follow_back: "Jaga automaatselt kasutajatega kes alustavad sinuga jagamist" + change: "Muuda" + change_email: "Muuda e-post" + change_language: "Muuda keel" + change_password: "Muuda parool" + character_minimum_expl: "peab olema vähemalt kuus märki" + close_account: + dont_go: "Ära palun mine!" + lock_username: "Sinu kasutajanimi lukustatakse. Sul ei ole võimalik luua siia uut kontot sama ID-ga." + no_turning_back: "Tagasiteed ei ole! Kui oled täiesti kindel, siis sisesta enda parool allpool." + close_account_text: "Sulge konto" + comment_on_post: "keegi kommenteerib sinu postitust" + current_password: "Praegune salasõna" + edit_account: "Muuda konto seadeid" + email_awaiting_confirmation: "Saatsime aktiveerimislingi %{unconfirmed_email}. Seni kuni uue aadressi aktiveerimiseni jätkame vana %{email} aadressi kasutamist." + export_data: "Ekspordi andmed" + following: "Jagamise seaded" + liked: "kellegile meeldib sinu postitus" + mentioned: "sind mainitakse postituses" + new_password: "Uus parool" + private_message: "sulle on privaatsõnum" + receive_email_notifications: "Saa e-posti teavitusi kui:" + reshared: "keegi jagab sinu postitust" + started_sharing: "keegi alustab sinuga jagamist" + stream_preferences: "Voo eelistused" + your_email: "Sinu meiliaadress" + your_handle: "Sinu diaspora* ID" + getting_started: + hashtag_explanation: "Sildid aitavad sul rääkida ja jälgida oma huvisid. Samuti on nad head leidmaks uusi inimesi diasporast*." + hashtag_suggestions: "Proovi jälgida silte nagu #art, #movies, #eesti, #filmid, jne." + what_are_you_in_to: "Mis sulle meeldib?" + who_are_you: "Kes sa oled?" + privacy_settings: + ignored_users: "Ignoreeritud kasutajad" + stop_ignoring: "Lõpeta ignoreerimine" + strip_exif: "Eemalda metadata nagu asukoht, autor ja kaamera mudel üleslaetavatelt piltidelt (soovitatav)" + title: "Privaatsuse seaded" + public: + does_not_exist: "Kasutajat %{username} ei eksisteeri!" + update: + email_notifications_changed: "E-post teavitused muudetud" + follow_settings_changed: "Jälgimise seaded muudetud" + follow_settings_not_changed: "Jälgimise seadete muutmine ebaõnnestus." + language_changed: "Keel muudetud" + language_not_changed: "Keele vahetamine ebaõnnestus" + password_changed: "Parool muudetud. Saad nüüd uue parooliga sisse logida." + password_not_changed: "Parooli muutmine ebaõnnestus" + settings_not_updated: "Seadete uuendamine ebaõnnestus" + settings_updated: "Seaded uuendatud" + unconfirmed_email_changed: "E-post muudetud. Vajalik aktiveerimine." + unconfirmed_email_not_changed: "E-posti muutmine ebaõnnestus" + will_paginate: + next_label: "järgmine »" + previous_label: "« eelmine" \ No newline at end of file diff --git a/config/locales/diaspora/ia.yml b/config/locales/diaspora/ia.yml index 94e902f79..f59c328a3 100644 --- a/config/locales/diaspora/ia.yml +++ b/config/locales/diaspora/ia.yml @@ -488,7 +488,7 @@ ia: format_text_q: "Como pote io formatar le texto in mi entratas (grasse, italic, etc.)?" hide_posts_a: "Si tu puncta le mouse verso le parte superior de un entrata, un × appare al dextra. Clicca sur illo pro celar le entrata e silentiar le notificationes sur illo. Tu pote ancora vider le entrata si tu visita le pagina de profilo del persona qui lo ha inviate." hide_posts_q: "Como cela io un entrata?" - ignore_user_a1: "Si tu actualmente divide cosas con ille persona, remover la de tote tu aspectos eliminara le majoritate de su entratas de tu fluxo. Un methodo plus complete es \"ignorar\" le conto in question. Isto impedira que alcun entrata sue appare in tu fluxo, e illa non plus potera commentar o appreciar tu entratas. Nonobstante, illa ancora pote repeter tu entratas e commentar le repetitiones de tu entratas, e su commentos sur entratas de altere personas que appare in tu fluxo continuara a esser visibile pro te." + ignore_user_a1: "Si tu actualmente divide cosas con ille persona, remover la de tote tu aspectos elimina le majoritate de su entratas de tu fluxo. Un methodo plus complete es \"ignorar\" le conto in question. Isto impedi que alcun entrata sue appare in tu fluxo, e illa non plus pote commentar o appreciar tu entratas. Nonobstante, illa ancora pote repeter tu entratas e commentar le repetitiones de tu entratas, e su commentos sur entratas de altere personas que appare in tu fluxo continua a esser visibile pro te." ignore_user_a2: "Pro ignorar un conto, clicca sur le icone “ignorar” (un circulo con un linea diagonal que lo transversa) in cyma al dextra de un de su entratas. Su entratas disparera immediatemente de tu fluxo. Alternativemente, visita su pagina de profilo e clicca sur le icone “ignorar” illac. Tu potera ancora vider su entratas sur su pagina de profilo, o per usar le vista de entrata singule." ignore_user_a3: "Le lista de personas que tu ignora se trova in le configuration de tu conto sub Confidentialitate. Pro cessar de ignorar un persona, remove la del lista sur ille pagina." ignore_user_q: "Como impedi io que le entratas de un persona appare in mi fluxo?" @@ -679,9 +679,9 @@ ia: other: "%{actors} commentava tu entrata %{post_link}." zero: "%{actors} commentava tu entrata %{post_link}." contacts_birthday: - one: "%{actors} ha su anniversario le %{date}." - other: "%{actors} ha lor anniversario le %{date}." - zero: "%{actors} ha lor anniversario le %{date}." + one: "%{actors} ha su anniversario %{date}." + other: "%{actors} ha lor anniversario %{date}." + zero: "%{actors} ha lor anniversario %{date}." index: all_notifications: "Tote le notificationes" also_commented: "Etiam commentava" diff --git a/config/locales/diaspora/sc.yml b/config/locales/diaspora/sc.yml index 85053daa3..a6f9f7c25 100644 --- a/config/locales/diaspora/sc.yml +++ b/config/locales/diaspora/sc.yml @@ -593,9 +593,11 @@ sc: byline: "Su mundu sotziale in lìnia in ue tenes su controllu" choose_your_audience: "Issèbera su pùblicu tuo" choose_your_audience_info: "Sas caras de diaspora* ti permitint de cumpartzire cun petzi cussas persones cun las cales cheres tue. Podes èssere pùblicu o privadu cantu cheres. Cumpartzire una fotografia ispassiosa cun totu su mundu, o unu segretu de importu cun petzi sos amigos tuos. Tenes tue su controllu." + diaspora_site_link: "retza federada de diaspora*" headline: "Bene bènnidu in %{pod_name}" own_your_data: "Sos datos tuos sunt petzi tuos" own_your_data_info: "Medas retzas sotziales impreant sos datos tuos pro fàghere dinare analizende sas interatziones tuas pro ti bèndere cosa. diaspora* no impreat sos datos tuos pro cale si siat punna chi non siet sa de ti permìtere de ti connètere e de cumpartzire cun sos àteros." + part_of_diaspora: "Parte de su %{diaspora_site_link}" podmin: byline: "Istas pro cambiare ìnternet. Incumintzamus, ite naras?" configuration_info: "Aberi %{database_path} e %{diaspora_path} in s'editore de testu preferidu dae tie e revisiona·los cun atentzione. Sunt cummentados estensivamente." @@ -989,6 +991,11 @@ sc: updated: "Profilu agiornadu" public: "Pùblicu" registrations: + closed: + another_pod: "un'àteru pod" + closed_pod: "Custu pod est, in custu momentu, serradu pro sas registratziones noas. Nointames, ti podes aunire su matessi a sa retza de diaspora* registrende·ti in %{wiki}. Essende totu sos pods connessos intre issos, as a tènnere atzessu a sos matessi cuntenutos in cue." + find_pods: "Podes agatare una lista de pods in ue ti podes registrare in %{poduptime}" + other_questions: "Si tenes cale si siat àtera pregunta chi pertocat a s'issèberu de unu pod, leghe·ti sa %{wiki} nostra" create: success: "Ti ses registradu in diaspora*!" invalid_invite: "Su ligàmene de invitu chi as impreadu no est prus vàlidu!" @@ -1175,6 +1182,41 @@ sc: one: "1 persone etichetadas cun %{tag}" other: "%{count} persones etichetadas cun %{tag}" zero: "Nemos etichetadu cun %{tag}" + two_factor_auth: + activated: + change_button: "Disativa" + change_label: "Disativa s'autenticatzione in duas fases insertende sa crae de intrada tua" + status: "Autenticatzione in duas fases ativada" + confirm: + activate_button: "Cunfirma e ativa" + input_explanation: "A pustis de s'iscansidura o de s'insertadura de su còdighe segretu, inserta su còdighe de ses tzifras chi as a bìdere e cunfirma s'impostatzione." + input_title: "Cunfirma cun unu getone TOTP" + manual_explanation: "S'in casu mai non potzas iscansire su còdighe QR in manera automàtica podes insertare su còdighe segretu manualmente in s'aplicatzione." + manual_explanation_cont: "Semus impreende craes de intrada bàlidas pro una borta ebbia (TOTP) basadas subra su tempus cun getones a ses tzifras. S'in casu mai s'aplicatzione tua ti pedat un'intervallu de tempus e un's'algoritmu, inserta pare-pare 30 segundos e sha1.
Sos ispàtzios bi sunt pro leghibilidade ebbia, inserta su còdighe chene de issos." + scan_explanation: "Pro praghere iscansi su còdighe QR cun un'aplicatzione cun capatzidade TOTP, che a andOTP (Android), FreeOTP (iOS), SailOTP (SailfishOS)." + scan_title: "Iscansi su còdighe QR" + status: "S'autenticatzione in duas fases no est galu ativada de su totu, depes cunfirmare s'ativatzione cun unu getone TOTP" + title: "Cunfirma s'ativatzione" + deactivated: + change_button: "Ativa" + change_label: "Ativa s'autenticatzione in duas fases" + status: "Autenticatzione in duas fases disativada" + explanation: "S'autenticatzione in duas fases est una manera poderosa pro t'assegurare de èssere s'ùnicu in gradu de atzèdere a su contu tuo. Cando faghes s'atzessu, inserta unu còdighe de 6 tzifras in paris cun sa crae tua pro dimustrare s'identidade tua. Dae cara: si perdes su telèfonu e sos còdighes de riprìstinu creados cando ativas custa funtzionalidade, as a tènnere s'atzessu a su contu de diaspora* tuo blocadu pro semper." + flash: + error_token: "Su getone fiat non curretu o non vàlidu" + success_activation: "Autenticatzione in duas fases ativada chene problemas" + success_deactivation: "Autenticatzione in duas fases disativada chene problemas" + input_token: + label: "Getone in duas fases" + placeholder: "getone in duas fases a ses tzifras" + recovery: + button: "Ingendra còdighes de recùperu noos" + explanation: "S'in casu mai as a pèrdere s'atzessu a su telèfonu tuo as a pòdere impreare unu de sos còdighes de recùperu inoghe in suta pro torrare a otènnere s'atzessu a su contu tuo. Ampara bene sos còdighes de recùperu. Pro fàghere un'esèmpiu, los dias pòdere imprentare e pònnere cun àteros documentos de importu." + explanation_short: "Sos còdighes de recùperu ti permitint de torrare a otènnere s'atzessu a su contu tuo si as pèrdidu su telèfonu tuo. Ammenta·ti chi podes impreare cada còdighe de recùperu una borta ebbia." + invalidation_notice: "Si as pèrdidu sos còdighes de recùperu tuos, los podes torrare a ingendrare inoghe. Sos còdighes de recùperu betzos ant a èssere invalidados." + reminder: "Si nono, podes impreare unu de sos còdighes de recùperu." + title: "Còdighes de recùperu" + title: "Autenticatzione in duas fases" username: "Nùmene impreadore" users: confirm_email: diff --git a/config/locales/diaspora/th.yml b/config/locales/diaspora/th.yml index 9f373a209..c928a3350 100644 --- a/config/locales/diaspora/th.yml +++ b/config/locales/diaspora/th.yml @@ -16,6 +16,7 @@ th: cancel: "ยกเลิก" delete: "ลบ" email: "อีเมล" + fill_me_out: "โปรดเติมข้อมูลให้สมบูรณ์" limited: "จำกัดการเข้าถึง" ok: "ตกลง" privacy: "ส่วนตัว" diff --git a/config/locales/javascript/javascript.et.yml b/config/locales/javascript/javascript.et.yml index 57ccdf050..d5b2a5e1b 100644 --- a/config/locales/javascript/javascript.et.yml +++ b/config/locales/javascript/javascript.et.yml @@ -43,7 +43,13 @@ et: show_more: "näita veel" stream: comment: "Kommenteeri" + disable_post_notifications: "Lülita selle postituse teavitused välja" + enable_post_notifications: "Lülita selle postituse teavitused sisse" follow: "Jälgi" + followed_tag: + add_a_tag: "Lisa silt" + follow: "Jälgi" + title: "#Jälgitavad sildid" hide: "Peida" hide_nsfw_posts: "Peida #nsfw postitused" like: "Meeldib" @@ -56,7 +62,9 @@ et: one: "Näita veel <%= count %> kommentaari" other: "Näita veel <%= count %> kommentaari" zero: "Näita veel <%= count %> kommentaari" + no_posts_yet: "Ei ole veel kuvamiseks postitusi." original_post_deleted: "Postitus on autori poolt eemaldatud." + permalink: "Püsiviide" public: "Avalik" reshare: "Jaga edasi" reshares: @@ -65,6 +73,11 @@ et: zero: "<%= count %> edasijagamist" show_nsfw_post: "Näita postitust" show_nsfw_posts: "Näita kõiki" + tags: + follow: "Jälgi #<%= tag %>" + following: "Jälgin #<%= tag %>" + stop_following: "Lõpeta #<%= tag %> jälgimine" + stop_following_confirm: "Lõpeta sildi #<%= tag %> jälgimine?" unfollow: "Lõpeta jälgimine" unlike: "Ei meeldi" tags: -- cgit v1.2.3