Dmitriy Zaporozhets 3bd66989de Merge branch 'master' into ee-master ...

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Conflicts:
	Gemfile
	Gemfile.lock
	VERSION
	app/models/project.rb
	app/models/user.rb
	db/schema.rb
	doc/install/installation.md
	doc/update/6.x-or-7.x-to-7.5.md
	doc/update/7.4-to-7.5.md
	lib/gitlab/git_access.rb
	spec/factories.rb
	spec/lib/gitlab/git_access_spec.rb

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

..

api_helpers_spec.rb

Make user access test pass for the right reason

2014-05-15 10:30:50 +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

files_spec.rb

Fix api files specs

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

fork_spec.rb

API: Initial support for forking a project via the API

2014-10-01 10:27:48 +02: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 branch '7-4-stable-ee' into 7-4-stable_non_conflict

2014-10-29 16:13:36 +02: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

Remove rails observers from application

2014-06-17 22:51:43 +03: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

Replace project_access attribute with access_level in specs and API

2014-09-15 11:36:50 +03:00

projects_spec.rb

Merge CE master into EE master

2014-11-13 17:05:12 +02: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

Supporting for multiple omniauth provider for the same user

2014-12-04 13:03:55 +02:00