Dmitriy Zaporozhets 4e77b0b52d Merge branch '6-3-stable' of dev.gitlab.org:gitlab/gitlabhq into release/6-3 ...

Conflicts:
	Gemfile.lock
	VERSION
	app/assets/javascripts/api.js.coffee
	app/models/user.rb
	app/views/help/index.html.haml
	doc/install/installation.md
	doc/update/5.4-to-6.0.md
	doc/update/6.0-to-6.1.md
	doc/update/6.1-to-6.2.md
	lib/api/api.rb
	lib/api/entities.rb
	lib/gitlab/ldap/user.rb
	lib/tasks/gitlab/check.rake

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

2013-11-29 10:01:43 +02:00

..

api.rb

Merge branch '6-3-stable' of dev.gitlab.org:gitlab/gitlabhq into release/6-3

2013-11-29 10:01:43 +02:00

deploy_keys.rb

API: set gitlab-ci service for project

2013-10-29 16:39:46 +02:00

entities.rb

Merge branch '6-3-stable' of dev.gitlab.org:gitlab/gitlabhq into release/6-3

2013-11-29 10:01:43 +02:00

files.rb

Improve consistency: use file_path for API create/update/delete files

2013-11-20 10:03:50 +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

Make sure private_token for API is a string

2013-11-08 18:49:38 +02:00

internal.rb

Fix SSH access for LDAP users

2013-11-08 16:04:08 +01: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

namespaces.rb

Namespaces API for admin users

2013-11-15 15:24:10 +02: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-3-stable' of dev.gitlab.org:gitlab/gitlabhq into release/6-3

2013-11-29 10:01:43 +02:00

repositories.rb

Fix a bug where the tgz returned got encoded utf8

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

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

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