X Tutup
Skip to content

Add Changelog 36587#36617

Merged
phil-davis merged 1 commit intomasterfrom
36485-changelog
Dec 19, 2019
Merged

Add Changelog 36587#36617
phil-davis merged 1 commit intomasterfrom
36485-changelog

Conversation

@lordelix
Copy link
Contributor

Change: Consolidate user/group share actions into a single dropdown

User and group share actions are grouped inside a dropdown which can
be toggled via the cogwheel. This dropdown holds all related additional
info and actions such as permissions, expiration, etc.

#36587

@lordelix lordelix requested a review from micbar December 19, 2019 10:51
@lordelix lordelix self-assigned this Dec 19, 2019
@phil-davis
Copy link
Contributor

That PR was merged into PR #36573 and #36573 is still waiting to be merged (getting close). It has its own changelog entry https://github.com/owncloud/core/pull/36573/files#diff-84a69c0d07819b15fa72450563c4a156

Do we also need this changelog entry?

If so, then do we cherry-pick it into #36573 rather than merging it to master now?

@micbar
Copy link
Contributor

micbar commented Dec 19, 2019

@phil-davis This changelog entry is needed IMO because it describes the changes in the default behavior.

Feel free to cherry-pick and close here.

@phil-davis
Copy link
Contributor

@micbar #36573 is about to finish and pass CI. If someone could review and approve it then it can be merged.
Then we can just leave CI running on this PR and also merge it in 1 hours time.

@codecov
Copy link

codecov bot commented Dec 19, 2019

Codecov Report

Merging #36617 into master will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff            @@
##             master   #36617   +/-   ##
=========================================
  Coverage     64.68%   64.68%           
  Complexity    19071    19071           
=========================================
  Files          1268     1268           
  Lines         74522    74522           
  Branches       1312     1312           
=========================================
  Hits          48207    48207           
  Misses        25930    25930           
  Partials        385      385
Flag Coverage Δ Complexity Δ
#javascript 54.05% <ø> (ø) 0 <ø> (ø) ⬇️
#phpunit 65.86% <ø> (ø) 19071 <ø> (ø) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 41b46f7...b51a3a3. Read the comment docs.

@phil-davis
Copy link
Contributor

Feel free to merge this when #36573 is merged.

@phil-davis phil-davis merged commit ebf197c into master Dec 19, 2019
@delete-merged-branch delete-merged-branch bot deleted the 36485-changelog branch December 19, 2019 15:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

X Tutup