summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into advanced-permissions-phase-1George Goldberg2018-02-19617-129270/+23454
|\
| * always return non-nil client license (#8317)Chris2018-02-161-3/+5
| |
| * [PLT-539] Update incoming webhooks to accept multipart/form-data content (#7873)Carlos Tadeu Panato Junior2018-02-164-18/+57
| |
| * Upgrading server dependancies (#8308)Christopher Speller2018-02-16602-129158/+23070
| |
| * Send systemd READY notification (#8296)Pierre de La Morinerie2018-02-152-0/+96
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * PLT-8723: Fix DeadLock on reactions insertions (#8225)Jesús Espino2018-02-151-6/+20
| | | | | | | | | | | | * PLT-8723: Fix DeadLock on reactions insertions * Improved the HasReactions update SQL
| * XYZ-114 Adding mandatory membership to town-square in bulk-import (#8274)Jesús Espino2018-02-151-0/+6
| |
| * Modified advanced mail implementation to properly support multiple ↵Jonathan2018-02-152-16/+36
| | | | | | | | attachments with the same file name (#8289)
| * Wait for goroutines to finish before shuting down server (#8259)Pierre de La Morinerie2018-02-141-5/+15
| | | | | | | | | | | | | | | | 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.
| * Merge branch 'release-4.7-t3merge3'Derrick Anderson2018-02-144-64/+149
| |\
| | * gofmtDerrick Anderson2018-02-134-4/+4
| | |
| | * Merge release-4.7 with master in side branchDerrick Anderson2018-02-137-68/+153
| |/|
| | * Merge branch 'ccbrown-rm-willnorris-proxy-support' into release-4.7Derrick Anderson2018-02-134-67/+14
| | |\
| | | * Merge branch 'release-4.7' into rm-willnorris-proxy-supportChris2018-02-1286-1349/+1358
| | | |\ | | | |/ | | |/|
| | * | Merge branch 'release-4.7-revertmaster' into release-4.7Derrick Anderson2018-02-1284-1345/+1216
| | |\ \
| | | * | revert master changesDerrick Anderson2018-02-1284-1345/+1216
| | |/ /
| | * | Merge branch 'icu669' into release-4.7Derrick Anderson2018-02-122-4/+142
| | |\ \
| | | * \ Merge branch 'release-4.7' into icu669Derrick Anderson2018-02-1291-1234/+1527
| | | |\ \ | | | |/ / | | |/| |
| | | * | Fixed typo in unit testHarrison Healey2018-02-121-1/+1
| | | | |
| | | * | ICU-669 Handle relative links betterHarrison Healey2018-02-092-12/+19
| | | | |
| | | * | ICU-669 Ensured all URLs returned from OpenGraph are absoluteHarrison Healey2018-02-082-4/+135
| | | | |
| | | | * poke jenkinsChristopher Brown2018-02-120-0/+0
| | | | |
| | | | * remove willnorris/imageproxy supportChristopher Brown2018-02-124-66/+13
| | | |/ | | |/|
* | | | MM-8827: Add ADD_REACTION, REMOVE_REACTION and REMOVE_OTHERS_REACTIONS ↵Jesús Espino2018-02-196-188/+333
| | | | | | | | | | | | | | | | permissions (#8300)
* | | | MM-9618: Don't change default role permissions for policy. (#8303)George Goldberg2018-02-195-47/+47
| | | |
* | | | Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-1Martin Kraft2018-02-146-32/+45
|\| | |
| * | | XYZ-110: Cherrypicking changes from release-4.7 to master (#8254)Jonathan2018-02-136-32/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Cherry-picking 7b2861de3a09cf00d00b0872cc537d54302c4bfa 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 8c22c5c6c6f835a6e73faf19036bad2a51bb9127)
* | | | Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-1Martin Kraft2018-02-130-0/+0
|\| | |
| * | | ABC-176 Prevent changing PluginSettings.EnableUploads through the API (#8249)Joram Wilander2018-02-134-2/+39
| | | | | | | | | | | | | | | | | | | | | | | | * Prevent changing PluginSettings.EnableUploads through the API * Contain api4 test case in it's own test
* | | | ABC-176 Prevent changing PluginSettings.EnableUploads through the API (#8249)Joram Wilander2018-02-134-2/+39
| | | | | | | | | | | | | | | | | | | | | | | | * Prevent changing PluginSettings.EnableUploads through the API * Contain api4 test case in it's own test
* | | | XYZ-78: Add note to upgrade code about advanced permissions migration. (#8267)George Goldberg2018-02-131-0/+4
| | | |
* | | | Merge branch 'master' into advanced-permissions-phase-1George Goldberg2018-02-1374-666/+939
|\| | |
| * | | Merge branch 'release-4.7-t4merge'Derrick Anderson2018-02-127-18/+100
| |\ \ \
| | * | | Merge remote-tracking branch 'origin/release-4.7' into release-4.7-t4mergeDerrick Anderson2018-02-127-18/+100
| |/| | | | | |/ /
| | * | Merge branch 'master' into release-4.7Chris2018-02-1284-1216/+1345
| | |\ \ | | |/ / | |/| |
| * | | Add tests for the `platform server` command (#8231)Pierre de La Morinerie2018-02-124-10/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Cleanup app state on initialization error When returning an initialization error, the app state was not cleaned up. This is especially visible during tests, as `appCount` is not decremented, and makes the new app initialization fail. * Test the `platform server` command As the `platform server` command only exits when interrupted by a signal, it is not possible to test it as the other cobra commands. Instead we directly test the actual command function. The internal command handler is slighly refactored to take a channel in argument, and registers it as the signal handler. Nothing very different—except than controlling this channel from the outside allows the test to send the system signal itself, thus preventing the server to run forever.
| * | | ABC-228 Update GetPosts caching to work for non-60 limits (#8233)Joram Wilander2018-02-092-7/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Update GetPosts caching to work for non-60 limits * Only cache on limits of 30/60 and add test * Add comments clarifying 30 and 60 limits
| * | | Add /v4/image api (#8230)Chris2018-02-094-0/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * add image api * i suppose i should add a test... * only redirect to image proxy
| * | | Merge branch 'release-4.7'Derrick Anderson2018-02-094-3/+4
| |\ \ \ | | | |/ | | |/|
| * | | Remove license globals entirely (#8229)Chris2018-02-0929-429/+256
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remove license globals entirely * fix infinite recursion * test fix
| * | | use mattermost fork of go-bindata (#8216)Chris2018-02-081-2/+2
| | | |
| * | | Add prepatory code for 4.8.0 (#8226)Derrick Anderson2018-02-081-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add prepatory code for 4.8.0 * formatting issue * build bug
| * | | fix client4 post sanitization (#8219)Chris2018-02-083-8/+67
| | | |
| * | | Merge branch 'release-4.7'Derrick Anderson2018-02-086-34/+34
| |\ \ \
| * | | | Eliminate utils.SetLicense calls (#8217)Chris2018-02-0714-665/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * eliminate utils.SetLicense calls * test fix * another test fix * more test fixes
| * | | | ABC-132: sign error page parameters (#8197)Chris2018-02-0712-36/+226
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * sign error page parameters * add comments
| | | | * Added invite_id field to email invite url, along with validation of this ↵Jonathan2018-02-125-13/+79
| | | | | | | | | | | | | | | | | | | | field on the server (#8235)
| | | | * minor addition to #8238Christopher Brown2018-02-092-5/+7
| | | | |
| | | | * Don't proxy same-site image urls (#8238)Chris2018-02-092-2/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * don't proxy same-site urls * fix empty site url case
| | | | * Add /v4/image api (#8230)Chris2018-02-094-0/+82
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * add image api * i suppose i should add a test... * only redirect to image proxy
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-06-28 14:41:14 +0000