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 5205e3c526closes #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
Benjamin Neff
9171f6b5ef
Revert "Revert "Bump twitter-text""
...
Bump twitter-text on develop branch again
This reverts commit 15ff67499b
2018-04-12 04:01:52 +02:00
Benjamin Neff
25fc4c746a
Merge branch 'next-minor' into develop
2018-04-12 04:01:39 +02:00
Benjamin Neff
15ff67499b
Revert "Bump twitter-text"
...
This adds a new dependency (`libidn11-dev` on debian, I'm not sure about
other distros).
This reverts commit 070e4caa57
2018-04-12 04:00:41 +02:00
Benjamin Neff
bd175cfb12
Bump rails-assets-cropperjs
2018-04-12 02:50:41 +02:00
Benjamin Neff
c1ebc4d338
Merge branch 'next-minor' into develop
2018-04-12 02:49:11 +02:00
Benjamin Neff
9a661177f1
Replace rails-assets-perfect-scrollbar with rails-assets-utatti-perfect-scrollbar
...
closes #7772
2018-04-12 02:44:43 +02:00
Benjamin Neff
0e526f9221
Bump jasmine
...
Disable random tests for now, many tests fail when this is true (which
is now default)
2018-04-12 02:41:56 +02:00
Benjamin Neff
eb68343ae1
Bump rspec and rspec-rails
2018-04-12 02:41:56 +02:00
Benjamin Neff
fc2834e7c1
Bump webmock
2018-04-12 02:41:56 +02:00
Benjamin Neff
42c93fd4cb
Bump cucumber-api-steps
2018-04-12 02:41:56 +02:00
Benjamin Neff
2b4fed8339
Bump poltergeist
2018-04-12 02:41:56 +02:00
Benjamin Neff
e0a8a5e34c
Bump database_cleaner
2018-04-12 02:41:56 +02:00
Benjamin Neff
5432a91839
Bump capybara
2018-04-12 02:41:56 +02:00
Benjamin Neff
1a6afa54e8
Bump fuubar
2018-04-12 02:41:55 +02:00
Benjamin Neff
e0b4bff6a6
Bump fixture_builder
2018-04-12 02:41:55 +02:00
Benjamin Neff
64f330d66b
Bump rubocop
2018-04-12 02:41:55 +02:00
Benjamin Neff
6d0cee3047
Bump haml_lint
2018-04-12 02:41:55 +02:00
Benjamin Neff
36c55e2d2e
Bump rb-fsevent
2018-04-12 02:41:55 +02:00
Benjamin Neff
39f0c58c4e
Bump guard
2018-04-12 02:41:55 +02:00
Benjamin Neff
c98b766d03
Bump asset_sync
2018-04-12 02:41:55 +02:00
Benjamin Neff
9e20215a24
Bump eye
2018-04-12 02:41:54 +02:00
Benjamin Neff
0602e7fa94
Bump versionist
2018-04-12 02:41:54 +02:00
Benjamin Neff
9240a61662
Bump hamlit
2018-04-12 02:41:54 +02:00
Benjamin Neff
7ea9a4d7ae
Bump gon
2018-04-12 02:41:54 +02:00
Benjamin Neff
b8094544a0
Bump faraday
2018-04-12 02:41:54 +02:00
Benjamin Neff
9c054e03d8
Bump openid_connect
2018-04-12 02:41:54 +02:00
Benjamin Neff
6773a49362
Bump twitter
2018-04-12 02:41:54 +02:00
Benjamin Neff
8b2a4b18c6
Bump omniauth
2018-04-12 02:41:53 +02:00
Benjamin Neff
7854e14e07
Bump secure_headers
2018-04-12 02:41:53 +02:00
Benjamin Neff
f8c9d2ccd9
Bump string-direction
2018-04-12 02:40:23 +02:00
Benjamin Neff
070e4caa57
Bump twitter-text
2018-04-12 02:40:23 +02:00
Benjamin Neff
89cb887290
Bump leaflet-rails
2018-04-12 02:40:23 +02:00
Benjamin Neff
3e078643ea
Bump rails-assets-blueimp-gallery
2018-04-12 02:40:22 +02:00
Benjamin Neff
f894214aa9
Bump rails-assets-autosize
2018-04-12 02:40:22 +02:00
Benjamin Neff
42b316449c
Bump rails-assets-corejs-typeahead
2018-04-12 02:40:13 +02:00
Benjamin Neff
92363dc088
Bump rails-assets-markdown-it
2018-04-12 02:39:12 +02:00
Benjamin Neff
8cfe16d3b4
Bump js-routes
2018-04-12 02:39:12 +02:00
Benjamin Neff
d1ab3cf4e4
Bump fog-aws
2018-04-12 02:39:12 +02:00
Benjamin Neff
47c99207f4
Bump carrierwave
2018-04-12 02:39:11 +02:00
Benjamin Neff
312f3e4259
Bump activerecord-import
2018-04-12 02:39:11 +02:00
Benjamin Neff
1359c7a9e8
Bump pg
2018-04-12 02:39:11 +02:00
Benjamin Neff
53b3e395e0
Bump mysql2
2018-04-12 02:39:11 +02:00
Benjamin Neff
54bdd32b86
Bump sass-rails
2018-04-12 02:39:11 +02:00
Benjamin Neff
d31da2e58e
Bump autoprefixer-rails
2018-04-12 02:39:11 +02:00
Benjamin Neff
264a64596c
Bump rack-cors
2018-04-12 02:39:11 +02:00
Benjamin Neff
94b59f29b0
Bump uglifier
2018-04-12 02:39:11 +02:00
Benjamin Neff
1e8f404b65
Bump sidekiq
2018-04-12 02:39:10 +02:00
Benjamin Neff
a55654b7ee
Bump devise
2018-04-12 02:39:10 +02:00
Benjamin Neff
85e95437d8
Bump unicorn
2018-04-12 02:39:10 +02:00
Benjamin Neff
5ee69f412a
Bump rails
2018-04-12 02:39:10 +02:00
Dennis Schubert
ae17248b2e
Merge pull request #7734 from Fensterbank/client-side-picture-resize
...
Resize images on client-side before uploading
2018-04-02 10:38:51 +02:00
Benjamin Neff
c84411ea62
Merge branch 'next-minor' into develop
2018-03-25 08:37:11 +02:00
Jonathan Brielmaier
41377378ec
Bump mysql2
...
closes #7747
2018-03-25 08:37:03 +02:00
Frédéric Bolvin
6d55b15604
Resize images on client-side before uploading
2018-03-11 11:20:16 +01:00
Dennis Schubert
29daea1b0a
Merge branch 'next-minor' into develop
2018-03-10 04:46:01 +01:00
Benjamin Neff
3bb6d6d677
Bump rails-i18n
...
fixes #7527
closes #7731
2018-03-10 04:45:54 +01:00
Dennis Schubert
3bc0fc16a2
Merge branch 'next-minor' into develop
2018-02-25 04:33:07 +01:00
Benjamin Neff
86d52a0da3
Bump diaspora_federation
2018-02-25 04:32:19 +01:00
Dennis Schubert
1903bfd307
Merge pull request #7581 from Fensterbank/improved-profile-picture-editor
...
Profile photo upload with cropping function
2018-02-25 04:17:44 +01:00
cmrd Senya
b32c844314
Support for embedding HTML5 media links
...
Use markdown-it-html5-embed plugin so user can embed audio and
video using the markdown link syntax []() in the HTML5 way.
2018-02-17 19:21:10 +01:00
Steffen van Bergerem
258b502cde
Bump devise
...
closes #7716
2018-02-17 19:20:15 +01:00
Steffen van Bergerem
fa14e1e368
Bump hamlit
2018-02-17 19:20:12 +01:00
Frédéric Bolvin
d7abaaced0
implemented new profile photo upload with cropping function
2018-02-16 19:43:32 +01:00
Benjamin Neff
e0687e8de3
Upgrade Nokogiri to fix a disclosed vulnerability in libxml2
2018-02-08 22:44:11 +01:00
Benjamin Neff
80bfc3fcfd
Bump diaspora_federation
2018-02-01 23:35:35 +01:00
Benjamin Neff
7c304119e1
Bump diaspora_federation
2017-09-28 23:04:21 +02:00
Benjamin Neff
ca8a3db5bc
Bump leaflet-rails
2017-09-28 03:15:32 +02:00
Benjamin Neff
bd99127600
Bump rails-assets-markdown-it
2017-09-28 03:15:32 +02:00
Benjamin Neff
33c92028f8
Bump rails-assets-blueimp-gallery
2017-09-28 03:15:31 +02:00
Benjamin Neff
a9bb673881
Bump rubocop
2017-09-28 03:15:30 +02:00
Benjamin Neff
34a149f61a
Bump pronto
2017-09-28 03:15:30 +02:00
Benjamin Neff
5edbd8f740
Bump jasmine
2017-09-28 03:15:30 +02:00
Benjamin Neff
edfab73589
Bump typhoeus
2017-09-28 03:15:30 +02:00
Benjamin Neff
e607057138
Bump sprockets-rails
2017-09-28 03:15:30 +02:00
Benjamin Neff
eac9e8fd97
Bump secure_headers
2017-09-28 03:15:30 +02:00
Benjamin Neff
aac57a926b
Bump js-routes
2017-09-28 03:15:30 +02:00
Benjamin Neff
769abf6948
Bump fog-aws
2017-09-28 03:15:29 +02:00
Benjamin Neff
c8f24dd872
Bump faraday_middleware
2017-09-28 03:15:29 +02:00
Benjamin Neff
9a3faa8917
Bump autoprefixer-rails
2017-09-28 03:15:29 +02:00
Benjamin Neff
8d01a1d389
Bump addressable
2017-09-28 03:15:29 +02:00
Benjamin Neff
6543e1c200
Bump activerecord-import
2017-09-28 03:15:29 +02:00
Benjamin Neff
f012a13809
Bump rails
2017-09-28 03:15:29 +02:00
Benjamin Neff
c8340f7d28
Merge branch 'master' into next-minor
2017-09-19 20:26:57 +02:00
Benjamin Neff
13d6c23713
Bump nokogiri for a security release
2017-09-19 20:20:57 +02:00
Benjamin Neff
e82690963d
Add # frozen_string_literal: true to all files
2017-09-17 19:29:15 +02:00
Benjamin Neff
b530ed0be0
Switch back to mobile-fu
...
closes #7570
2017-08-23 21:50:29 +02:00
Benjamin Neff
47574bc324
Bump coveralls and simplecov
2017-08-14 03:15:21 +02:00
Benjamin Neff
907e221f24
Unlock thor again
...
It looks like all commands we use in production fixed the warnings
(rails 5.1), so we can update that again.
2017-08-14 03:04:05 +02:00
Steffen van Bergerem
d0a2fafeb7
Bump rspec-rails
2017-08-13 14:16:24 +02:00
Steffen van Bergerem
f1a7a3735c
Bump poltergeist
2017-08-13 14:14:49 +02:00
Steffen van Bergerem
de4afb2d1f
Bump jasmine
2017-08-13 14:12:03 +02:00
Steffen van Bergerem
c0713ddd8e
Bump capybara
2017-08-13 14:08:10 +02:00
Steffen van Bergerem
2e25785f97
Bump versionist
2017-08-13 14:04:46 +02:00
Steffen van Bergerem
6df48b50c3
Bump openid_connect
2017-08-13 14:03:06 +02:00
Steffen van Bergerem
2d28ce3abf
Bump mysql2
2017-08-13 14:00:51 +02:00
Steffen van Bergerem
7a3f6cec4e
Bump autoprefixer-rails
2017-08-13 13:58:35 +02:00
Steffen van Bergerem
60d2db2732
Bump acts_as_api
2017-08-13 13:56:43 +02:00
Benjamin Neff
5905645d0f
Fix mobile_fu
...
Since the gem was renamed, we need to require it manually...
2017-08-12 15:47:05 +02:00
Benjamin Neff
b9d9a63739
Add rails-controller-testing dependency
...
Needed for `assigns` in controller specs
2017-08-12 15:39:20 +02:00
Dennis Schubert
45de17e1de
Remove test_after_commit
2017-08-12 15:39:19 +02:00
