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

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

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

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.

Addresses Robert's feedback

2016-10-11T15:25:57+00:00

Signed-off-by: Rémy Coutable

Merge branch 'dz-cleanup-routing' into 'master'

2016-10-11T06:58:05+00:00


Remove NamespacesController

* removes unnecessary NamespacesController. The main purpose of this controller was redirect to group or user page when URL like https://gitlab.com/gitlab-org was used. Now this functionality is handled by constrainers (like this https://gitlab.com/gitlab-org/gitlab-ce/blob/master/config/routes/user.rb#L17-21) and take user to correct controller right from the start.
* serve non existing API routes like `/api/v3/whatever` with Grape instead of Rails. Before this change wrong API url was served by rails with not obvious 404, 405 & 500 errors


See merge request !6733

Clarify which token should be used to delete a runner

2016-10-10T14:03:26+00:00

Better wording in API readme

2016-10-10T13:32:32+00:00

Signed-off-by: Dmitriy Zaporozhets

Replace undefined Grape routing code from 400 to 404

2016-10-10T13:32:32+00:00

Signed-off-by: Dmitriy Zaporozhets