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

Add mattermost plugin welcomebot v1.2.0 #71

Merged
merged 3 commits into from
Jun 11, 2020

Conversation

jfrerich
Copy link
Contributor

Summary

Add v1.2.0 to the marketplace

Ticket Link

n/a

@jfrerich jfrerich added 1: PM Review Requires review by a product manager 2: Dev Review Requires review by a core committer 1: UX Review Requires review by a UX Designer labels May 29, 2020
levb
levb previously approved these changes Jun 1, 2020
@levb levb requested review from mickmister, aaronrothschild and hanzei and removed request for mickmister June 1, 2020 19:48
aaronrothschild
aaronrothschild previously approved these changes Jun 1, 2020
Copy link
Contributor

@aaronrothschild aaronrothschild left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

plugins.json Outdated
"manifest": {
"id": "com.mattermost.welcomebot",
"name": "Welcome Bot",
"description": "This plugin adds a WelcomeBot that helps add new users to channels.",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
"description": "This plugin adds a WelcomeBot that helps add new users to channels.",
"description": "WelcomeBot guides new Mattermost users to channels they should join based on their interests",

Copy link
Collaborator

@hanzei hanzei Jun 2, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not entirely sure that this is a good change:

  1. This change is only visible in the Marketplace UI. The admin console actually does show the old description.
    Screenshot from 2020-06-02 21-25-06
  2. The text is cut off in the Marketplace.
    Screenshot from 2020-06-02 21-25-15

I'm wondering if the discussion about description should take place in a different PR and this PR goes like in like it is.

cc @aaronrothschild

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@hanzei, that makes sense because we aren't changing the description in the plugin.json in the actual plugin. I am good with reverting for the following reasons:

  • we have to remember to changes this text for every subsequent welcomebot release to marketplace.
  • we should not have to manually do this step

@jfrerich jfrerich dismissed stale reviews from aaronrothschild and levb via 33f012d June 1, 2020 22:14
@jfrerich jfrerich requested review from levb and aaronrothschild June 1, 2020 22:20
aaronrothschild
aaronrothschild previously approved these changes Jun 1, 2020
Copy link
Contributor

@aaronrothschild aaronrothschild left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

levb
levb previously approved these changes Jun 1, 2020
@jfrerich jfrerich assigned jfrerich and unassigned aaronrothschild, levb and hanzei Jun 1, 2020
@jfrerich
Copy link
Contributor Author

jfrerich commented Jun 1, 2020

@aaronrothschild, I merged your suggestion through the github commit option (rather than committing from my dev box).

That did the following..

  • created a failed build
  • re-requested reviews
  • added you three as assignees

Do not recommend that again :)

@jfrerich jfrerich removed the 1: PM Review Requires review by a product manager label Jun 1, 2020
@jfrerich
Copy link
Contributor Author

jfrerich commented Jun 1, 2020

/check-cla

@jfrerich jfrerich added 3: QA Review Requires review by a QA tester and removed 1: UX Review Requires review by a UX Designer labels Jun 2, 2020
Copy link
Collaborator

@hanzei hanzei left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Blocking on #71 (comment)

@jfrerich jfrerich dismissed stale reviews from levb and aaronrothschild via a61b82d June 4, 2020 15:32
@jfrerich jfrerich force-pushed the add_mattermost-plugin-welcomebot_v1.2.0 branch from dad82e2 to dc2fed2 Compare June 4, 2020 15:42
hanzei
hanzei previously approved these changes Jun 4, 2020
@hanzei hanzei requested a review from DHaussermann June 4, 2020 15:56
@DHaussermann
Copy link

@jfrerich I'm just catching up on this. Should this issue resolved now? I'm not seeing this issue @hanzei has in his screenshot but I'm not sure I understand the issue.

@jfrerich
Copy link
Contributor Author

jfrerich commented Jun 6, 2020

@DHaussermann this suggestion would create the effect of having different plugin text in 1) the system console and 2) the marketplace. @hanzei brought up this issue and we decided to keep the text the same. In both places you should see This plugin adds a WelcomeBot that helps add new users to channels.

