delta/gitlab/gitlab-ce.git/lib/api, branch lfs-ssh-authorization-fix

Handle LFS token creation and retrieval in the same method, and in the same Redis connection.

2016-09-28T17:13:48+00:00

Reset expiry time of token, if token is retrieved again before it expires.

Merge branch 'dz-profile-organization' into 'master'

2016-09-27T12:42:42+00:00


Add organization field to the user profile

## What does this MR do?

Add organization field to the user profile 

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

no

## Why was this MR needed?

So we can let users fill organization information separately

## Screenshots (if relevant)

![Screen_Shot_2016-09-26_at_7.32.27_PM](/uploads/d11a9a86aa22227f9c9915d195106c5f/Screen_Shot_2016-09-26_at_7.32.27_PM.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)~~
- [x] API support added
- Tests
  - [x] Added for this feature/bug
  - [x] All builds are passing
- [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [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)

## What are the relevant issue numbers?

https://gitlab.com/gitlab-org/gitlab-ce/issues/21903

See merge request !6526

Merge branch 'rc-new-members-approve-request-access-service' into 'master'

2016-09-27T12:10:12+00:00


New `Members::ApproveAccessRequestService`

Part of #21979.

## Does this MR meet the acceptance criteria?

- [x] API support added
- Tests
  - [x] Added for this feature/bug
  - [x] 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)
- [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 !6266

Add User#organization to users api

2016-09-27T11:04:39+00:00

Signed-off-by: Dmitriy Zaporozhets

Keep API mounts in alphabetical order

2016-09-25T08:28:23+00:00

New Members::ApproveAccessRequestService

2016-09-22T13:50:47+00:00

Signed-off-by: Rémy Coutable

API: Return 404 when trying to fork to unaccessible namespace

2016-09-22T10:15:45+00:00

Signed-off-by: Rémy Coutable

Merge branch 'and-you-get-awards' into 'master'

2016-09-21T15:22:28+00:00


And Snippets get awards

## What does this MR do?

Makes snippets more awesome, by making them awardables

## Why was this MR needed?

Because Snippets were left behind.

## What are the relevant issue numbers?

Closes #17878

See merge request !4456

Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce

2016-09-21T09:22:02+00:00

Merge branch 'add_optional_author_for_commits' into 'master'

2016-09-20T15:30:00+00:00


Add optional 'author' param when making commits

This fulfills https://gitlab.com/gitlab-org/gitlab-ce/issues/20789 by adding the ability to specify a user's ID to be used as the author of a commit.

Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/20789

See merge request !5822