Dmitriy Zaporozhets b165b097f5 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-7-to-ee ...

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

Conflicts:
	LICENSE
	VERSION
	app/controllers/omniauth_callbacks_controller.rb
	app/helpers/application_helper.rb
	app/helpers/merge_requests_helper.rb
	app/models/group.rb
	app/models/project.rb
	app/models/project_team.rb
	app/views/admin/groups/edit.html.haml
	app/views/groups/_projects.html.haml
	app/views/groups/edit.html.haml
	db/schema.rb
	doc/install/installation.md
	doc/integration/README.md
	lib/gitlab/git_access.rb
	lib/gitlab/markdown.rb
	spec/helpers/merge_requests_helper.rb
	spec/models/merge_request_spec.rb

2014-06-17 10:53:44 +03:00

..

api.rb

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into upstream-ce-6-8

2014-04-10 13:34:56 +03:00

branches.rb

Improve branch deletion via API

2014-05-23 15:34:02 +03:00

commits.rb

Move branches api to separate class

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

deploy_keys.rb

Remove deprecated finders

2014-01-19 23:39:56 +04:00

entities.rb

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

2014-06-17 10:53:44 +03:00

files.rb

fix permissions for files API

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

groups.rb

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

2014-06-17 10:53:44 +03:00

helpers.rb

Remove set of thread variables

2014-06-10 17:51:49 +03:00

internal.rb

Dont expose user email via API

2014-06-13 17:46:48 +03:00

issues.rb

Move update issue code to separate service

2014-04-02 13:54:41 +03:00

ldap.rb

LDAP groups api

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

merge_requests.rb

Remove thread vars usage from API notes and mr's

2014-06-10 17:56:35 +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

Wipe wall notes feature

2014-06-13 14:24:54 +03:00

project_hooks.rb

Move project members api to separate file

2014-03-17 13:44:54 +02:00

project_members.rb

Move project members api to separate file

2014-03-17 13:44:54 +02:00

project_snippets.rb

Dropped expiration date from the snippet API

2014-01-11 18:40:17 +01:00

projects.rb

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

2014-06-17 10:53:44 +03:00

repositories.rb

Merge pull request #7014 from asedge/api_create_tag

2014-05-29 15:37:42 +03: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

Dont expose user email via API

2014-06-13 17:46:48 +03:00