nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #8036 from theRealNG/develop

Browse source 
Do not show getting started after account import

fixes #8018
This commit is contained in:
Benjamin Neff 2019-07-03 13:30:20 +02:00
commit 11caf4f86f
No known key found for this signature in database
GPG key ID: 971464C3F1A90194
3 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Changelog.md
View file

@ -4,6 +4,7 @@
* Add bootstrapping for using ECMAScript 6 with automatic transpiling for compatibility [#7581](https://github.com/diaspora/diaspora/pull/7581) * Add bootstrapping for using ECMAScript 6 with automatic transpiling for compatibility [#7581](https://github.com/diaspora/diaspora/pull/7581)
* Remove backporting of mention syntax [#7788](https://github.com/diaspora/diaspora/pull/7788) * Remove backporting of mention syntax [#7788](https://github.com/diaspora/diaspora/pull/7788)
* Enable Content-Security-Policy header by default [#7781](https://github.com/diaspora/diaspora/pull/7781) * Enable Content-Security-Policy header by default [#7781](https://github.com/diaspora/diaspora/pull/7781)
* Do not show getting started after account import [#8036](https://github.com/diaspora/diaspora/pull/8036)
## Bug fixes ## Bug fixes
* Fix multiple photos upload progress bar [#7655](https://github.com/diaspora/diaspora/pull/7655) * Fix multiple photos upload progress bar [#7655](https://github.com/diaspora/diaspora/pull/7655)

2
lib/archive_importer.rb
View file

@ -25,10 +25,12 @@ class ArchiveImporter
email strip_exif show_community_spotlight_in_stream language disable_mail auto_follow_back email strip_exif show_community_spotlight_in_stream language disable_mail auto_follow_back
] ]
data = convert_keys(archive_hash["user"], allowed_keys) data = convert_keys(archive_hash["user"], allowed_keys)
# setting getting_started to false as the user doesn't need to see the getting started wizard
data.merge!( data.merge!(
username: attr[:username], username: attr[:username],
password: attr[:password], password: attr[:password],
password_confirmation: attr[:password], password_confirmation: attr[:password],
getting_started: false,
person: { person: {
profile_attributes: profile_attributes profile_attributes: profile_attributes
} }

1
spec/lib/archive_importer_spec.rb
View file

@ -155,6 +155,7 @@ describe ArchiveImporter do
expect(archive_importer.user.language).to eq("ru") expect(archive_importer.user.language).to eq("ru")
expect(archive_importer.user.disable_mail).to eq(false) expect(archive_importer.user.disable_mail).to eq(false)
expect(archive_importer.user.auto_follow_back).to eq(true) expect(archive_importer.user.auto_follow_back).to eq(true)
expect(archive_importer.user.getting_started).to be_falsey
expect(archive_importer.user.profile.first_name).to eq("First") expect(archive_importer.user.profile.first_name).to eq("First")
expect(archive_importer.user.profile.last_name).to eq("Last") expect(archive_importer.user.profile.last_name).to eq("Last")