Skip to content

Project green for stable15 #1695

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

Merged
nickvergessen merged 3 commits into from
Apr 10, 2019
Merged

Project green for stable15 #1695

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f792eb5
Greeeeeeeeeeeeeen
nickvergessen Mar 14, 2019
80397db
Greeeeeeeeeeeeeen
nickvergessen Mar 14, 2019
f535c6f
More backport
nickvergessen Apr 10, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Greeeeeeeeeeeeeen 
Signed-off-by: Joas Schilling <[email protected]>
  • Loading branch information
@nickvergessen
nickvergessen committed Apr 9, 2019
commit 80397db58314733e76597090f74355dc01f2dab6
2 changes: 1 addition & 1 deletion tests/integration/features/sharing/create.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,7 +386,7 @@ Feature: create
| storage_id | home::participant2 |
| file_target | /welcome (2).txt |
| share_with | group room |
| share_with_displayname | Group room |
| share_with_displayname | Private conversation |
And user "participant3" gets last share
And share is returned with
| uid_owner | participant1 |
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/features/sharing/transfer-ownership.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ Feature: transfer-ownership
| storage_id | home::participant2 |
| file_target | /welcome.txt |
| share_with | group room |
| share_with_displayname | Group room |
| share_with_displayname | Private conversation |
And user "participant3" gets last share
And share is returned with
| uid_owner | participant2 |
Expand Down