Merge release branch 'release-0.7.0'
Этот коммит содержится в:
@@ -34,7 +34,7 @@ VOLUME /var/lib/mysql
|
|||||||
WORKDIR /mattermost
|
WORKDIR /mattermost
|
||||||
|
|
||||||
# Copy over files
|
# Copy over files
|
||||||
ADD https://github.com/mattermost/platform/releases/download/v0.7.0/mattermost.tar.gz /
|
ADD https://github.com/mattermost/platform/releases/download/v0.7.1/mattermost.tar.gz /
|
||||||
RUN tar -zxvf /mattermost.tar.gz --strip-components=1 && rm /mattermost.tar.gz
|
RUN tar -zxvf /mattermost.tar.gz --strip-components=1 && rm /mattermost.tar.gz
|
||||||
ADD config_docker.json /
|
ADD config_docker.json /
|
||||||
ADD docker-entry.sh /
|
ADD docker-entry.sh /
|
||||||
|
|||||||
@@ -561,6 +561,7 @@ func signupCompleteOAuth(c *api.Context, w http.ResponseWriter, r *http.Request)
|
|||||||
}
|
}
|
||||||
|
|
||||||
user.TeamId = team.Id
|
user.TeamId = team.Id
|
||||||
|
user.EmailVerified = true
|
||||||
|
|
||||||
ruser := api.CreateUser(c, team, user)
|
ruser := api.CreateUser(c, team, user)
|
||||||
if c.Err != nil {
|
if c.Err != nil {
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user