Dmitriy Zaporozhets c9a2765515 Merge branch '6-2-stable' of dev.gitlab.org:gitlab/gitlabhq into upstream/6-2-stable ...

Conflicts:
	VERSION
	app/models/group.rb
	app/views/groups/edit.html.haml
	db/schema.rb
	doc/api/groups.md
	doc/api/projects.md
	doc/install/installation.md
	lib/api/projects.rb
	spec/requests/api/groups_spec.rb
	spec/requests/api/projects_spec.rb

2013-10-31 14:29:48 +02:00

..

api.rb

Enable LDAP api. Add LdapGroup entity to api

2013-10-01 11:11:47 +03:00

deploy_keys.rb

API: Protect project deploy keys from unauthorized access

2013-09-30 16:47:26 +03:00

entities.rb

Merge branch '6-2-stable' of dev.gitlab.org:gitlab/gitlabhq into upstream/6-2-stable

2013-10-31 14:29:48 +02:00

groups.rb

Merge branch '6-2-stable' of dev.gitlab.org:gitlab/gitlabhq into upstream/6-2-stable

2013-10-31 14:29:48 +02:00

helpers.rb

Merge pull request #5344 from amacarthur/thread-variable-fix

2013-10-16 23:30:44 -07:00

internal.rb

Check if LDAP user was removed or blocked when use git over ssh

2013-10-07 16:06:30 +03:00

issues.rb

Fixing unsafe use of Thread.current variable :current_user

2013-10-16 01:20:53 -04:00

ldap.rb

LDAP groups api

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

merge_requests.rb

Fixing unsafe use of Thread.current variable :current_user

2013-10-16 01:20:53 -04:00

milestones.rb

Fixing unsafe use of Thread.current variable :current_user

2013-10-16 01:20:53 -04:00

notes.rb

Fixing unsafe use of Thread.current variable :current_user

2013-10-16 01:20:53 -04:00

project_hooks.rb

Refactor API: project hooks

2013-09-30 16:49:55 +03:00

project_snippets.rb

Fix snippet raw content being escaped

2013-06-06 16:10:24 +03:00

projects.rb

Merge branch '6-2-stable' of dev.gitlab.org:gitlab/gitlabhq into upstream/6-2-stable

2013-10-31 14:29:48 +02:00

repositories.rb

Fix a bug where the tgz returned got encoded utf8

2013-10-10 09:19:28 -04: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

Extended User API to expose admin and can_create_group for user creation/updating.

2013-09-29 11:47:29 +03:00