Commit graph

2006 commits

Author SHA1 Message Date
Jonne Haß
4ac1b9ae87 update spring to 2.1.0 2020-03-20 20:03:42 +01:00
Jonne Haß
eb7a71a2a5 update rb-inotify to 0.10.1 2020-03-20 20:03:42 +01:00
Jonne Haß
b325d2ca43 update jasmine to 3.5.1 2020-03-20 20:03:42 +01:00
Jonne Haß
7ec921c956 update guard to 2.16.1 2020-03-20 20:03:42 +01:00
Jonne Haß
d561d2caf1 update fuubar to 2.5.0 2020-03-20 20:03:42 +01:00
Jonne Haß
67924fc404 update fixture_builder to 0.5.2 2020-03-20 20:03:42 +01:00
Jonne Haß
51e7eae2c3 update factory_girl_rails to 4.9.0 2020-03-20 20:03:42 +01:00
Jonne Haß
b54679a634 update database_cleaner to 1.8.3 2020-03-20 20:03:42 +01:00
Jonne Haß
b146c90e57 update cucumber-rails to 2.0 2020-03-20 20:03:42 +01:00
Jonne Haß
9211f930cd update json to 2.3.0 2020-03-20 20:03:42 +01:00
Jonne Haß
00c5f35190 Update Rails to 5.2.4.2 2020-03-20 20:03:42 +01:00
Benjamin Neff
4139ae2549
Merge branch 'next-minor' into develop 2020-02-12 00:13:19 +01:00
Dennis Schubert
b0181fbbb9
Bump mini_magick.
closes #8108
2020-02-12 00:09:54 +01:00
Dennis Schubert
ec72ac1277
Bump nokogiri. 2020-02-11 23:56:49 +01:00
Dennis Schubert
bc601f7c34
Bump devise. 2020-02-11 23:56:49 +01:00
Dennis Schubert
905df19a34
Bump rubyzip. 2020-02-11 23:54:56 +01:00
Dennis Schubert
d898b5ba69
Bump rack-cors. 2020-02-11 23:54:56 +01:00
Dennis Schubert
67d73ece80
Bump secure_headers. 2020-02-11 23:54:55 +01:00
Dennis Schubert
93b0e1eb22
Bump Rails. 2020-02-11 23:53:14 +01:00
Jonne Haß
1da075e30b Merge branch 'next-minor' into develop 2020-01-22 21:09:20 +01:00
Dennis Schubert
1d72f95705 Issue #8062 - Drop rails-assets.org.
and replace it with our own Gem cache. This isn't pretty, as we have to manage that one ourselves, and pushing updates requires a core-team member, but rails-assets.org has become way too unreliable for us to be a viable option.

