Skip to content

Bump Mattermost to 5.18 #127

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
hanzei merged 2 commits into from
Jan 7, 2020
Merged

Bump Mattermost to 5.18 #127

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a4b559f
Bump Mattermost to 5.18
hanzei Dec 20, 2019
6fab4d3
Merge remote-tracking branch 'origin/master' into mm_5.18
hanzei Jan 7, 2020
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
2 changes: 1 addition & 1 deletion build/manifest/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"io/ioutil"
"os"

"github.com/mattermost/mattermost-server/model"
"github.com/mattermost/mattermost-server/v5/model"
"github.com/pkg/errors"
)

Expand Down
7 changes: 3 additions & 4 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,10 @@ module github.com/manland/mattermost-plugin-gitlab
go 1.13

require (
github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869
github.com/mattermost/mattermost-server v0.0.0-20190927121038-340287890a78
github.com/mattermost/mattermost-server/v5 v5.18.0
github.com/pkg/errors v0.8.1
github.com/stretchr/testify v1.3.0
github.com/xanzy/go-gitlab v0.20.1
github.com/stretchr/testify v1.4.0
github.com/xanzy/go-gitlab v0.22.2
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45
golang.org/x/sync v0.0.0-20190423024810-112230192c58
)
126 changes: 63 additions & 63 deletions go.sum
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions server/api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import (
"time"

"github.com/manland/mattermost-plugin-gitlab/server/gitlab"
"github.com/mattermost/mattermost-server/model"
"github.com/mattermost/mattermost-server/plugin"
"github.com/mattermost/mattermost-server/v5/model"
"github.com/mattermost/mattermost-server/v5/plugin"

"golang.org/x/oauth2"
)
Expand Down
4 changes: 2 additions & 2 deletions server/command.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import (
"strings"

"github.com/manland/mattermost-plugin-gitlab/server/gitlab"
"github.com/mattermost/mattermost-server/plugin"

"github.com/mattermost/mattermost-server/model"
"github.com/mattermost/mattermost-server/v5/model"
"github.com/mattermost/mattermost-server/v5/plugin"
)

const COMMAND_HELP = `* |/gitlab connect| - Connect your Mattermost account to your GitLab account
Expand Down
2 changes: 1 addition & 1 deletion server/configuration.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"reflect"

"github.com/manland/mattermost-plugin-gitlab/server/gitlab"
"github.com/mattermost/mattermost-server/model"
"github.com/mattermost/mattermost-server/v5/model"
"github.com/pkg/errors"
)

Expand Down
2 changes: 1 addition & 1 deletion server/gitlab/user.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package gitlab

import (
"github.com/mattermost/mattermost-server/model"
"github.com/mattermost/mattermost-server/v5/model"
internGitlab "github.com/xanzy/go-gitlab"
"golang.org/x/oauth2"
)
Expand Down
2 changes: 1 addition & 1 deletion server/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package main

import (
"github.com/mattermost/mattermost-server/plugin"
"github.com/mattermost/mattermost-server/v5/plugin"
)

func main() {
Expand Down
4 changes: 2 additions & 2 deletions server/plugin.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import (

"github.com/manland/mattermost-plugin-gitlab/server/gitlab"
"github.com/manland/mattermost-plugin-gitlab/server/webhook"
"github.com/mattermost/mattermost-server/model"
"github.com/mattermost/mattermost-server/plugin"
"github.com/mattermost/mattermost-server/v5/model"
"github.com/mattermost/mattermost-server/v5/plugin"
"github.com/pkg/errors"

"golang.org/x/oauth2"
Expand Down
2 changes: 1 addition & 1 deletion server/subscriptions_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package main
import (
"testing"

"github.com/mattermost/mattermost-server/plugin/plugintest"
"github.com/mattermost/mattermost-server/v5/plugin/plugintest"
"github.com/stretchr/testify/assert"
)

Expand Down
2 changes: 1 addition & 1 deletion server/webhook.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"github.com/manland/mattermost-plugin-gitlab/server/subscription"
"github.com/manland/mattermost-plugin-gitlab/server/webhook"

"github.com/mattermost/mattermost-server/model"
"github.com/mattermost/mattermost-server/v5/model"
)

type gitlabRetreiver struct {
Expand Down
3 changes: 2 additions & 1 deletion server/webhook/webhook_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ import (
"fmt"
"testing"

"github.com/bmizerany/assert"
"github.com/stretchr/testify/assert"

"github.com/manland/mattermost-plugin-gitlab/server/subscription"
)

Expand Down
4 changes: 2 additions & 2 deletions server/webhook_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (

gitlabLib "github.com/xanzy/go-gitlab"
"github.com/manland/mattermost-plugin-gitlab/server/webhook"
"github.com/mattermost/mattermost-server/model"
"github.com/mattermost/mattermost-server/plugin/plugintest"
"github.com/mattermost/mattermost-server/v5/model"
"github.com/mattermost/mattermost-server/v5/plugin/plugintest"
"github.com/stretchr/testify/assert"
)

Expand Down