delta/gitlab/gitlab-ce.git/lib, branch dz-internal-api-fullpath

Refactor storage path extraction from full repo path

2016-10-28T12:55:55+00:00

Signed-off-by: Dmitriy Zaporozhets

Make internal api work with full repo path instead of name

2016-10-27T13:54:48+00:00

Signed-off-by: Dmitriy Zaporozhets

Merge branch '5613-backups-fail' into 'master'

2016-10-27T11:59:22+00:00


Backups fail occasionally with "tar: ./objects: file changed as we read it" error

- [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 [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)

Closes #5613

See merge request !5814

Backups do not fail anymore when using tar on annex and custom_hooks

2016-10-27T10:24:35+00:00

only.

Merge branch 'eslint' into 'master'

2016-10-26T16:31:08+00:00


Add ESLint

## What does this MR do?

- create `package.json`
- add ESLint dependencies to `package.json`
- add JavaScript linting to CI
- add Rake task `lint:javascript`as alias for `eslint` (which itself is an alias for `npm run eslint`)

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

Probably not.

## Why was this MR needed?

My hovercraft was full of eels.

## What are the relevant issue numbers?

- https://gitlab.com/gitlab-org/gitlab-ce/issues/13224#note_12537431
- https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5006#note_13255658


See merge request !5445

Fixes various errors when adding deploy keys caused by not exiting the control flow.

2016-10-26T10:54:47+00:00

When adding a deploy key that already exists in the project the existing key would not be returned, resulting in an attempt to create a new one, which in turn caused a 500 error due to an ActiveRecord exception.

When adding a deploy key that exists within another project the key would be joined to the project, but would also attempt to create a new one, which resulted in a 400 error due to the key already existing.

Fixes #22741
Fixes #21754

Signed-off-by: Rémy Coutable

Merge branch 'grapify-tags' into 'master'

2016-10-26T10:27:30+00:00


Grapify tags API

## What does this MR do?

Add the Grape-DSL to the tags API.

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

The delete endpoint only has a description but no success entity because we don't have one. We only return the branch name as JSON. Should I do something else?

## What are the relevant issue numbers?

Related to #22928

See merge request !6860

Grapify tags API

2016-10-26T08:34:16+00:00

add Rake tasks eslint and lint:javascript

2016-10-26T08:00:55+00:00

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

2016-10-25T16:28:10+00:00


Fix events order in users/:id/events endpoint

## What does this MR do?

Order of events in contributions API is currently being lost, though docs are saying:

> Get the contribution events for the specified user, sorted **from newest to oldest**.

Order becomes different after `.merge(ProjectsFinder.new.execute(current_user))` call, so I moved ordering below this line.

This MR also removes extra `.page(params[:page])` call in the method chain, since [`paginate(events)` already does it](https://gitlab.com/airat/gitlab-ce/blob/master/lib/api/helpers.rb#L112).

See merge request !7039