Граф коммитов

11396 Коммитов

Автор SHA1 Сообщение Дата
Eli Yukelzon
da768d677e MM-16888 - Fix canonical vs. migration mismatches (#11825)
* fixed migration errors, added check to Jenkins
2019-08-14 14:58:01 +03:00
Miguel de la Cruz
04d43b072c [MM-17758] Explicits the search configuration when using full text search in postgres (#11870) 2019-08-13 15:48:06 +02:00
Jesse Hallam
9ce52fb1da MM-16378: revert plugin health check config removal (#11819)
* revert 4e5f6fcfbc

This reverts the configuration setting to disable plugin health checks, preferring instead to retain this functionality for advanced cases. In part, this was driven by the discovery that the health checks were failing on Windows, though that will be addressed separately.

Fixes: MM-16378

* simplify interval handling/logging

Also shutdown the job when plugins are altogether disabled.
2019-08-12 18:48:02 -03:00
Jesse Hallam
1135e42ac0 MM-17488: simplify plugin health check (#11820)
Simplify the plugin health check to only leverage the `Ping` API instead of sending signals, the latter of which is not supported on Windows.
2019-08-12 18:38:25 -03:00
Jesse Hallam
87c0d304c6 MM-17412: update post incorrectly removing files (#11834)
* leverage testify

* improve TestUpdatePost tests

* improve TestPatchPost

* assert unchanged fileIds after UpdatePost

* MM-17412: retain existing FileIds on post update
2019-08-12 18:36:08 -03:00
Jesse Hallam
9bb36614a6 MM-17438: allow attaching nouser files to posts (#11837)
* tweak AttachToPost formatting

* test attaching files uploaded by nouser

* MM-17438: allow attaching nouser files to posts
2019-08-12 18:35:46 -03:00
Siyuan Liu
e4bb8cd887 MM-11359: support excluding results from search (#11196) 2019-08-12 14:03:42 +02:00
Christopher Speller
a4091cd363 Updating prepackaged jira and adding antivirus. (#11838) 2019-08-09 13:32:37 -07:00
amyblais
5cfac858e9 Fix typos in en.json (#11810) 2019-08-09 21:07:21 +02:00
Martin Kraft
58880a9694 MM-17432: Removes deactivated users from the group member counts. (#11829)
* MM-17432: Removes deactivated users from the group member counts.

* MM-17432: Reuses variable.
2019-08-09 14:39:57 -04:00
Joram Wilander
404c49f62f MM-16725 Respect env var overrides when setting config (#11821)
* Respect env var overrides when setting config

* Use strings.NewReader
2019-08-09 11:33:59 -04:00
Martin Kraft
9ea0a60d88 Includes 'i18n-extract' in 'make help' output. (#11841) 2019-08-09 07:22:33 -07:00
Harrison Healey
eba8794540 MM-17071 Extract and add tests for handling of out of channel mentions (#11788)
* MM-17071 Extract and add tests for handling of out of channel mentions

* Rename checkForOutOfChannelMentions back to sendOutOfChannelMentions

* Log errors returned by sendOutOfChannelMentions
2019-08-09 09:27:28 -04:00
Daniel Schalla
5d86660f3a Removed unncessary newline from i18n file (#11807) 2019-08-09 15:20:28 +02:00
Hanzei
20b0af446a Fix NPE when installing a plugin via URL (#11809) 2019-08-09 07:28:28 +02:00
Lev
4cd9fdf641 MM-17607: large [brand, team, profile] images crash the server (#11827) 2019-08-08 17:23:37 -04:00
Martin Kraft
3056b192fe MM-17496: Skip adding user to default channel (rather than failing) when user has already left the parent team. (#11790) 2019-08-08 03:39:23 +05:30
Carlos Tadeu Panato Junior
4734215a11 fix port extensions (#11806)
* using override instead of extend

* revert and move the port allocation

* add new line
2019-08-06 09:33:40 -03:00
Jesús Espino
c3c2b6dec1 Update email templates for guest accounts (#11802) 2019-08-06 12:07:35 +02:00
Jesús Espino
4acb139870 Enabling the release-5.14 migration and adding the 5.15 and 5.16 skel (#11783) 2019-08-06 11:54:01 +02:00
Jesús Espino
2df3951f6f Create direct message respect the user role (Guest/Normal user) (#11697)
* Create direct message respect the user role (Guest/Normal user)

* Fixing build

* Updating Timer store layer
2019-08-06 11:33:32 +02:00
Jesús Espino
619f0ebf5c Invalidate Guest invites too on invalidate email invates (#11696)
* Invalidate Guest invites too on invalidate invates

* Adding tests for invalidate email invites
2019-08-06 11:06:20 +02:00
Carlos Tadeu Panato Junior
c927fb9d50 add docker-compose for ci (#11795)
* add docker-compose for ci

* docker-compose logs does not have the option to set the dc file

* leverage docker-compose extends

This moves the developer `docker-compose.yml` to the root, extending the `build/docker-compose.yml` and overriding the `container_name` to preserve compatibility with the older, non-docker-compose setup.

Note that this required downgrading to docker-compose 2.4's file format (still supported by the newer tooling) due to the long and frustrating converstaion at https://github.com/moby/moby/issues/31101.

* remove -f docker-compose-ci.yml references
2019-08-06 08:46:53 +02:00
Miguel de la Cruz
a1a190e5c0 [MM-17214] Use AddChannelMember method when registering a new guest (#11800) 2019-08-05 20:06:03 +02:00
Miguel de la Cruz
8295881b78 [MM-16856] Allow account related mails to be sent with notifications disabled (#11598) 2019-08-05 19:09:48 +02:00
Eli Yukelzon
78abdbb1dd MM-16366 - Prevent attachment duplication on import (#11770)
* prevent attachment duplication

* improved tests

* corrected import into a new post
2019-08-04 13:05:33 +03:00
Jesse Hallam
e33bdc94f1 Tweak docker compose setup (#11785)
* fix stray dockerhost mention

* fix stray whitespace

* fix missing mattermost-redix cleanup in clean-old-docker

* absolute path to docker-compose, plus simpler ldap initialization

* allow ldapadd to fail on CI
2019-08-02 18:46:32 -03:00
Carlos Tadeu Panato Junior
f02f83a7df update sampledata users passwords (#11769)
* update sampledata users passwords

* update makefile
2019-08-02 19:42:25 +02:00
Martin Kraft
c74f685c76 MM-17117: Updates einterface for FirstLoginSync. (#11737) 2019-08-02 10:57:35 -04:00
scott lee davis
2fa63b10ec MM 7971 dockerhost -> localhost && docker -> docker-compose (#10872)
* replace dockerhost with localhost

* remove uneeded setup-max build step (no more dockerhost)

* changes as recommended by @cpanato

* make clean-docker with docker-compose

* added ports to docker-compose.yml (needed for osx).   ignore error for ldapadd (when already exists)

* add clean-old-docker to legacy.mk

* docker-compose stop instead of down for `make stop-docker`
2019-08-02 11:53:00 -03:00
Jesús Espino
e4582905ea Time Layer for measure the Store methods calls time (#11609)
* Time Layer for measure the Store methods calls time

* Fixing build

* Fixing a formating problem

* Fixing tests

* generating store mocks

* Fixing build

* Updating generated timer layer

* Updating timer layer to the last store interface

* Updating timer layer

* Generating time layer
2019-08-01 22:10:58 +02:00
Harrison Healey
fe9e8a4493 MM-17426 Properly specify multiple Accept headers for post metadata (#11766)
* MM-17326 Properly specify multiple Accept headers for post metadata

* Add q= weight to text/html
2019-08-01 13:52:38 -04:00
Jesse Hallam
11472e417c MM-17411: fix err != nil check (#11736)
Address another classic case of `var err error` and then trying to assign a `*model.AppError`. We really need to switch to passing `error` everywhere.
2019-08-01 12:39:46 -03:00
Eli Yukelzon
89a79e2e9f MM-17224 - Bulk export fails due to missing user (#11738)
* don't fail on deleted users

* test

* logging

* more fine grained error checking
2019-08-01 09:19:37 -03:00
Jesse Hallam
de88adfc0b MM-16479: panic on io.Copy error in test (#11684)
* MM-16479: panic on io.Copy error in test

I'm unable to reproduce the original report on MM-16479, but in a bid to help track down a potential failure in the future, I've added a panic on err returned from `io.Copy` within the plugin, as this seems like the only path on which the hook could return successfully but fail to show the updated contents.

* assert number of copied bytes

* log n on io.Copy error too
2019-07-31 14:27:46 -03:00
Jesse Hallam
53cae67ede fix flaky TestDoOutgoingWebhookRequest/with_a_slow_response (#11712)
Avoid relying on `time.Sleep` to assert timeout behaviour.
2019-07-31 14:25:17 -03:00
Jesús Espino
ee007962f4 Restrict the creation of dms/gms to user that you can see (#11695)
* Restrict the creation of dms/gms to user that you can see

* Adding tests

* Adding tests for CreateGroupChannel api endpoint
2019-07-31 18:37:28 +02:00
Jesús Espino
0ec0616d89 Restricting team stats using the VIEW_MEMBERS restrictions (#11694)
* Restricting team stats using the VIEW_MEMBERS restrictions

* Adding tests

* fixing tests
2019-07-31 18:34:03 +02:00
Ali Farooq
51cdae12c1 MM-16935 - Capture docker logs (#11735)
* Capture docker logs

* Using docker-compose logs to capture current build's logs

* Tarring instead of zipping

* Fixed jenkins file
2019-07-31 09:44:32 -04:00
Sven Hüster
2d0dd170c9 Slack corporate import (#11704)
* changes for channel and post import for corp slack

* add fix for missing dms in import

* add suggestions from PR review

* Apply suggestions from code review

Co-Authored-By: George Goldberg <george@gberg.me>

* fix gofmt
2019-07-31 11:31:15 +01:00
Martin Kraft
ddc48c3ac1 MM-17383: Update query to include users who are not members of any gr… (#11730)
* MM-17383: Update query to include users who are not members of any groups.

* MM-17383: Fixes govet complaint.

* MM-17383: Sorts by username.

* MM-17383: Removes accidental staging.
2019-07-30 12:04:08 -04:00
Jesse Hallam
f44473e062 MM-17339: fix missing post thread (#11729)
* leverage testify for TestGetPostsForChannelAroundLastUnread

* introduce assertPostList helper

* unit test MM-17339

* fix MM-17339
2019-07-30 17:27:18 +08:00
Ali Farooq
e2ef5d7149 Log panic when exiting (if any) (#11726) 2019-07-30 09:37:07 +02:00
Jesús Espino
bce11b7949 Removing unnused store methods (#11725) 2019-07-30 09:35:28 +02:00
Ali Farooq
8ba6c7f68a MM-17311 - Flaky TestGroupStore/UpsertMember (#11717)
* MM-17311 - Flaky TestGroupStore/UpsertMember

* PR Feedback
2019-07-29 13:48:28 -04:00
Maria A Nunez
3187907b67 MM-16990 - Fix webhooks visible to users without viewing permissions (#11698)
* Filtered incoming webhooks for users wihtout PERMISSION_MANAGE_OTHERS_INCOMING_WEBHOOKS

* Filtered outgoing webhooks for users without PERMISSION_MANAGE_OTHERS_OUTGOING_WEBHOOKS

* Refactored GetOutgoingByTeamByUser to its own method in app and store

* Fixed paging condition for outgoing webhooks in store

* Separated test cases into separate t.run in WebhookStore

* Improved unit test. PR Feedback

* Filtered outgoing webhooks by channel for users without PERMISSION_MANAGE_OTHERS

* Filtered getting full list of outgoing webhooks for users without PERMISSION_MANAGE_OTHERS

* Added missing signature for GetOutgoingWebhooksPage in app

* Expanded permissions in test to SYSTEM_USER_ROLE

* Filtered getting full list of incoming webhooks for users without PERMISSION_MANAGE_OTHERS

* Removed unnecessary sq.and operator
2019-07-29 12:32:26 -04:00
Maria A Nunez
8f4dab0162 Removed unnessary save in GetChannelsByScheme test (#11701) 2019-07-29 10:54:14 -04:00
Christopher Speller
20825a1702 Updating dependencies. (#11680) 2019-07-29 07:39:56 -07:00
Jesse Hallam
f226f672f3 MM-17235: fix flaky TestChannelStore tests (#11715)
Address more model.GetMillis() races.
2019-07-29 10:18:37 -04:00
Jesse Hallam
4beb1226c8 revert 0e534c8, rewriting plugin tests to use actual pugins (#11713)
Revert https://mattermost.atlassian.net/browse/MM-14559. The tests were refactored, but all the hooks were be run as:

    _, ret := hooks.MessageWillBePosted(nil, nil)

and the plugins were panicking, but then nothing was actually failing because this hook doesn't support returning a "proper" error. Good news is that the old tests are still passing, so nothing has regressed in the toolkit, but thinking we should revisit this holistically instead of trying to fix in place.
2019-07-29 10:07:00 -03:00