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

9639 Коммитов

This Branch
This Branch
Все ветки
Автор SHA1 Сообщение Дата
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
Stephen Kiers
1fe522659b remove debug statement 2018-02-13 11:51:38 -07:00
Stephen Kiers
08c21f7519 Added more tests and simplified code 2018-02-13 10:49:48 -07:00
Joram Wilander
5c560db810 ABC-176 Prevent changing PluginSettings.EnableUploads through the API (#8249) 
* Prevent changing PluginSettings.EnableUploads through the API

* Contain api4 test case in it's own test
 2018-02-13 11:08:49 -05:00
Jonathan Fritz
8c22c5c6c6 Renamed file to match existing scheme 2018-02-13 10:48:34 -05:00
Harrison Healey
3fef21e350 ICU-753 Added unit tests for messages with only push notifications 2018-02-13 09:57:23 -05:00
Harrison Healey
c1b49f8b77 ICU-753 Added unit tests for push notification contents 2018-02-13 09:57:23 -05:00
Harrison Healey
b8a4316b13 ICU-753 Remove special behaviour for group messages in generic push notifications 2018-02-13 09:57:23 -05:00
Jonathan Fritz
18fa32567b Merge branch 'release-4.7' into XYZ-110 2018-02-13 08:39:56 -05:00
Derrick Anderson
8b79f5d49c Merge branch 'ccbrown-rm-willnorris-proxy-support' into release-4.7 2018-02-13 08:16:38 -05:00
Jesús Espino
bda8736770 XYZ-111: Check max users per team on re-join after leave a team 2018-02-13 10:43:28 +01:00
Stephen Kiers
bdf478c75b Added another test 2018-02-12 20:50:20 -07:00
Chris
fbef16f863 Merge branch 'release-4.7' into rm-willnorris-proxy-support 2018-02-12 18:36:39 -06:00
Stephen Kiers
0cbba46018 Fixes ICU-764 2018-02-12 16:30:03 -07:00
Elias Nahum
445a356d0d translations PR 20180212 2018-02-12 23:08:38 +00:00
Jonathan Fritz
7b2861de3a Removed unused fields from ChannelMemberHistory table, introduced new model.ChannelMemberHistoryResult object that includes those fields that are selected from a join on other tables 2018-02-12 16:14:52 -05:00