delta/gitlab/gitlab-ce.git/doc, branch patch-6

Fix generic file extension reference in Frontend docs.

2016-10-13T09:47:41+00:00

Merge branch 'es6-es5-poltergeist' into 'master'

2016-10-12T21:44:07+00:00


Document Capybara errors from es6 in es5 file.

## What does this MR do?

Documents an error that I've banged my head against twice now. 

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

## Why was this MR needed?

The greater good. 

## Screenshots (if relevant)

## 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
- [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [ ] Branch has no merge conflicts with `master` (if it does - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

## What are the relevant issue numbers?

See merge request !6836

Merge branch 'mrchrisw/fix-debug-token' into 'master'

2016-10-12T20:44:43+00:00


Fix step number and token param in URL example. Fix gitlab-rails command code formatting.



See merge request !6791

Merge branch 'api-version' into 'master'

2016-10-12T18:38:02+00:00


API: Version information

## What does this MR do?

Adds a new endpoint to retrieve the version information.

## Why was this MR needed?

Clients can now use this information to enable/disable certain API features depending on the version.  

## What are the relevant issue numbers?

Closes #22608, https://gitlab.com/gitlab-org/gitlab-ce/issues/23148

See merge request !6822

Document Capybara errors from es6 in es5 file.

2016-10-12T17:00:38+00:00

Merge branch '17541-move-licenses-api-endpoint-to-templates-licenses' into 'master'

2016-10-12T15:03:21+00:00


Resolve "Move `/licenses` api endpoint to `/templates/licenses`"

## What does this MR do?

It moves the `/licenses`, `/gitignores` and `/gitlab_ci_ymls` API endpoints under the `/templates` namespace

## Why was this MR needed?

In EE we now have somewhat ambiguous API endpoints. `/license` refers to the EE license while `/licenses` (plural) refers to license templates. @DouweM mentioned that we're adding .gitignore templates in #14106 so it may make sense to add a /templates namespace. Then, move the /license templates endpoint to be underneath, along with .gitignore endpoints. 

Closes #17541

See merge request !5717

API: Version information

2016-10-12T14:47:35+00:00

Added documentation chapter for Git attributes

2016-10-12T13:46:34+00:00

As discussed in https://gitlab.com/gitlab-org/gitlab_git/issues/28 we'll
need to clearly document the need for .gitattributes files being encoded
using UTF-8.

[ci skip]

Merge branch 'user-events-api' into 'master'

2016-10-12T11:33:19+00:00


API: New /users/:id/events endpoint

## What does this MR do?

If add a new `/users/:id/events` endpoint to retrieve a user's contribution events. The events returned are filtered so that only the events for projects that the current user can see are returned (similarly to what we do at the controller level).

## Why was this MR needed?

Because it's a nice feature to calculate leaderboards, for instance for #17815.

## What are the relevant issue numbers?

Closes #20866.

See merge request !6771

Create a new /templates API namespace

2016-10-12T09:09:41+00:00

The /licenses, /gitignores and /gitlab_ci_ymls endpoints are now also
available under a new /templates namespace. Old endpoints will be
deprecated when GitLab 9.0.0 is released.