summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix forward 80 to 443 to not bind on all interfaces. (#8360)Christopher Speller2018-02-231-12/+17
|
* Merge branch 'merge47intomaster'Derrick Anderson2018-02-231-2/+4
|\
| * Merge remote-tracking branch 'origin/release-4.7' into merge47intomasterDerrick Anderson2018-02-231-2/+4
|/|
| * Change log level of 404s to DEBUG (#8339)Joram Wilander2018-02-211-2/+4
| |
* | fix scheduled task race (#8355)Chris2018-02-233-208/+70
| |
* | MM-8593 Default APIv3 to disabled for new installs (#8353)Joram Wilander2018-02-234-1/+4
| | | | | | | | | | | | | | | | * Default APIv3 to disabled for new installs * Add EnableAPIv3 setting to client config * Enable APIv3 for needed tests
* | Fall back to constructured URL for OAuth SSO if SiteURL not set (#8352)Joram Wilander2018-02-231-1/+6
| |
* | Remove global site url (#8343)Chris2018-02-2212-35/+32
| | | | | | | | | | | | | | | | * remove global site url * missed one * revert mysterious change
* | Fix push notification content for file only messages (#8346)Joram Wilander2018-02-223-2/+16
| |
* | Adding saml migration command (#8263)Jesús Espino2018-02-213-28/+176
| | | | | | | | | | | | * Adding saml migration command * Texts fixed
* | MM-8681 Adding config settings necessary for using CloudFront. (#8307)Christopher Speller2018-02-208-0/+43
| | | | | | | | | | | | * Adding config settings nessisary for using CloudFront. * Adding new config settings to diagnostics.
* | Update en.json (#8332)Jason Blais2018-02-201-1/+1
| |
* | MM-8710: Web Hub optimizations (#8293)Chris2018-02-203-50/+156
| | | | | | | | | | | | | | | | | | | | | | | | * webhub optimizations * test fix * minor fix * big perf improvement to ToJson after precomputing * fix hub connection count
* | MM-9556 Added ability to upload files without a multipart request (#8306)Harrison Healey2018-02-208-36/+242
| | | | | | | | | | | | * MM-9556 Added ability to upload files without a multipart request * MM-9556 Handled some unusual test behaviour
* | Added t.Helper to CheckXStatus test functions (#8305)Harrison Healey2018-02-201-21/+28
| |
* | translations PR 20180220 (#8334)enahum2018-02-2014-241/+345
| |
* | Merge branch 'merge-4.7'Derrick Anderson2018-02-1920-376/+770
|\ \
| * | Remove unnecesary lineJesús Espino2018-02-191-1/+0
| | |
| * | merge 4.7.1 to masterSaturnino Abril2018-02-1920-376/+771
|/| | | |/
| * Merge branch 'mm-9633' into release-4.7Derrick Anderson2018-02-163-1/+13
| |\
| | * Add upgrade code from 4.7.0 to 4.7.1JoramWilander2018-02-162-0/+13
| | |
| | * Remove bad field from ChannelMemberHistory modelJoramWilander2018-02-161-1/+0
| |/
| * Merge branch 'translations-20180215' into release-4.7Derrick Anderson2018-02-1414-61/+113
| |\
| | * translations PR 20180215Elias Nahum2018-02-1514-61/+113
| |/
| * Merge branch 'icu753' into release-4.7Derrick Anderson2018-02-143-41/+288
| |\
| | * Merge branch 'release-4.7' into icu753Derrick Anderson2018-02-1423-320/+420
| | |\ | | |/ | |/|
| * | Merge branch 'XYZ-110' into release-4.7Derrick Anderson2018-02-145-28/+45
| |\ \
| | * | Renamed file to match existing schemeJonathan Fritz2018-02-131-0/+0
| | | |
| | * | Merge branch 'release-4.7' into XYZ-110Jonathan Fritz2018-02-1387-1408/+1230
| | |\ \
| | * | | Removed unused fields from ChannelMemberHistory table, introduced new ↵Jonathan Fritz2018-02-126-32/+45
| | | | | | | | | | | | | | | | | | | | model.ChannelMemberHistoryResult object that includes those fields that are selected from a join on other tables
| * | | | Merge branch 'translations-20180212' into release-4.7Derrick Anderson2018-02-1414-244/+192
| |\ \ \ \
| | * | | | translations PR 20180212Elias Nahum2018-02-1214-244/+192
| | | | | |
| * | | | | Merge branch 'ICU-764' into release-4.7Derrick Anderson2018-02-142-45/+81
| |\ \ \ \ \
| | * | | | | gofmtStephen Kiers2018-02-131-2/+0
| | | | | | |
| | * | | | | rerun jenkins?Stephen Kiers2018-02-131-0/+1
| | | | | | |
| | * | | | | remove debug statementStephen Kiers2018-02-131-2/+0
| | | | | | |
| | * | | | | Added more tests and simplified codeStephen Kiers2018-02-132-48/+57
| | | | | | |
| | * | | | | Added another testStephen Kiers2018-02-121-0/+9
| | | | | | |
| | * | | | | Fixes ICU-764Stephen Kiers2018-02-122-0/+21
| | |/ / / /
| * | | | | Merge branch 'jespino-XYZ-111' into release-4.7Derrick Anderson2018-02-143-3/+102
| |\ \ \ \ \
| | * | | | | Merge branch 'XYZ-111' of https://github.com/jespino/platform into ↵Derrick Anderson2018-02-143-3/+102
| |/| | | | | | | | | | | | | | | | | | | | | | | | | | jespino-XYZ-111
| | * | | | | XYZ-111: Check max users per team on re-join after leave a teamJesús Espino2018-02-133-3/+102
| | |/ / / /
| * | | / / ping jenkinsDerrick Anderson2018-02-140-0/+0
| | |_|/ / | |/| | |
| | | | * ICU-753 Added unit tests for messages with only push notificationsHarrison Healey2018-02-133-3/+27
| | | | |
| | | | * ICU-753 Added unit tests for push notification contentsHarrison Healey2018-02-132-39/+262
| | | | |
| | | | * ICU-753 Remove special behaviour for group messages in generic push ↵Harrison Healey2018-02-131-2/+2
| | |_|/ | |/| | | | | | | | | | notifications
* | | | 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.