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.

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

[stable12] combine apptokens and sessions #5266

Merged
merged 3 commits into from
Jun 6, 2017

Conversation

nickvergessen
Copy link
Member

Backport #5166 and #5265

@nickvergessen nickvergessen added the 3. to review Waiting for reviews label Jun 6, 2017
@nickvergessen nickvergessen added this to the Nextcloud 12.0.1 milestone Jun 6, 2017
@mention-bot
Copy link

@nickvergessen, thanks for your PR! By analyzing the history of the files in this pull request, we identified @icewind1991, @ChristophWurst and @Faldon to be potential reviewers.

Copy link
Member

@MorrisJobke MorrisJobke left a comment

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 added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Jun 6, 2017
Signed-off-by: Morris Jobke <[email protected]>
@codecov
Copy link

codecov bot commented Jun 6, 2017

Codecov Report

Merging #5266 into stable12 will increase coverage by <.01%.
The diff coverage is n/a.

@@              Coverage Diff               @@
##             stable12    #5266      +/-   ##
==============================================
+ Coverage       54.18%   54.18%   +<.01%     
  Complexity      22287    22287              
==============================================
  Files            1380     1380              
  Lines           85342    85330      -12     
  Branches         1322     1322              
==============================================
- Hits            46246    46240       -6     
+ Misses          39096    39090       -6
Impacted Files Coverage Δ Complexity Δ
settings/templates/personal.php 0% <ø> (ø) 0 <0> (ø) ⬇️
settings/personal.php 0% <ø> (ø) 0 <0> (ø) ⬇️
core/js/js.js 61.21% <0%> (-0.57%) 0% <0%> (ø)
apps/files_trashbin/lib/Trashbin.php 73.39% <0%> (-0.25%) 133% <0%> (ø)

@MorrisJobke MorrisJobke merged commit 477f496 into stable12 Jun 6, 2017
@MorrisJobke MorrisJobke deleted the backport-5166-combine-apptokens-and-sessions branch June 6, 2017 13:03
@MorrisJobke
Copy link
Member

Autoloader was not updated - looking at you @schiessle for "ignoring failing tests" 😉

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
4. to release Ready to be released and/or waiting for tests to finish
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants