delta/gitlab/gitlab-ce.git/lib, branch replace-jquery-cookie-plugin

Merge branch 'grapify-labels-api' into 'master'

2016-10-24T16:59:13+00:00


Grapify the labels API

Add the Grape-DSL to the labels API. Since the input validation messages are checked, two tests are modified slightly.

## What are the relevant issue numbers?

Related to #22928

See merge request !7070

Merge branch 'grapify-builds-api' into 'master'

2016-10-24T15:11:15+00:00


Grapify builds API

## What does this MR do?

Add the Grape-DSL to the builds API.

## What are the relevant issue numbers?

Related to #22928 

The artifacts API directly downloads a file rather then returning a JSON entity.

See merge request !6877

Grapify the labels API

2016-10-24T14:52:34+00:00

Added path parameter to Commits API

2016-10-24T14:43:52+00:00

Signed-off-by: Rémy Coutable

Merge branch '21513-fix-branch-protection-api' into 'master'

2016-10-24T12:55:02+00:00


Fix branch protection API.

## What does this MR do?

- Fixes the branch protection API.
- Closes #21513 
- EE Merge Request: gitlab-org/gitlab-ee!718

## Tasks

- [ ]  #21513 !6215 Protected branches API bug
    - [x]  Investigate
    - [x]  Test + Fix
    - [x]  Changelog
    - [x]  MR
    - [x]  Wait for build to pass
    - [x]  Review
    - [x]  Check for EE conflicts
    - [x]  Create EE MR
    - [x]  Refactor + Fix
    - [x]  Rebase EE MR against EE master
    - [x]  Wait for builds to pass
    - [x]  Assign to dbalexandre/douwe
    - [x]  Implement latest review comments
    - [x]  Wait for Douwe's review
        - [x]  Implement changes
        - [x]  Port changes to EE MR
        - [x]  Assign both back to Douwe
    - [ ]  Wait for merge
    - [ ]  Merge gitlab-org/gitlab-ee!718

See merge request !6215

Grapify builds API

2016-10-24T11:06:17+00:00

Add relative url support to routing contrainers

2016-10-24T10:51:17+00:00

Signed-off-by: Dmitriy Zaporozhets

Implement second round of review comments from @DouweM.

2016-10-24T06:03:38+00:00

- Pass `developers_and_merge` and `developers_can_push` in `params`
  instead of using keyword arguments.

- Refactor a slightly complex boolean check to a simple `nil?` check.

Implement review comments from @DouweM.

2016-10-24T06:03:38+00:00

Fix branch protection API.

2016-10-24T06:03:38+00:00

1. Previously, we were not removing existing access levels before
   creating new ones. This is not a problem for EE, but _is_ for CE,
   since we restrict the number of access levels in CE to 1.

2. The correct approach is:

    CE -> delete all access levels before updating a protected branch
    EE -> delete developer access levels if "developers_can_{merge,push}" is switched off

3. The dispatch is performed by checking if a "length: 1" validation is
   present on the access levels or not.

4. Another source of problems was that we didn't put multiple queries in
   a transaction. If the `destroy_all` passes, but the `update` fails,
   we should have a rollback.

5. Modifying the API to provide users direct access to CRUD access
   levels will make things a lot simpler.

6. Create `create/update` services separately for this API, which
   perform the necessary data translation, before calling the regular
   `create/update` services. The translation code was getting too large
   for the API endpoint itself, so this move makes sense.