mirrors/mostlymatter
1
0
Форкнуть 0
Код Задачи Запросы на слияние Действия Пакеты Проекты Релизы Вики Активность
9 654 коммитов 3 Ветки 0 Теги
2fba6fa7997066adfbe02e92cd22ea75018f4fe7
Граф коммитов

9654 Коммитов

This Branch
This Branch
Все ветки
Автор SHA1 Сообщение Дата
Fede
2fba6fa799 Fix prerequisites checker so 1.10 > 1.9 (#8344) 
* Fix prerequisites checker so 1.10 > 1.9

* Check prerequisites sorting by dot separator
 2018-02-27 17:53:27 -05:00
Joram Wilander
2782602c6e Temporarily disable flaky TestSendMailUsingConfigAdvanced test (#8379) 
* Temporarily disable flaky TestSendMailUsingConfigAdvanced test

* Remove imports
 2018-02-27 13:07:31 -05:00
Christopher Speller
ae1acbda49 MM-9698 Fixing Minio with server side encryption. (#8367) 
* Fixig Minio with server side encryption.

* Add png file backend test
 2018-02-26 09:45:35 -05:00
Chris
f0f4f68def add individual platform packaging targets (#8366) 2018-02-26 02:48:56 -05:00
Christopher Speller
838295f82c Fix forward 80 to 443 to not bind on all interfaces. (#8360) 2018-02-23 18:33:36 -05:00
Derrick Anderson
babccba8f8 Merge branch 'merge47intomaster' 2018-02-23 15:34:04 -05:00
Derrick Anderson
4538857ae3 Merge remote-tracking branch 'origin/release-4.7' into merge47intomaster 2018-02-23 15:14:01 -05:00
Chris
55261a2b15 fix scheduled task race (#8355) 2018-02-23 12:56:32 -06:00
Joram Wilander
5fb4b1bc93 MM-8593 Default APIv3 to disabled for new installs (#8353) 
* Default APIv3 to disabled for new installs

* Add EnableAPIv3 setting to client config

* Enable APIv3 for needed tests
 2018-02-23 07:55:02 -08:00
Joram Wilander
4211a2bb3c Fall back to constructured URL for OAuth SSO if SiteURL not set (#8352) 2018-02-23 10:08:35 -05:00
Chris
d44ef7ea67 Remove global site url (#8343) 
* remove global site url

* missed one

* revert mysterious change
 2018-02-22 18:23:32 -06:00
Joram Wilander
1b3808f3ec Fix push notification content for file only messages (#8346) 2018-02-22 09:00:13 -05:00
Joram Wilander
659ce8c600 Change log level of 404s to DEBUG (#8339) 2018-02-21 09:20:10 -05:00
Jesús Espino
342d05bcfc Adding saml migration command (#8263) 
* Adding saml migration command

* Texts fixed
 2018-02-21 14:34:03 +01:00
Christopher Speller
75d9a3a3b9 MM-8681 Adding config settings necessary for using CloudFront. (#8307) 
* Adding config settings nessisary for using CloudFront.

* Adding new config settings to diagnostics.
 2018-02-20 12:49:45 -08:00
Jason Blais
febc129eca Update en.json (#8332) 2018-02-20 13:56:50 -05:00
Chris
19a5d0047d MM-8710: Web Hub optimizations (#8293) 
* webhub optimizations

* test fix

* minor fix

* big perf improvement to ToJson after precomputing

* fix hub connection count
 2018-02-20 10:50:10 -08:00
Harrison Healey
babd795d79 MM-9556 Added ability to upload files without a multipart request (#8306) 
* MM-9556 Added ability to upload files without a multipart request

* MM-9556 Handled some unusual test behaviour
 2018-02-20 10:41:00 -05:00
Harrison Healey
f85d910592 Added t.Helper to CheckXStatus test functions (#8305) 2018-02-20 08:51:01 -05:00
enahum
18a1599e92 translations PR 20180220 (#8334) 2018-02-20 10:43:01 -03:00
Derrick Anderson
0145cd4da8 Merge branch 'merge-4.7' 2018-02-19 17:07:39 -05:00
Jesús Espino
c39291597b Remove unnecesary line 2018-02-19 21:09:36 +01:00
Saturnino Abril
45d7c51d9f merge 4.7.1 to master 2018-02-19 23:47:34 +08:00
Derrick Anderson
a9d4c7d4c1 Merge branch 'mm-9633' into release-4.7 2018-02-16 19:13:08 -05:00
JoramWilander
291432e254 Add upgrade code from 4.7.0 to 4.7.1 2018-02-16 17:14:22 -05:00
JoramWilander
98bd9a0753 Remove bad field from ChannelMemberHistory model 2018-02-16 17:03:12 -05:00
Chris
30197584d5 always return non-nil client license (#8317) 2018-02-16 14:51:46 -05:00
Carlos Tadeu Panato Junior
8c3a7b75de [PLT-539] Update incoming webhooks to accept multipart/form-data content (#7873) 2018-02-16 08:29:12 -08:00
Christopher Speller
6d8f122a51 Upgrading server dependancies (#8308) 2018-02-16 09:47:51 -05:00
Pierre de La Morinerie
b112747de7 Send systemd READY notification (#8296) 
Currently, when starting Mattermost programmatically, it's hard to tell
when the server is actually ready to receive network connections.

This isn't convenient for monitoring (the systemd service status is
"running" although the server is still booting), nor for programatic use
(where a script would need to know when the server is ready to perform
further actions).

To improve this, systemd allow processes to tell when they started
successfully. The launcher waits for this notification before
reporting the service as successfully launched.

The way processes notify systemd is by sending a `READY=1` string over
a standard unix socket, whose path is provided in an environment var.

The systemd service is then told to expect this notification:

```diff
 [Service]
-Type=simple
+Type=notify
 ExecStart=/home/vagrant/go/bin/platform
```

Now, when starting the server, systemd will actually wait for the server to
be ready before returning the control to the shell.

Additionally, during this time, querying the server status with
`service mattermost status` will report the service as "activating" – before
transitioning to "running" when the server is ready.
 2018-02-15 16:47:03 -08:00
Jesús Espino
2930766c65 PLT-8723: Fix DeadLock on reactions insertions (#8225) 
* PLT-8723: Fix DeadLock on reactions insertions

* Improved the HasReactions update SQL
 2018-02-15 16:41:49 -08:00
Jesús Espino
c158e9a5a0 XYZ-114 Adding mandatory membership to town-square in bulk-import (#8274) 2018-02-15 15:31:48 +00:00
Jonathan
05d84a8008 Modified advanced mail implementation to properly support multiple attachments with the same file name (#8289) 2018-02-15 09:02:31 +01:00
Derrick Anderson
9360131992 Merge branch 'translations-20180215' into release-4.7 2018-02-14 21:22:42 -05:00
Elias Nahum
7f93d17a5f translations PR 20180215 2018-02-15 02:04:21 +00:00
Pierre de La Morinerie
44a27125de Wait for goroutines to finish before shuting down server (#8259) 
When running server tests, the server will exit while some jobs spawned
through a goroutine are still running. This may crash the test harness,
as the jobs try to access a shut down app instance.

Fortunately the fix is easy: we just have to use the same App
goroutine-counting facility than the rest of the method's goroutines.
 2018-02-14 12:18:06 -06:00
Derrick Anderson
cafa4e4370 Merge branch 'release-4.7-t3merge3' 2018-02-14 12:58:36 -05:00
Derrick Anderson
622fb1a50f Merge branch 'icu753' into release-4.7 2018-02-14 00:53:28 -05:00
Derrick Anderson
88d693a950 Merge branch 'release-4.7' into icu753 2018-02-14 00:53:04 -05:00
Derrick Anderson
82209b9452 Merge branch 'XYZ-110' into release-4.7 2018-02-14 00:51:40 -05:00
Derrick Anderson
2fa49a41f7 Merge branch 'translations-20180212' into release-4.7 2018-02-14 00:50:23 -05:00
Derrick Anderson
50b648156c Merge branch 'ICU-764' into release-4.7 2018-02-14 00:48:30 -05:00
Derrick Anderson
963150b6ec Merge branch 'jespino-XYZ-111' into release-4.7 2018-02-14 00:46:43 -05:00
Derrick Anderson
afa7f70f53 Merge branch 'XYZ-111' of https://github.com/jespino/platform into jespino-XYZ-111 2018-02-14 00:46:05 -05:00
Derrick Anderson
63d45a0ada ping jenkins 2018-02-14 00:12:57 -05:00
Derrick Anderson
e43f381764 gofmt 2018-02-13 23:46:49 -05:00
Derrick Anderson
4e4535bda9 Merge release-4.7 with master in side branch 2018-02-13 23:20:27 -05:00
Stephen Kiers
69e56fc042 gofmt 2018-02-13 13:20:46 -07:00
Jonathan
bf1fdf92c7 XYZ-110: Cherrypicking changes from release-4.7 to master (#8254) 
* Cherry-picking 7b2861de3a to master because enterprise/master has code in it that enterprise/release-4.7 does not, and I don't want enterprise/master to break the next time somebody merges enterprise/release-4.7 to enterprise/master

* Renamed file to match existing scheme

(cherry picked from commit 8c22c5c6c6)
 2018-02-13 15:17:29 -05:00
Stephen Kiers
2544ad70c3 rerun jenkins? 2018-02-13 13:01:31 -07:00