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

[NEW] Separate integration roles #13902

Merged
merged 22 commits into from
Oct 18, 2019
Merged

[NEW] Separate integration roles #13902

merged 22 commits into from
Oct 18, 2019

Conversation

MarcosSpessatto
Copy link
Member

@MarcosSpessatto MarcosSpessatto commented Mar 26, 2019 •
edited
Loading

Closes #13262
Closes #13611

@MarcosSpessatto MarcosSpessatto added feat: roles / permissions documentation: needed Needs addition/changes to documentation labels Mar 26, 2019
@MarcosSpessatto MarcosSpessatto added this to the 1.1.0 milestone Mar 26, 2019
@engelgabriel engelgabriel temporarily deployed to rocket-chat-pr-13902 March 26, 2019 01:05 Inactive
@MarcosSpessatto MarcosSpessatto changed the title [NEW][BREAK] Separate integration roles [WIP][NEW][BREAK] Separate integration roles Mar 26, 2019
@MarcosSpessatto MarcosSpessatto mentioned this pull request Mar 26, 2019
Merged
@MarcosSpessatto MarcosSpessatto added Contain documentation PR and removed documentation: needed Needs addition/changes to documentation labels Mar 26, 2019
@engelgabriel engelgabriel temporarily deployed to rocket-chat-pr-13902 March 26, 2019 13:46 Inactive
@MarcosSpessatto MarcosSpessatto changed the title [WIP][NEW][BREAK] Separate integration roles [NEW][BREAK] Separate integration roles Mar 26, 2019
@rodrigok
Copy link
Member

@MarcosSpessatto this doesn't need to be a breaking change if we do a migration right?
Can you fix the conflicts?

@MarcosSpessatto MarcosSpessatto changed the title [NEW][BREAK] Separate integration roles [NEW] Separate integration roles May 10, 2019
@MarcosSpessatto
Copy link
Member Author

@rodrigok yes, my bad.

@MarcosSpessatto
Copy link
Member Author

@rodrigok done.

@rodrigok rodrigok modified the milestones: 1.1.0, 1.2.0 May 15, 2019
@engelgabriel engelgabriel modified the milestones: 1.2.0, 1.3.0 Jul 10, 2019
@sampaiodiego sampaiodiego modified the milestones: 1.3.0, 1.4.0 Jul 25, 2019
@sampaiodiego sampaiodiego modified the milestones: 2.0.0, 2.1.0 Sep 6, 2019
@engelgabriel engelgabriel modified the milestones: 2.1.0, 2.2.0 Oct 13, 2019
@rodrigok
Merge remote-tracking branch 'origin/develop' into separate-integrati…
7b63846 
…on-roles

# Conflicts:
#	app/authorization/server/startup.js
#	server/startup/migrations/index.js
#	server/startup/migrations/v162.js
@rodrigok rodrigok merged commit 2f28de8 into develop Oct 18, 2019
@rodrigok rodrigok deleted the separate-integration-roles branch October 18, 2019 22:03
@rodrigok rodrigok mentioned this pull request Oct 27, 2019
Merged
@raspla raspla mentioned this pull request Dec 9, 2019
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rodrigok rodrigok rodrigok approved these changes

@sampaiodiego sampaiodiego Awaiting requested review from sampaiodiego

Assignees
No one assigned
Labels
feat: roles / permissions
Projects
None yet
Milestone
2.2.0
4 participants
@MarcosSpessatto @rodrigok @engelgabriel @sampaiodiego