Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

R

Rocket.Chat
- Activity
- Members
- Terraform modules

Snippets Groups Projects

6811201b

Commit 6811201b authored 8 years ago by Gabriel Engel Committed by GitHub 8 years ago

Downloads
- Plain Diff

Merge pull request #5668 from RocketChat/zapier-settings

Change Zapier oAuthApp settings to enable it and update the redirectUri

parents 6fa51ed0 cc7ae6d3

No related branches found

No related tags found

Loading

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

packages/rocketchat-api/server/api.js 1 addition, 1 deletion

packages/rocketchat-api/server/api.js
packages/rocketchat-api/server/v1/helpers/getUserFromParams.js 1 addition, 1 deletion

...ges/rocketchat-api/server/v1/helpers/getUserFromParams.js
packages/rocketchat-oauth2-server-config/oauth/server/default-services.coffee 2 additions, 2 deletions

...oauth2-server-config/oauth/server/default-services.coffee
server/startup/migrations/v081.js 11 additions, 0 deletions

server/startup/migrations/v081.js

with 15 additions and 4 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment