Dmitriy Zaporozhets 556ca35274 Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into ce-6-9 ...

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

Conflicts:
	CHANGELOG
	VERSION
	app/assets/stylesheets/application.scss
	app/views/layouts/devise.html.haml

2014-05-12 12:39:51 +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

Add fix for API when branch names have periods in them. Relates to issue #6128 (https://github.com/gitlabhq/gitlabhq/issues/6128).

2014-05-08 07:06:47 -04: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 remote-tracking branch 'origin/master' into 6-8-ce-to-ee

2014-04-22 11:58:11 +02:00

files.rb

Complete api files CRUD

2014-02-18 12:27:02 +02:00

groups.rb

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

2014-02-11 10:15:13 +02:00

helpers.rb

Create branch via API

2014-04-01 10:39:53 +03:00

internal.rb

first setup to protect protected branched to force updates

2014-03-25 22:33:14 +01: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

Add optional parameter to list merge requests

2014-04-07 16:18:25 +02:00

milestones.rb

Fixing unsafe use of Thread.current variable :current_user

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

namespaces.rb

fix most of warnings

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

notes.rb

Fixing unsafe use of Thread.current variable :current_user

2013-10-16 01:20:53 -04: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 upstream-ce-6-8

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

repositories.rb

Move branches api to separate class

2014-03-31 16:31:53 +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

Implement GET /users/:uid/keys for admin users

2014-04-18 14:16:19 +02:00