Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[stable15] Remove Google+ federation usersettings #14855

Merged
merged 3 commits into from
Mar 26, 2019
Merged

[stable15] Remove Google+ federation usersettings #14855

merged 3 commits into from
Mar 26, 2019

Conversation

MorrisJobke
Copy link
Member

Backport of #14583

@MariusBluem @MorrisJobke
Remove G+ icon from Federated Files Sharing-usersettings
89c0d87 
Signed-off-by: Marius Blüm <marius@lineone.io>
@MariusBluem @MorrisJobke
Remove G+ code from Federated Files Sharing-usersettings
9c7a6c2 
Signed-off-by: Marius Blüm <marius@lineone.io>
@MariusBluem @MorrisJobke
Remove G+ CSS rule (Feedback from Joas)
fc7ac08 
Signed-off-by: Marius Blüm <marius@lineone.io>
@MorrisJobke MorrisJobke added the 3. to review Waiting for reviews label Mar 26, 2019
@MorrisJobke MorrisJobke added this to the Nextcloud 15.0.6 milestone Mar 26, 2019
@MorrisJobke MorrisJobke mentioned this pull request Mar 26, 2019
Merged
@faily-bot
Copy link

faily-bot bot commented Mar 26, 2019

🤖 beep boop beep 🤖

Here are the logs for the failed build:

Status of 17312: failure

ENABLE_REDIS=true, TESTS=nodb-codecov

Show full log 
There were 2 failures:

1) Test\L10N\FactoryTest::testGetL10nFilesForApp with data set #3 ('settings', 'de', array('/drone/src/github.com/nextclo...e.json'))
Failed asserting that Array &0 (
    0 => '/drone/src/github.com/nextcloud/server/core/l10n/de.json'
) is identical to Array &0 (
    0 => '/drone/src/github.com/nextcloud/server/settings/l10n/de.json'
).

/drone/src/github.com/nextcloud/server/tests/lib/L10N/FactoryTest.php:459

2) Test\L10N\FactoryTest::testFindL10NDir with data set #3 ('settings', '/drone/src/github.com/nextclo.../l10n/')
Failed asserting that two strings are identical.
--- Expected
+++ Actual
@@ @@
-'/drone/src/github.com/nextcloud/server/settings/l10n/'
+'/drone/src/github.com/nextcloud/server/core/l10n/'

/drone/src/github.com/nextcloud/server/tests/lib/L10N/FactoryTest.php:481

DB=NODB, ENABLE_REDIS=true, PHP=7.0

Show full log 
There were 2 failures:

1) Test\L10N\FactoryTest::testGetL10nFilesForApp with data set #3 ('settings', 'de', array('/drone/src/github.com/nextclo...e.json'))
Failed asserting that Array &0 (
    0 => '/drone/src/github.com/nextcloud/server/core/l10n/de.json'
) is identical to Array &0 (
    0 => '/drone/src/github.com/nextcloud/server/settings/l10n/de.json'
).

/drone/src/github.com/nextcloud/server/tests/lib/L10N/FactoryTest.php:459

2) Test\L10N\FactoryTest::testFindL10NDir with data set #3 ('settings', '/drone/src/github.com/nextclo.../l10n/')
Failed asserting that two strings are identical.
--- Expected
+++ Actual
@@ @@
-'/drone/src/github.com/nextcloud/server/settings/l10n/'
+'/drone/src/github.com/nextcloud/server/core/l10n/'

/drone/src/github.com/nextcloud/server/tests/lib/L10N/FactoryTest.php:481

DB=NODB, ENABLE_REDIS=true, PHP=7.1

Show full log 
There were 2 failures:

1) Test\L10N\FactoryTest::testGetL10nFilesForApp with data set #3 ('settings', 'de', array('/drone/src/github.com/nextclo...e.json'))
Failed asserting that Array &0 (
    0 => '/drone/src/github.com/nextcloud/server/core/l10n/de.json'
) is identical to Array &0 (
    0 => '/drone/src/github.com/nextcloud/server/settings/l10n/de.json'
).

