Dmitriy Zaporozhets 0c62170865 Merge branch 'api-mr-merge' into 'master' ...

Accept merge request API

This MR adds new endpoint `PUT /projects/:id/merge_request/:merge_request_id/merge`. After this change you can merge branches using API.

Fixes internal issue #1166

2014-05-13 11:27:19 +00:00

..

api.rb

Move branches api to separate class

2014-03-31 16:31:53 +03:00

branches.rb

Add fix for API when branch names have periods in them. Relates to issue #6128 (https://github.com/gitlabhq/gitlabhq/issues/6128).

2014-05-08 07:06:47 -04:00

commits.rb

Move branches api to separate class

2014-03-31 16:31:53 +03:00

deploy_keys.rb

Remove deprecated finders

2014-01-19 23:39:56 +04:00

entities.rb

Expose archive status of projects in API

2014-04-18 17:55:06 +02:00

files.rb

Complete api files CRUD

2014-02-18 12:27:02 +02:00

groups.rb

Remove deprecated finders

2014-01-19 23:39:56 +04:00

helpers.rb

Create branch via API

2014-04-01 10:39:53 +03:00

internal.rb

first setup to protect protected branched to force updates

2014-03-25 22:33:14 +01:00

issues.rb

Move update issue code to separate service

2014-04-02 13:54:41 +03:00

merge_requests.rb

Add some tests for merge API

2014-05-13 11:01:40 +03:00

milestones.rb

Fixing unsafe use of Thread.current variable :current_user

2013-10-16 01:20:53 -04:00

namespaces.rb

fix most of warnings

2013-12-15 00:05:10 +04:00

notes.rb

Fixing unsafe use of Thread.current variable :current_user

2013-10-16 01:20:53 -04:00

project_hooks.rb

Move project members api to separate file

2014-03-17 13:44:54 +02:00

project_members.rb

Move project members api to separate file

2014-03-17 13:44:54 +02:00

project_snippets.rb

Dropped expiration date from the snippet API

2014-01-11 18:40:17 +01:00

projects.rb

changed doc comment for get labels of a project

2014-03-23 19:07:18 -03:00

repositories.rb

Move branches api to separate class

2014-03-31 16:31:53 +03:00

services.rb

gitlab-ci service api: clean values instead of destroy

2013-10-29 18:13:51 +02:00

session.rb

Add LDAP support to /api/session

2013-07-16 11:28:19 +03:00

system_hooks.rb

Refactor API classes. So api classes like Gitlab::Issues become API::Issues

2013-05-14 15:33:31 +03:00

users.rb

Implement GET /users/:uid/keys for admin users

2014-04-18 14:16:19 +02:00