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_helpers_spec.rb

Doorkeeper integration

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

branches_spec.rb

API delete branch: render branch name json instead of true

2014-10-30 17:28:59 +02:00

commits_spec.rb

Adds comments to commits in the API

2014-09-26 10:58:11 +02:00

doorkeeper_access_spec.rb

Doorkeeper integration

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

files_spec.rb

Fix api files specs

2014-08-06 09:57:15 +03:00

fork_spec.rb

Fix api tests.

2014-12-30 15:40:11 +01:00

group_members_spec.rb

Dont allow guests..developers to manage group members

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

groups_spec.rb

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

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

internal_spec.rb

Fix internal API for missing project or key

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

issues_spec.rb

Filters issues by milestone via API

2014-09-26 22:03:37 +02:00

labels_spec.rb

Improve error reporting on users API

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

ldap_spec.rb

Remove pending status from test

2014-10-15 14:25:06 +02:00

merge_requests_spec.rb

Merge branch 'api/improve-error-reporting' of https://github.com/jubianchi/gitlabhq into jubianchi-api/improve-error-reporting

2014-09-23 21:35:45 +03:00

milestones_spec.rb

Remove rails observers from application

2014-06-17 22:51:43 +03:00

namespaces_spec.rb

Fix failing api specs.

2014-10-06 10:19:11 +02:00

notes_spec.rb

Implemented notes (body) patching in API.

2014-12-25 14:28:40 +02:00

project_git_hook_spec.rb

Create project git hook spec.

2014-11-03 14:45:24 +01:00

project_hooks_spec.rb

Remove rails observers from application

2014-06-17 22:51:43 +03:00

project_members_spec.rb

Do not allow adding users via api if member lock is enabled.

2014-12-15 13:25:31 +01:00

projects_spec.rb

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

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

repositories_spec.rb

Factor using Repository#path_to_repo

2014-11-05 17:51:49 +01:00

services_spec.rb

Add Hipchat services API

2014-10-14 19:07:34 +02:00

session_spec.rb

Session API: Use case-insensitive authentication like in UI

2014-10-30 18:29:18 +02:00

system_hooks_spec.rb

Added API testing group

2014-04-11 21:45:56 +02:00

users_spec.rb

Fix feature and tests

2015-01-08 13:21:00 -08:00