closes #8087
2020-01-22 21:08:06 +01:00
Dennis Schubert
862fa38f8b
Remove the JSXC/Prosody integration.
As per discussion on https://discourse.diasporafoundation.org/t/removing-diaspora-s-current-chat-integration/2718, nobody raised serious concerns or objections. Given future plans, we do not think having an unfinished implementation of something that likely will not get finished in the current form is worth it. So let's get rid of it.
2019-10-18 23:14:14 +02:00
Jonne Haß
995f3394a8 Merge branch 'next-minor' into develop 2019-09-01 02:44:02 +02:00
Jonne Haß
6a7e937d90 Update open_graph_reader to 0.7.0
This should fix undefined method `og' for #<OpenGraphReader::Base:0x00007f73c53f2308 @bases={}>
for sites that have OpenGraph tags of other namespaces but no actual OpenGraph core tags
2019-09-01 02:42:11 +02:00
Benjamin Neff
8cab64b715
Merge branch 'next-minor' into develop 2019-07-06 22:45:05 +02:00
Benjamin Neff
593614aef1
Bump fuubar
Version 2.4.0 was yanked ... why do people do such things? m(

https://github.com/thekompanee/fuubar/issues/111
2019-07-06 22:43:41 +02:00
Benjamin Neff
a26e20ab7d
Merge branch 'next-minor' into develop 2019-07-03 13:25:49 +02:00
Benjamin Neff
cde29af545
Bump rails-assets-jasmine-ajax 2019-07-03 13:20:07 +02:00
Benjamin Neff
1e2e064268
Bump jasmine 2019-07-03 13:20:07 +02:00
Benjamin Neff
435e60c214
Bump cucumber-rails 2019-07-03 13:20:07 +02:00
Benjamin Neff
51e7958c4b
Bump pronto 2019-07-03 13:18:38 +02:00
Benjamin Neff
18b0dd0060
Bump coveralls 2019-07-03 13:18:38 +02:00
Benjamin Neff
26b247bf98
Bump webmock 2019-07-03 13:18:38 +02:00
Benjamin Neff
556fa42004
Bump fuubar 2019-07-03 13:18:38 +02:00
Benjamin Neff
1458d2d57f
Bump rubocop 2019-07-03 13:18:38 +02:00
Benjamin Neff
d2c4faeb9f
Bump versionist 2019-07-03 13:18:37 +02:00
Benjamin Neff
3a1428a672
Bump hamlit 2019-07-03 13:17:37 +02:00
Benjamin Neff
06c582a672
Bump faraday_middleware 2019-07-03 13:17:36 +02:00
Benjamin Neff
fa08ebf7bd
Bump addressable 2019-07-03 13:17:36 +02:00
Benjamin Neff
c059550943
Bump openid_connect 2019-07-03 13:17:36 +02:00
Benjamin Neff
ee503737cb
Bump secure_headers 2019-07-03 13:17:36 +02:00
Benjamin Neff
a6261fdc64
Bump nokogiri 2019-07-03 13:17:36 +02:00
Benjamin Neff
56670865b9
Bump leaflet-rails 2019-07-03 13:17:36 +02:00
Benjamin Neff
325a9122b8
Bump js-routes 2019-07-03 13:17:36 +02:00
Benjamin Neff
a018abcfe9
Bump jquery 2019-07-03 13:17:35 +02:00
Benjamin Neff
8f5c248536
Bump handlebars_assets 2019-07-03 13:17:35 +02:00
Benjamin Neff
e2ce43c3c7
Bump fog-aws 2019-07-03 13:17:35 +02:00
Benjamin Neff
c154c4e2af
Bump activerecord-import 2019-07-03 13:17:35 +02:00
Benjamin Neff
07513e2ec0
Bump rack-cors 2019-07-03 13:17:35 +02:00
Benjamin Neff
b1441356d2
Bump sidekiq 2019-07-03 13:17:35 +02:00
Benjamin Neff
e7a7f62531
Bump unicorn 2019-07-03 13:17:35 +02:00
Benjamin Neff
4ae373e3a2
Bump rails 2019-07-03 13:17:30 +02:00
lislis
9d5b981809 Two factor authentication (#7751) 2019-04-28 23:24:40 +02:00
lislis
1da118780e Two factor authentication (#7751) 2019-04-28 19:06:48 +02:00
cmrd Senya
ce597380e6 Merge branch 'next-minor' into develop 2019-04-28 19:29:36 +03:00
cmrd Senya
3f74a759b3 Bump diaspora_federation 2019-04-28 19:28:25 +03:00
cmrd Senya
f85f167f50 Implement archive import backend
This implements archive import feature.

The feature is divided in two main subfeatures: archive validation and archive import.

Archive validation performs different validation on input user archive. This can be
used without actually running import, e.g. when user wants to check the archive
before import from the frontend. Validators may add messages and modify the archive.

Validators are separated in two types: critical validators and non-critical validators.

If validations by critical validators fail it means we can't import archive.

If non-critical validations fail, we can import archive, but some warning messages
are rendered.

Also validators may change archive contents, e.g. when some entity can't be
imported it may be removed from the archive.

Validators' job is to take away complexity from the importer and perform the validations
which are not implemented in other parts of the system, e.g. DB validations or
diaspora_federation entity validations.

Archive importer then takes the modified archive from the validator and imports it.

In order to incapsulate high-level migration logic a MigrationService is
introduced. MigrationService links ArchiveValidator, ArchiveImporter and
AccountMigration.

Also here is introduced a rake task which may be used by podmins to run archive
import.
2019-04-26 18:41:27 +03:00
Benjamin Neff
e0a6189ec4
Merge branch 'next-minor' into develop 2019-03-30 15:05:47 +01:00
Benjamin Neff
093cca9a76
Bump rails-controller-testing 2019-03-30 15:03:12 +01:00
Benjamin Neff
ccbc65993d
Bump rspec-rails 2019-03-30 15:03:12 +01:00
Benjamin Neff
d9d0eb1512
Bump webmock 2019-03-30 15:03:12 +01:00
Benjamin Neff
f8419b14ba
Bump shoulda-matchers 2019-03-30 15:03:12 +01:00
Benjamin Neff
290ddbf271
Bump capybara 2019-03-30 15:03:11 +01:00
Benjamin Neff
18d7b38037
Bump rubocop 2019-03-30 15:03:11 +01:00
Benjamin Neff
01468c34dd
Bump rb-inotify 2019-03-30 15:03:11 +01:00
Benjamin Neff
7ae2dc6249
Bump asset_sync 2019-03-30 15:03:11 +01:00
Benjamin Neff
6f53f1bc0a
Bump will_paginate 2019-03-30 15:03:11 +01:00
Benjamin Neff
5195f7daac
Bump rails-timeago 2019-03-30 15:03:11 +01:00
Benjamin Neff
2585fb9b49
Bump hamlit 2019-03-30 15:03:11 +01:00
Benjamin Neff
02617a3562
Bump faraday 2019-03-30 15:03:10 +01:00
Benjamin Neff
0372924b90
Bump omniauth 2019-03-30 15:03:10 +01:00
Benjamin Neff
05472cc4f9
Bump secure_headers 2019-03-30 15:03:10 +01:00
Benjamin Neff
da39750244
Bump nokogiri 2019-03-30 15:03:10 +01:00
Benjamin Neff
3b0f435f69
Bump rails-i18n 2019-03-30 15:03:10 +01:00
Benjamin Neff
adaca8d0a3
Bump handlebars_assets 2019-03-30 15:03:10 +01:00
Benjamin Neff
8a10655f7f
Bump mini_magick 2019-03-30 15:01:01 +01:00
Benjamin Neff
c8bef1077d
Bump fog-aws 2019-03-30 15:01:01 +01:00
Benjamin Neff
da83456660
Bump carrierwave 2019-03-30 15:01:01 +01:00
Benjamin Neff
b7183d7cee
Bump activerecord-import 2019-03-30 15:01:01 +01:00
Benjamin Neff
cd7af6df50
Bump pg 2019-03-30 15:01:01 +01:00
Benjamin Neff
54e44d6d7e
Bump uglifier 2019-03-30 15:01:01 +01:00
Benjamin Neff
a63f11bbf4
Bump sidekiq-cron 2019-03-30 15:01:01 +01:00
Benjamin Neff
7b201f4bb9
Bump sidekiq 2019-03-30 15:01:00 +01:00
Benjamin Neff
f4fa7e10bd
Bump json 2019-03-30 15:01:00 +01:00
Benjamin Neff
23d637b9a1
Bump unicorn 2019-03-30 15:01:00 +01:00
Benjamin Neff
360780c17f
Bump responders 2019-03-30 15:01:00 +01:00
Benjamin Neff
c253272d83
Bump bootstrap-sass 2019-03-30 15:01:00 +01:00
Benjamin Neff
c063f6fa1b
Bump devise 2019-03-30 15:01:00 +01:00
Benjamin Neff
94a32b2833
Bump rails 2019-03-30 15:00:54 +01:00
Benjamin Neff
2b2852267a
Merge branch 'next-minor' into develop 2019-01-06 22:18:48 +01:00
Benjamin Neff
efcaa860ac
Revert "Bump bootstrap-switch-rails"
It looks like 3.3.4 is broken :(

Fixes #7940

This reverts commit 5205e3c526.

closes #7955
2019-01-06 22:16:02 +01:00
Benjamin Neff
5b0066a426
Merge branch 'next-minor' into develop 2018-11-18 19:36:51 +01:00
Benjamin Neff
7a958bce69
Bump cucumber 2018-11-18 19:32:16 +01:00
Benjamin Neff
a09f7d73d8
Remove guard-cucumber
Looks dead, last commit over two years ago, and block upgrade of cucumber

See guard/guard-cucumber#36
2018-11-18 19:27:43 +01:00
Benjamin Neff
8fc75e8955
Bump twitter-text 2018-11-17 21:20:51 +01:00
Benjamin Neff
81c833c4e3
Bump rails-assets-pica 2018-11-17 21:20:05 +01:00
Benjamin Neff
5bc32d0aad
Bump rails-assets-cropperjs 2018-11-17 21:15:59 +01:00
Benjamin Neff
b30c4e4e97
Merge branch 'next-minor' into develop 2018-11-17 21:08:23 +01:00
Benjamin Neff
ce10791526
Bump guard 2018-11-17 21:05:42 +01:00
Benjamin Neff
19556e7d7d
Bump hamlit 2018-11-17 21:05:40 +01:00
Benjamin Neff
63b23056a5
Bump gon 2018-11-17 21:05:40 +01:00
Benjamin Neff
80f57673ab
Bump typhoeus 2018-11-17 21:05:40 +01:00
Benjamin Neff
de5e22a543
Bump faraday 2018-11-17 21:04:37 +01:00
Benjamin Neff
98d165c0c5
Bump acts-as-taggable-on 2018-11-17 21:04:37 +01:00
Benjamin Neff
d8016d39cf
Bump secure_headers 2018-11-17 21:04:37 +01:00
Benjamin Neff
f0eead3659
Bump rails-i18n 2018-11-17 21:04:37 +01:00
Benjamin Neff
eea609a228
Bump rails-assets-utatti-perfect-scrollbar 2018-11-17 21:04:00 +01:00
Benjamin Neff
efa69a23f4
Bump rails-assets-autosize 2018-11-17 21:02:35 +01:00
Benjamin Neff
382eda2966
Bump rails-assets-markdown-it 2018-11-17 21:02:35 +01:00
Benjamin Neff
67b825233d
Bump js-routes 2018-11-17 21:02:35 +01:00
Benjamin Neff
e87b751107
Bump jquery-rails and rails-assets-jquery 2018-11-17 21:02:35 +01:00
Benjamin Neff
092ff0b550
Bump uuid 2018-11-17 21:02:35 +01:00
Benjamin Neff
464854443f
Bump mini_magick 2018-11-17 21:02:34 +01:00
Benjamin Neff
cd3b454853
Bump fog-aws 2018-11-17 21:02:34 +01:00
Benjamin Neff
f8b5b99c5c
Bump carrierwave 2018-11-17 21:02:34 +01:00
Benjamin Neff
4c8acb5a07
Bump pg 2018-11-17 21:02:34 +01:00
Benjamin Neff
ad725c5649
Bump mysql2 2018-11-17 21:02:34 +01:00
Benjamin Neff
e6375505bc
Bump compass-rails 2018-11-17 21:02:34 +01:00
Benjamin Neff
5205e3c526
Bump bootstrap-switch-rails 2018-11-17 21:02:33 +01:00
Benjamin Neff
01f426e739
Bump autoprefixer-rails 2018-11-17 21:02:33 +01:00
Benjamin Neff
06c953a400
Bump uglifier 2018-11-17 21:02:33 +01:00
Benjamin Neff
8ee15ebc13
Bump sidekiq-cron 2018-11-17 21:02:33 +01:00
Benjamin Neff
3dbc0fc632
Bump sidekiq 2018-11-17 21:02:33 +01:00
Benjamin Neff
01db49ef26
Bump devise 2018-11-17 21:02:32 +01:00
Benjamin Neff
a2e326b27d
Bump json-schema 2018-11-17 21:01:41 +01:00
Benjamin Neff
a55684c751
Bump unicorn 2018-11-17 21:01:41 +01:00
Benjamin Neff
c9588442a6
Bump rails-assets-jasmine-ajax 2018-11-17 21:01:41 +01:00
Benjamin Neff
0b676452d0
Bump jasmine 2018-11-17 21:01:41 +01:00
Benjamin Neff
d2cffe9d53
Bump rspec and rspec-rails 2018-11-17 21:01:41 +01:00
Benjamin Neff
e48571d6ed
Bump webmock 2018-11-17 21:01:41 +01:00
Benjamin Neff
6d46975089
Bump database_cleaner 2018-11-17 21:01:40 +01:00
Benjamin Neff
330b8cd3ba
Bump poltergeist 2018-11-17 21:01:40 +01:00
Benjamin Neff
84f3f73f3f
Bump fuubar 2018-11-17 21:01:40 +01:00
Benjamin Neff
8ada40ec08
Bump simplecov and coveralls 2018-11-17 21:01:40 +01:00
Benjamin Neff
05db801925
Bump activerecord-import 2018-11-17 21:01:39 +01:00
Benjamin Neff
4e78d51195
Bump rubocop 2018-11-17 21:01:39 +01:00
Benjamin Neff
a8218a39ed
Bump pronto-rubocop 2018-11-17 21:01:39 +01:00
Benjamin Neff
1b21d507c9
Bump haml_lint 2018-11-17 21:01:39 +01:00
Benjamin Neff
da305a44cd
Bump asset_sync 2018-11-17 21:01:39 +01:00
Dennis Schubert
bb84767a96
Merge branch 'next-minor' into develop 2018-10-08 02:58:01 +02:00
Benjamin Neff
48ebd571d8
Bump diaspora_federation
closes #7876
2018-10-08 02:57:33 +02:00
Benjamin Neff
3be814ea0f
Bump nokogiri
Fixes:
* CVE-2016-9318
* CVE-2017-16932
* CVE-2017-18258
* CVE-2018-14404
* CVE-2018-14567
2018-10-08 02:56:56 +02:00
Benjamin Neff
56bb4be9d3
Bump rubyzip
Fixes CVE-2018-1000544
2018-10-08 02:52:53 +02:00
Dennis Schubert
9bab794ea4
Merge branch 'next-minor' into develop 2018-10-08 02:50:36 +02:00
Benjamin Neff
fc6893d4fc
Remove facebook integration
Facebook removed the API and facebook integration is broken now, so lets
remove it.

closes #7874
2018-10-08 02:50:25 +02:00
Benjamin Neff
cd30a2814d
Bump json-jwt and openid_connect
Fixes CVE-2018-1000539
2018-09-05 03:18:59 +02:00
Dennis Schubert
11dac58dc7
Merge pull request #7856 from SuperTux88/bump-json-jwt
Bump json-jwt
2018-09-05 03:12:52 +02:00
Benjamin Neff
4c4c3d8bf0
Bump json-jwt and openid_connect
Fixes CVE-2018-1000539
2018-09-05 02:19:34 +02:00
Benjamin Neff
76c64ec1f8
Merge branch 'next-minor' into develop 2018-08-24 19:49:37 +02:00
lislis
546ef080c5
bump fixture_builder to 5.2rc3
closes #7849
2018-08-24 19:49:23 +02:00