Dmitriy Zaporozhets f4d43ed3b1 Merge branch 'master' into ce-upstream ...

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

Conflicts:
	app/controllers/projects/services_controller.rb
	app/models/concerns/mentionable.rb
	app/models/project.rb
	app/models/user.rb
	app/views/admin/users/index.html.haml
	app/views/projects/services/_form.html.haml
	config/gitlab.yml.example
	config/initializers/1_settings.rb
	lib/gitlab/git_access.rb
	lib/gitlab/ldap/access.rb
	lib/gitlab/ldap/person.rb
	lib/gitlab/reference_extractor.rb
	spec/lib/gitlab/ldap/access_spec.rb

2014-10-14 18:23:51 +03: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

Fix branch API

2014-09-25 16:22:08 +03:00

commits_spec.rb

Replace project_access attribute with access_level in specs and API

2014-09-15 11:36:50 +03: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

groups_spec.rb

Merge remote-tracking branch 'origin/master' into ee-7-4

2014-10-02 13:24:59 +03:00

internal_spec.rb

/api/allowed use POST now

2014-09-03 09:06:16 +03: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

LDAP groups api

2013-10-01 10:58:20 +03: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_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 branch 'master' into ce-upstream

2014-10-14 18:23:51 +03:00

repositories_spec.rb

Fix contributors api

2014-09-30 11:56:48 +03:00

services_spec.rb

Remove rails observers from application

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

session_spec.rb

Added API testing group

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

system_hooks_spec.rb

Added API testing group

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

users_spec.rb

Fix failing api specs.

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