Dmitriy Zaporozhets 3a9682a3d7 Merge dev.gitlab.org:gitlab/gitlabhq into upstream-ce ...

Conflicts:
	VERSION
	app/helpers/selects_helper.rb
	app/models/project.rb
	app/views/devise/sessions/new.html.haml
	app/views/groups/_settings_nav.html.haml
	app/views/layouts/nav/_admin.html.haml
	app/views/profiles/keys/_key.html.haml
	app/views/profiles/keys/index.html.haml
	app/views/profiles/keys/show.html.haml
	app/views/projects/merge_requests/show/_mr_accept.html.haml
	config/routes.rb
	db/schema.rb
	doc/api/projects.md
	features/steps/shared/paths.rb

2015-01-08 20:37:35 -08:00

..

api_guard.rb

Doorkeeper integration

2014-12-24 15:38:07 +02:00

api.rb

Merge branch 'master' into ee-from-ce

2014-12-26 15:05:43 +02:00

branches.rb

Update branch api not found messages to 'Branch not found'.

2014-12-30 13:37:14 +01:00

commits.rb

Add a message when unable to save an object through api.

2015-01-07 10:46:00 +01:00

deploy_keys.rb

Fix failing tests due to updates on the return messages.

2015-01-07 11:39:20 +01:00

entities.rb

Merge branch 'master' into ee-master

2014-12-05 13:28:32 +02:00

files.rb

Message for api files and groups.

2014-12-30 14:29:55 +01:00

group_members.rb

Dont allow guests..developers to manage group members

2014-10-29 16:00:55 +02:00

groups.rb

Merge dev.gitlab.org:gitlab/gitlabhq into upstream-ce

2015-01-08 20:37:35 -08:00

helpers.rb

Update branch api not found messages to 'Branch not found'.

2014-12-30 13:37:14 +01:00

internal.rb

Fix internal API for missing project or key

2014-12-01 16:55:33 +02:00

issues.rb

Fix failing tests due to updates on the return messages.

2015-01-07 11:39:20 +01:00

labels.rb

Fix failing tests due to updates on the return messages.

2015-01-07 11:39:20 +01:00

ldap.rb

Remove duplicated comment

2014-10-15 22:42:51 +02:00

merge_requests.rb

Fix failing tests due to updates on the return messages.

2015-01-07 11:39:20 +01:00

milestones.rb

Add a message when unable to save an object through api.

2015-01-07 10:46:00 +01:00

namespaces.rb

fix most of warnings

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

notes.rb

Add a message when unable to save an object through api.

2015-01-07 10:46:00 +01:00

project_git_hook.rb

Name the class singular, fix the failing spec.

2014-11-03 14:48:57 +01:00

project_hooks.rb

Forward the messages in api response.

2014-12-30 15:17:46 +01:00

project_members.rb

Merge dev.gitlab.org:gitlab/gitlabhq into upstream-ce

2015-01-08 20:37:35 -08:00

project_snippets.rb

Improve error reporting on users API

2014-09-16 01:25:24 +02:00

projects.rb

Merge dev.gitlab.org:gitlab/gitlabhq into upstream-ce

2015-01-08 20:37:35 -08:00

repositories.rb

Forward the messages in api response.

2014-12-30 15:17:46 +01:00

services.rb

Add Hipchat services API

2014-10-14 19:07:34 +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

Merge branch 'master' into ee-master

2014-12-05 13:28:32 +02:00