delta/gitlab/gitlab-ce.git/doc, branch diff-options

Add allow_failure CI documentation

2016-07-21T12:37:32+00:00

Merge branch 'doc-award-emoji' into 'master'

2016-07-21T09:15:00+00:00


Update doc for award emoji API

## What does this MR do?

It fixes some docs for the award emoji API.

## Are there points in the code the reviewer needs to double check?

@zj I'm assigning you since you wrote this docs.

## Does this MR meet the acceptance criteria?

~~- [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added~~
- [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)

~~- [ ] API support added~~

~~- Tests~~

~~- [ ] Added for this feature/bug~~

  - [ ] All builds are passing
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

See merge request !5386

Update doc for award emoji API

2016-07-21T08:00:17+00:00

Update gitlab-workhorse version to 0.7.8 in installation and update guides

2016-07-21T07:50:53+00:00

Signed-off-by: Rémy Coutable

Merge branch 'manual-action-grammar' into 'master'

2016-07-21T07:49:32+00:00


Improve grammar of manual actions documentation

## What does this MR do?

Improve grammar of manual actions documentation

## Are there points in the code the reviewer needs to double check?

## Why was this MR needed?

Because people like good grammar.

## What are the relevant issue numbers?

## Screenshots (if relevant)


See merge request !5382

Merge branch '4142-show-inline-video' into 'master'

2016-07-21T07:29:38+00:00


Add support for inline videos in issue, MR and notes (on issue, commit, MR, and MR diff)

## What does this MR do?

It adds support for inline videos in issue, MR and notes (on issue, commit, MR, and MR diff). Most of the work was done by @hayesr in !3508 but a few improvements were still missing.

## Why was this MR needed?

To be able to play uploaded videos in GitLab!

## What are the relevant issue numbers?

Closes #4142.

## Screenshots

### Video players

![Screen_Shot_2016-07-19_at_18.44.09](/uploads/e85e531b455a41c3e66b26b356abaafd/Screen_Shot_2016-07-19_at_18.44.09.png)

-----

![Screen_Shot_2016-07-19_at_18.44.29](/uploads/05f52a812760210d1eae86a7f8fc48bc/Screen_Shot_2016-07-19_at_18.44.29.png)

-----

## Does this MR meet the acceptance criteria?

- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- Tests
  - [x] Test `VideoLinkFilter`
  - [x] Test in `spec/features/markdown_spec.rb`
  - [x] Improve `spec/uploaders/file_uploader_spec.rb`
  - [x] All builds are passing
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

See merge request !5215

Don't allow `.ogg` as a valid video extension

2016-07-21T06:56:57+00:00

`.ogg` is for music files.

Signed-off-by: Rémy Coutable

Mention manual actions section in when clause docs

2016-07-21T06:35:44+00:00

Improve grammar of manual actions documentation

2016-07-21T06:35:44+00:00

Merge branch 'registry-manifest' into 'master'

2016-07-21T06:06:55+00:00


Document when Docker Registry manifest v1 support was added

## What does this MR do?

Document when Docker Registery manifest v1 support was added

## Are there points in the code the reviewer needs to double check?

Is this the best way to document this? We never documented support for v2 or which docker versions we support overall.

## Why was this MR needed?

We made a change and it wasn't documented. Also, it's good to document which docker versions we support.

## What are the relevant issue numbers?

!4669

## Screenshots (if relevant)


See merge request !5378