/drone/src/github.com/nextcloud/server/tests/lib/L10N/FactoryTest.php:459

2) Test\L10N\FactoryTest::testFindL10NDir with data set #3 ('settings', '/drone/src/github.com/nextclo.../l10n/')
Failed asserting that two strings are identical.
--- Expected
+++ Actual
@@ @@
-'/drone/src/github.com/nextcloud/server/settings/l10n/'
+'/drone/src/github.com/nextcloud/server/core/l10n/'

/drone/src/github.com/nextcloud/server/tests/lib/L10N/FactoryTest.php:481

DB=NODB, ENABLE_REDIS=false, PHP=7.2

Show full log 
There were 2 failures:

1) Test\L10N\FactoryTest::testGetL10nFilesForApp with data set #3 ('settings', 'de', array('/drone/src/github.com/nextclo...e.json'))
Failed asserting that Array &0 (
    0 => '/drone/src/github.com/nextcloud/server/core/l10n/de.json'
) is identical to Array &0 (
    0 => '/drone/src/github.com/nextcloud/server/settings/l10n/de.json'
).

/drone/src/github.com/nextcloud/server/tests/lib/L10N/FactoryTest.php:459

2) Test\L10N\FactoryTest::testFindL10NDir with data set #3 ('settings', '/drone/src/github.com/nextclo.../l10n/')
Failed asserting that two strings are identical.
--- Expected
+++ Actual
@@ @@
-'/drone/src/github.com/nextcloud/server/settings/l10n/'
+'/drone/src/github.com/nextcloud/server/core/l10n/'

/drone/src/github.com/nextcloud/server/tests/lib/L10N/FactoryTest.php:481

DB=NODB, ENABLE_REDIS=false, PHP=7.3

Show full log 
There were 2 failures:

1) Test\L10N\FactoryTest::testGetL10nFilesForApp with data set #3 ('settings', 'de', array('/drone/src/github.com/nextclo...e.json'))
Failed asserting that Array &0 (
    0 => '/drone/src/github.com/nextcloud/server/core/l10n/de.json'
) is identical to Array &0 (
    0 => '/drone/src/github.com/nextcloud/server/settings/l10n/de.json'
).

/drone/src/github.com/nextcloud/server/tests/lib/L10N/FactoryTest.php:459

2) Test\L10N\FactoryTest::testFindL10NDir with data set #3 ('settings', '/drone/src/github.com/nextclo.../l10n/')
Failed asserting that two strings are identical.
--- Expected
+++ Actual
@@ @@
-'/drone/src/github.com/nextcloud/server/settings/l10n/'
+'/drone/src/github.com/nextcloud/server/core/l10n/'

/drone/src/github.com/nextcloud/server/tests/lib/L10N/FactoryTest.php:481

@MorrisJobke
Copy link
Member Author

Those tests broke since the last transifex sync.

@MorrisJobke MorrisJobke merged commit be8a82e into stable15 Mar 26, 2019
@MorrisJobke MorrisJobke deleted the backport/14583/remove-g+-federation branch March 26, 2019 13:16
@rullzer rullzer mentioned this pull request Mar 29, 2019
Merged
1 task
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rullzer rullzer rullzer approved these changes

@ChristophWurst ChristophWurst ChristophWurst approved these changes

@nickvergessen nickvergessen Awaiting requested review from nickvergessen

@schiessle schiessle Awaiting requested review from schiessle

@MariusBluem MariusBluem Awaiting requested review from MariusBluem

Assignees
No one assigned
Labels
3. to review Waiting for reviews
Projects
None yet
Milestone
Nextcloud 15.0.6
Development

Successfully merging this pull request may close these issues.
4 participants
@MorrisJobke @rullzer @ChristophWurst @MariusBluem