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

Merge commit '27cf081e1b0b1df166' into merge_ce_27cf081e1b0b1df166

2014-08-15 10:25:23 +02:00

branches.rb

Fix branch API

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

commits.rb

Move branches api to separate class

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

deploy_keys.rb

Improve error reporting on users API

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

entities.rb

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ee-7-4

2014-10-03 16:18:40 +03:00

files.rb

fix permissions for files API

2014-06-06 06:58:20 +05:00

groups.rb

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

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

helpers.rb

Add parenthesis to function def with arguments.

2014-10-03 09:18:46 +02:00

internal.rb

Improve wiki path parsing in internal api

2014-10-07 17:28:55 +03:00

issues.rb

Filters issues by milestone via API

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

labels.rb

Improve error reporting on users API

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

ldap.rb

LDAP groups api

2013-10-01 10:58:20 +03:00

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

Replace milestone observer with services

2014-06-10 18:07:52 +03:00

namespaces.rb

fix most of warnings

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

notes.rb

Fix notes creation via API

2014-06-18 09:26:04 +03:00

project_hooks.rb

Add tag_push_events to project hook api

2014-10-03 10:23:32 +04:00

project_members.rb

More fixes to project members api

2014-09-15 12:01:45 +03:00

project_snippets.rb

Improve error reporting on users API

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

projects.rb

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

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

repositories.rb

Factor error and success methods from services.

2014-09-21 11:43:05 +02: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

Merge branch 'ee-7-4' into 'master'

2014-10-03 12:29:35 +00:00