diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/developer/tests/test-attachments.md | 27 | ||||
| -rw-r--r-- | doc/developer/tests/test-markdown-basics.md | 14 | ||||
| -rw-r--r-- | doc/install/Upgrade-Guide.md | 2 |
3 files changed, 27 insertions, 16 deletions
diff --git a/doc/developer/tests/test-attachments.md b/doc/developer/tests/test-attachments.md index 71cc496ce..e2fda0eb6 100644 --- a/doc/developer/tests/test-attachments.md +++ b/doc/developer/tests/test-attachments.md @@ -29,7 +29,7 @@ Expected: Scaled thumbnail & preview window **GIF** `Images/GIF.gif` -Expected: Scaled thumbnail & preview window. Click to play GIF. +Expected: Scaled thumbnail & preview window. GIF should auto-play in the preview window. [Permalink](https://pre-release.mattermost.com/core/pl/j49fowdkstr57g3ed9bgpfoo5w) **TIFF** @@ -72,37 +72,37 @@ Expected: Generic Word thumbnail & preview window. **MP4** `Videos/MP4.mp4` -Expected: Generic video thumbnail & playable preview window +Expected: Generic video thumbnail & playable preview window. View Permalink. [Permalink](https://pre-release.mattermost.com/core/pl/5dx5qx9t9brqfnhohccxjynx7c) **AVI** `Videos/AVI.avi` -Expected: View Permalink. Expected depends on the operating system, browser and plugins. +Expected: Generic video thumbnail, view Permalink for preview window behavior. Expected depends on the operating system, browser and plugins. [Permalink](https://pre-release.mattermost.com/core/pl/qwn9eiy7j3rkjyruxhcugpogdw) **MKV** `Videos/MKV.mkv` -Expected: View Permalink. Expected depends on the operating system, browser and plugins. +Expected: Generic video thumbnail, view Permalink for preview window behavior. Expected depends on the operating system, browser and plugins. [Permalink](https://pre-release.mattermost.com/core/pl/tszyjkr1cidhxjgiusa4mde3ja) **MOV** `Videos/MOV.mov` -Expected: View Permalink. Expected depends on the operating system, browser and plugins. +Expected: Generic video thumbnail, view Permalink for preview window behavior. Expected depends on the operating system, browser and plugins. [Permalink](https://pre-release.mattermost.com/core/pl/ienzppz5i3f7tbt5jiujn8uuir) **MPG** `Videos/MPG.mpg` -Expected: View Permalink. Expected depends on the operating system, browser and plugins. +Expected: Generic video thumbnail, view Permalink for preview window behavior. Expected depends on the operating system, browser and plugins. [Permalink](https://pre-release.mattermost.com/core/pl/skggdq1hfpritc6c88bi481p5a) **Webm** `Videos/WEBM.webm` -Expected: View Permalink. Expected depends on the operating system, browser and plugins. +Expected: Generic video thumbnail, view Permalink for preview window behavior. Expected depends on the operating system, browser and plugins. [Permalink](https://pre-release.mattermost.com/core/pl/7h8tysuxgfgsxeht3sbn7e4h6y) **WMV** `Videos/WMV.wmv` -Expected: View Permalink. Expected depends on the operating system, browser and plugins. +Expected: Generic video thumbnail, view Permalink for preview window behavior. Expected depends on the operating system, browser and plugins. [Permalink](https://pre-release.mattermost.com/core/pl/kaom7j7uyjra7bzhrre6qwdrbw) ### Audio @@ -112,7 +112,6 @@ Expected: View Permalink. Expected depends on the operating system, browser and Expected: Generic audio thumbnail & playable preview window [Permalink](https://pre-release.mattermost.com/core/pl/if4gn8dbrjgx8fmqmkukzefyme) - **M4A** `Audio/M4a.m4a` Expected: Generic audio thumbnail & playable preview window @@ -120,25 +119,25 @@ Expected: Generic audio thumbnail & playable preview window **AAC** `Audio/AAC.aac` -Expected: View Permalink. Expected depends on the operating system, browser and plugins. +Expected: Generic audio thumbnail, view Permalink for preview window behavior. Expected depends on the operating system, browser and plugins. [Permalink](https://pre-release.mattermost.com/core/pl/3naoy5pr5tydbk1m6yo1ast9ny) **FLAC** `Audio/FLAC.flac` -Expected: View Permalink. Expected depends on the operating system, browser and plugins. +Expected: Generic audio thumbnail, view Permalink for preview window behavior. Expected depends on the operating system, browser and plugins. [Permalink](https://pre-release.mattermost.com/core/pl/kf4cmy44dfya5efmse7rg43eih) **OGG** `Audio/OGG.ogg` -Expected: View Permalink. Expected depends on the operating system, browser and plugins. +Expected: Generic audio thumbnail, view Permalink for preview window behavior. Expected depends on the operating system, browser and plugins. [Permalink](https://pre-release.mattermost.com/core/pl/dezrcpbxapyexe77rjuzkrp63r) **WAV** `Audio/WAV.wav` -Expected: View Permalink. Expected depends on the operating system, browser and plugins. +Expected: Generic audio thumbnail, view Permalink for preview window behavior. Expected depends on the operating system, browser and plugins. [Permalink](https://pre-release.mattermost.com/core/pl/pdkxx1udepdnbmi9j8kyas5xbh) **WMA** `Audio/WMA.wma` -Expected: View Permalink. Expected depends on the operating system, browser and plugins. +Expected: Generic audio thumbnail, view Permalink for preview window behavior. Expected depends on the operating system, browser and plugins. [Permalink](https://pre-release.mattermost.com/core/pl/756wrmdd57dcig3m4emypp6i1h) diff --git a/doc/developer/tests/test-markdown-basics.md b/doc/developer/tests/test-markdown-basics.md index 7a46adeb0..cea9a0867 100644 --- a/doc/developer/tests/test-markdown-basics.md +++ b/doc/developer/tests/test-markdown-basics.md @@ -18,6 +18,18 @@ Normal Text_ _Normal Text _Normal Text* +### Carriage Return + +**The following text should render as:** +Line #1 followed by Line #2 +Line #2 followed by one blank line + +Line #3 followed by one blank line + + +Line #4 following one blank line + + ### Code Blocks ``` @@ -119,7 +131,7 @@ Text below line **The following markdown should render within the block quote:** > #### Heading 4 -> _Italics_, *Italics*, **Bold**, ***Bold-italics***, **Bold-italics_**, ~~Strikethrough~~ +> _Italics_, *Italics*, **Bold**, ***Bold-italics***, **_Bold-italics_**, ~~Strikethrough~~ > :) :-) ;) :-O :bamboo: :gift_heart: :dolls: **The following text should render in two block quotes separated by one line of text:** diff --git a/doc/install/Upgrade-Guide.md b/doc/install/Upgrade-Guide.md index 4480dedd2..1f3ff9510 100644 --- a/doc/install/Upgrade-Guide.md +++ b/doc/install/Upgrade-Guide.md @@ -43,7 +43,7 @@ The following instructions apply to updating installations of Mattermost v0.7-Be Mattermost is designed to be upgraded sequentially through major version releases. If you skip versions when upgrading GitLab, you may find a `panic: The database schema version of 1.1.0 cannot be upgraded. You must not skip a version` error in your `/var/log/gitlab/mattermost/current` directory. If so: 1. Run `platform -version` to check your version of Mattermost -2. If your version of the Mattermost binary doesn't match the version listed in the database error message, downgrade the version of the Mattermost binary you are using by [following the manual upgrade steps for Mattermost](/var/log/gitlab/mattermost/current) and using the database schema version listed in the error messages for the version you select in Step 1) iv). +2. If your version of the Mattermost binary doesn't match the version listed in the database error message, downgrade the version of the Mattermost binary you are using by [following the manual upgrade steps for Mattermost](https://github.com/mattermost/platform/blob/master/doc/install/Upgrade-Guide.md#upgrading-mattermost-to-next-major-release) and using the database schema version listed in the error messages for the version you select in Step 1) iv). 3. Once Mattermost is working again, you can use the same upgrade procedure to upgrade Mattermost version by version to your current GitLab version. After this is done, GitLab automation should continue to work for future upgrades, so long as you don't skip versions. | GitLab Version | Mattermost Version | |