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

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

Merged
merged 1 commit into from
Jun 7, 2020
Merged

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

merged 1 commit into from
Jun 7, 2020

Conversation

jfrerich
Copy link
Contributor

@jfrerich jfrerich commented Jun 2, 2020 •
edited by hanzei
Loading

Summary

Add confluence v1.2.0 to marketplace

Note that confluence is a new marketplace plugins and needed to be added to the generate script.

Ticket Link

Fixes mattermost-community/mattermost-plugin-confluence#51

@jfrerich jfrerich added the 2: Dev Review Requires review by a core committer label Jun 2, 2020
@jfrerich jfrerich requested review from lieut-data, hanzei and levb June 2, 2020 15:51
@jfrerich jfrerich added 1: PM Review Requires review by a product manager 3: QA Review Requires review by a QA tester labels Jun 2, 2020
lieut-data
lieut-data requested changes Jun 2, 2020
View reviewed changes
Copy link
Member

@lieut-data lieut-data left a comment

Choose a reason for hiding this comment

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

Marketplace changes look good, just one comment on generator.

cmd/generator/main.go Outdated Show resolved Hide resolved
hanzei
hanzei requested changes Jun 2, 2020
View reviewed changes
cmd/generator/main.go Outdated Show resolved Hide resolved
levb
levb previously approved these changes Jun 3, 2020
View reviewed changes
@jfrerich jfrerich requested review from lieut-data and hanzei June 3, 2020 22:14
@jfrerich
Copy link
Contributor Author

jfrerich commented Jun 3, 2020

@hanzei, @lieut-data I reverted adding the icon SVG file and the entry from the icon struct.

Regarding the conflicting data/statik/statik.go issue. What the correct resolution there? The file is going to be overwritten, correct?

@lieut-data
Copy link
Member

@jfrerich, whatever the generator produces should override statik.go, so feel free to resolve in favour of your changes.

lieut-data
lieut-data previously approved these changes Jun 4, 2020
View reviewed changes
@jfrerich jfrerich force-pushed the add_mattermost-plugin-confluence_v1.2.0 branch from f9f7ca8 to 905122a Compare June 4, 2020 14:38
@jfrerich jfrerich force-pushed the add_mattermost-plugin-confluence_v1.2.0 branch from 905122a to 67329a8 Compare June 4, 2020 14:57
@hanzei hanzei removed the 1: PM Review Requires review by a product manager label Jun 4, 2020
@jfrerich
Copy link
Contributor Author

jfrerich commented Jun 4, 2020

@lieut-data, @DHaussermann, @levb we are good to go again, with a fresh commit

@levb levb removed the 2: Dev Review Requires review by a core committer label Jun 5, 2020
DHaussermann
DHaussermann approved these changes Jun 5, 2020
View reviewed changes
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 install and upgrade path
  • Version is correct
  • Icon looks good
    No issues found using plugin after upgrade or install
    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 5, 2020
@jfrerich jfrerich merged commit 4b92ba6 into production Jun 7, 2020
@jfrerich jfrerich deleted the add_mattermost-plugin-confluence_v1.2.0 branch June 7, 2020 01:03
lieut-data added a commit that referenced this pull request Jul 13, 2020
@hanzei @lieut-data @jfrerich
Merge production into master (#88)
6a7d54e 
* 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
@lieut-data @hanzei
@mattermod @aaronrothschild @jfrerich
Fix production (#89)
0dc65cd 
* [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
Reviewers

@DHaussermann DHaussermann DHaussermann approved these changes

@hanzei hanzei hanzei approved these changes

@levb levb levb approved these changes

@lieut-data lieut-data lieut-data approved these changes

Assignees
No one assigned
Labels
4: Reviews Complete All reviewers have approved the pull request
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@jfrerich @lieut-data @levb @hanzei @DHaussermann