delta/gitlab/gitlab-ce.git/lib/api, branch koding-setting-api gitlab.com: gitlab-org/gitlab-ce.git Expose the Koding application settings in the API 2016-09-29T16:12:52+00:00 DJ Mountney david@twkie.net 2016-09-28T00:56:02+00:00 59157c0423d34c1f20c446548df540d103bda939 This will allow the Koding app to enable the integration itself once is has authorized an admin user using the application secrets. 
This will allow the Koding app to enable the integration itself once is has authorized an admin user using the application secrets.
Merge branch 'issue_22382' into 'master' 2016-09-29T13:04:16+00:00 Rémy Coutable remy@rymai.me 2016-09-29T13:04:16+00:00 f6a1a21f6f808738b3caccca1b1233303649f898 Expose project share expiration_date field on API closes #22382 See merge request !6484 

Expose project share expiration_date field on API

closes #22382

See merge request !6484
 Merge branch '22367-add-pipeline-id-build' into 'master' 2016-09-29T08:46:48+00:00 Rémy Coutable remy@rymai.me 2016-09-29T08:46:48+00:00 dbfcccaf7754d4501dc253b4409fc9f026248e67 Expose pipeline data in builds API Exposes pipeline data in builds API, as suggested by #22367. The fields exposed were 'id', 'status', 'ref', and 'sha'. Closes #22367 See merge request !6502 

Expose pipeline data in builds API

Exposes pipeline data in builds API, as suggested by #22367.
The fields exposed were 'id', 'status', 'ref', and 'sha'.

Closes #22367

See merge request !6502
 expose pipeline data in builds API 2016-09-29T02:58:16+00:00 Guilherme Salazar gmesalazar@gmail.com 2016-09-23T23:43:57+00:00 e80e4cb8b97a3865b7e3c551a856a53d98cccf75 add pipeline ref, sha, and status to the build API response add tests of build API (pipeline data) change API documentation for builds API log change to builds API in CHANGELOG CHANGELOG: add reference to pull request and contributor's name 
add pipeline ref, sha, and status to the build API response

add tests of build API (pipeline data)

change API documentation for builds API

log change to builds API in CHANGELOG

CHANGELOG: add reference to pull request and contributor's name
Handle LFS token creation and retrieval in the same method, and in the same Redis connection. 2016-09-28T17:13:48+00:00 Patricio Cano suprnova32@gmail.com 2016-09-28T16:02:31+00:00 2772109ac15bed2bd199294f8d770f49a749b4bd Reset expiry time of token, if token is retrieved again before it expires. 
Reset expiry time of token, if token is retrieved again before it expires.
Expose project share expiration_date field on API 2016-09-28T13:12:49+00:00 Felipe Artur felipefac@gmail.com 2016-09-22T20:31:18+00:00 93d849beaebb00dc4dcb6cb5ffa4721883e0da51 






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

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

Dmitriy Zaporozhets
dmitriy.zaporozhets@gmail.com

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

b0af83f9ff78773dbcd5435841bdac514d6e242f


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





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

Douwe Maan
douwe@gitlab.com

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

166c6cd85c2be13bb2fa5d27f40d304ffd9c62ad


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





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

Dmitriy Zaporozhets
dmitriy.zaporozhets@gmail.com

2016-09-26T17:33:00+00:00

d0b556eb1b9d4bcdfa2eeb21a99d9675eca64f25

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>





Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>







Keep API mounts in alphabetical order
2016-09-25T08:28:23+00:00

Achilleas Pipinellis
axilleas@axilleas.me

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

71507745306cfb1ec9734e010ee1d24373aea77e