@jfrerich
Copy link
Contributor Author

jfrerich commented Jun 7, 2020

Note that I merged the latest production branch and reran make generate to pick up the new confluence plugin.

@hanzei hanzei removed the 2: Dev Review Requires review by a core committer label Jun 9, 2020
Copy link

@DHaussermann DHaussermann 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 passed

  • Tested fresh install
  • Tested upgrade from 1.1.1
  • Icon Looks correct (including in dark theme)
  • Text in system console and market place remains as expected

LGTM!

@DHaussermann DHaussermann added 4: Reviews Complete All reviewers have approved the pull request and removed 3: QA Review Requires review by a QA tester labels Jun 11, 2020
@hanzei hanzei merged commit e8a7117 into production Jun 11, 2020
@hanzei hanzei deleted the add_mattermost-plugin-welcomebot_v1.2.0 branch June 11, 2020 14:51
lieut-data added a commit that referenced this pull request Jul 13, 2020
* Merge master into production (#49)

* [MM-21749] [MM-22214] Add "Beta" and "Community" label (#37)

* Add beta and community label

* wording

* Feedback

* Make use of model.IsValid() (#44)

* Pin github.com/rakyll/statik version (#47)

* document automatic deployment (#46)

* document automatic deployment

* tweak merging language

Co-authored-by: Ben Schumacher <[email protected]>

* Add issue templates for community plugins (#45)

Add two issue templates: one for adding a new community plugin and one for updating an existing community plugin.

* [MM-23184] Omit empty labels list (#48)

Co-authored-by: Jesse Hallam <[email protected]>

* Add v0.14.0 of mattermost-plugin-github to the Marketplace (#51)

* Add v1.3.0 of mattermost-plugin-zoom to the Marketplace (#50)

* Add v1.2.0 of mattermost-plugin-custom-attributes to the Marketpl… (#53)

* Add mattermost plugin autolink v1.2.0 (#56)

* Add v1.2.0 of mattermost-plugin-autolink to the Marketplace

* Remove custom-attributes from this PR

* add the statik.go file after manually removed autolink from plugins.json and reran 'make generate'

Co-authored-by: Ben Schumacher <[email protected]>

* Add v1.3.1 of mattermost-plugin-zoom to the Marketplace (#59)

* Add mattermost plugin todo v0.2.0 (#57)

* Add v2.4.0 of mattermost-plugin-jira to the Marketplace (#66)

* Add v1.0.4 of mattermost-plugin-nps to the Marketplace (#63)

* Add v0.2.0 of mattermost-plugin-skype4business to the Marketplace (#70)

* Add v1.0.0 of mattermost-plugin-github to the Marketplace (#69)

* Add v1.2.0 of mattermost-plugin-confluence to the Marketplace (#73)

* Add mattermost plugin welcomebot v1.2.0 (#71)

* Add v1.0.0 of mattermost-plugin-mscalendar to the Marketplace (#78)

* Add v1.1.0 of mattermost-plugin-jenkins to the Marketplace (#80)

* Add v2.0.0 of mattermost-plugin-jitsi to the Marketplace (#82)

* Add Enterprise label to MS Calendar

* make generate

* Add v1.3.0 of mattermost-plugin-giphy-moussetc to the Marketplace (#85)

Co-authored-by: Jesse Hallam <[email protected]>
Co-authored-by: Jason Frerich <[email protected]>
lieut-data added a commit that referenced this pull request Jul 13, 2020
* [MM-21749] [MM-22214] Add "Beta" and "Community" label (#37)

* Add beta and community label

* wording

* Feedback

* Make use of model.IsValid() (#44)

* Pin github.com/rakyll/statik version (#47)

* document automatic deployment (#46)

* document automatic deployment

* tweak merging language

Co-authored-by: Ben Schumacher <[email protected]>

* Add issue templates for community plugins (#45)

Add two issue templates: one for adding a new community plugin and one for updating an existing community plugin.

* [MM-23184] Omit empty labels list (#48)

* Drop iconPaths workaround (#62)

* Use GITHUB_TOKEN env variable instead of having the user define it (#54)

* Proxy upstream support (#60)

* s/store/staticStore/

* prefer later plugins if version exactly matches

* introduce merged and proxy stores

* support --upstream

* generate on run-server

* update to go1.14

* tidy up interface/comments

* golangci-lint local-only complaints

* Update internal/store/proxy_test.go

* revert generate on run-server

* avoid merged store unless needed

Co-authored-by: Ben Schumacher <[email protected]>
Co-authored-by: mattermod <[email protected]>

* Ensure manually added plugins stay in the database (#68)

* Send Announcements for new plugins (#76)

* Limit enterprise plugins to E20 installations (#79)

* Limit enterprise plugins to E20 installations

* Apply suggestions from code review

Co-authored-by: Aaron Rothschild <[email protected]>

* Make getPlugins signature more clear

* Don't omit enterprise in json

* make generate

* Include workaround for https://mattermost.atlassian.net/browse/MM-26507

* Fix typo

* Changes as requested

* Drop else

* Move minVersionSupportingEnterpriseFlags into global scope

Co-authored-by: Aaron Rothschild <[email protected]>

* Merge production into master (#88)

* Merge master into production (#49)

* [MM-21749] [MM-22214] Add "Beta" and "Community" label (#37)

* Add beta and community label

* wording

* Feedback

* Make use of model.IsValid() (#44)

* Pin github.com/rakyll/statik version (#47)

* document automatic deployment (#46)

* document automatic deployment

* tweak merging language

Co-authored-by: Ben Schumacher <[email protected]>

* Add issue templates for community plugins (#45)

Add two issue templates: one for adding a new community plugin and one for updating an existing community plugin.

* [MM-23184] Omit empty labels list (#48)

Co-authored-by: Jesse Hallam <[email protected]>

* Add v0.14.0 of mattermost-plugin-github to the Marketplace (#51)

* Add v1.3.0 of mattermost-plugin-zoom to the Marketplace (#50)

* Add v1.2.0 of mattermost-plugin-custom-attributes to the Marketpl… (#53)

* Add mattermost plugin autolink v1.2.0 (#56)

* Add v1.2.0 of mattermost-plugin-autolink to the Marketplace

* Remove custom-attributes from this PR

* add the statik.go file after manually removed autolink from plugins.json and reran 'make generate'

Co-authored-by: Ben Schumacher <[email protected]>

* Add v1.3.1 of mattermost-plugin-zoom to the Marketplace (#59)

* Add mattermost plugin todo v0.2.0 (#57)

* Add v2.4.0 of mattermost-plugin-jira to the Marketplace (#66)

* Add v1.0.4 of mattermost-plugin-nps to the Marketplace (#63)

* Add v0.2.0 of mattermost-plugin-skype4business to the Marketplace (#70)

* Add v1.0.0 of mattermost-plugin-github to the Marketplace (#69)

* Add v1.2.0 of mattermost-plugin-confluence to the Marketplace (#73)

* Add mattermost plugin welcomebot v1.2.0 (#71)

* Add v1.0.0 of mattermost-plugin-mscalendar to the Marketplace (#78)

* Add v1.1.0 of mattermost-plugin-jenkins to the Marketplace (#80)

* Add v2.0.0 of mattermost-plugin-jitsi to the Marketplace (#82)

* Add Enterprise label to MS Calendar

* make generate

* Add v1.3.0 of mattermost-plugin-giphy-moussetc to the Marketplace (#85)

Co-authored-by: Jesse Hallam <[email protected]>
Co-authored-by: Jason Frerich <[email protected]>

* s/sls/serverless

Co-authored-by: Ben Schumacher <[email protected]>
Co-authored-by: mattermod <[email protected]>
Co-authored-by: Aaron Rothschild <[email protected]>
Co-authored-by: Jason Frerich <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
4: Reviews Complete All reviewers have approved the pull request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants