Skip to content

Fix flow - #7115

Merged
MorrisJobke merged 2 commits into
masterfrom
fix-flow
Dec 8, 2017
Merged

Fix flow#7115
MorrisJobke merged 2 commits into
masterfrom
fix-flow

Conversation

@mario

@mariomario commented Nov 8, 2017

Copy link
Copy Markdown
Contributor

Fixing issues found in #6879 + solved conflicts.

Signed-off-by: Mario Danic mario@lovelyhq.com

@mario
Fix flow
c2cd5fc
Signed-off-by: Mario Danic <mario@lovelyhq.com>
@blizzzblizzz added the 3. to review Waiting for reviews label Nov 13, 2017
@blizzzblizzz added this to the Nextcloud 13 milestone Nov 13, 2017
@blizzz

blizzz commented Nov 13, 2017

Copy link
Copy Markdown
Member

@LukasReschke

LukasReschke
LukasReschke requested changes Nov 14, 2017
View reviewed changes

@LukasReschkeLukasReschke left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tests seem to be failing.

@schiessle
fix tests
555fe70
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
@codecov

codecovBot commented Dec 8, 2017

Copy link
Copy Markdown

Codecov Report

Merging #7115 into master will decrease coverage by 16.05%.
The diff coverage is 0%.

@@ Coverage Diff @@## master #7115 +/- ##
=============================================
- Coverage 50.74% 34.68% -16.06% - Complexity 24417 24419 +2 
=============================================
Files 1580 1580 Lines 93342 93348 +6 Branches 1359 1359 =============================================
- Hits 47366 32378 -14988 - Misses 45976 60970 +14994
Impacted FilesCoverage ΔComplexity Δ
core/Controller/ClientFlowLoginController.php0% <0%> (-78.88%)22 <0> (+2)
apps/dav/lib/CalDAV/Activity/Setting/Calendar.php0% <0%> (-100%)8% <0%> (ø)
lib/private/Hooks/ForwardingEmitter.php0% <0%> (-100%)5% <0%> (ø)
lib/public/AppFramework/Http/JSONResponse.php0% <0%> (-100%)5% <0%> (ø)
lib/public/AppFramework/Middleware.php0% <0%> (-100%)4% <0%> (ø)
core/Command/TwoFactorAuth/Disable.php0% <0%> (-100%)4% <0%> (ø)
...pFramework/Db/MultipleObjectsReturnedException.php0% <0%> (-100%)1% <0%> (ø)
...eLimiting/Exception/RateLimitExceededException.php0% <0%> (-100%)1% <0%> (ø)
apps/dav/lib/CalDAV/Activity/Setting/Event.php0% <0%> (-100%)8% <0%> (ø)
...ty/Exceptions/CrossSiteRequestForgeryException.php0% <0%> (-100%)1% <0%> (ø)
... and 501 more

@MorrisJobkeMorrisJobke mentioned this pull request Dec 8, 2017
Merged
28 tasks
LukasReschke
LukasReschke approved these changes Dec 8, 2017
View reviewed changes

@LukasReschkeLukasReschke left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🐘

MorrisJobke
MorrisJobke approved these changes Dec 8, 2017
View reviewed changes

@MorrisJobkeMorrisJobke left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested and works 👍

@MorrisJobke
MorrisJobke merged commit 6aac1ff into masterDec 8, 2017
@MorrisJobke
MorrisJobke deleted the fix-flow branch December 8, 2017 15:02
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@MorrisJobkeMorrisJobkeMorrisJobke approved these changes
@LukasReschkeLukasReschkeLukasReschke approved these changes
@rullzerrullzerAwaiting requested review from rullzer
@nickvergessennickvergessenAwaiting requested review from nickvergessen

Assignees

No one assigned

Labels

3. to reviewWaiting for reviewsbugfeature: authentication

Projects

None yet

Milestone

Nextcloud 13

Development

Successfully merging this pull request may close these issues.

5 participants

@mario@blizzz@MorrisJobke@LukasReschke@schiessle