Dmitriy Zaporozhets e502d785f9 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into code-from-ce-6-7 ...

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

Conflicts:
	CHANGELOG
	VERSION
	app/controllers/application_controller.rb
	app/models/user.rb
	app/views/groups/members.html.haml
	app/views/groups/show.html.haml
	config/gitlab.yml.example
	db/schema.rb
	features/steps/project/project_browse_branches.rb
	lib/api/projects.rb
	lib/gitlab/ldap/access.rb
	lib/gitlab/ldap/adapter.rb
	lib/gitlab/ldap/person.rb
	lib/gitlab/upgrader.rb

2014-03-18 11:15:01 +02:00

..

api.rb

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into code-from-ce-6-7

2014-03-18 11:15:01 +02:00

commits.rb

Extract commits API to separate file

2014-02-18 12:41:21 +02: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 code-from-ce-6-7

2014-03-18 11:15:01 +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

Change project lookup order for api

2014-03-14 15:58:52 +02:00

internal.rb

Add ldap check in application_controller and internal api

2014-03-10 17:10:23 +02: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

Added description parameter support to Create and Update MR API endpoints (issue-110).

2014-03-03 23:08:39 -08: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 code-from-ce-6-7

2014-03-18 11:15:01 +02:00

repositories.rb

Merge branch 'feature/api_fle_encoded' into 'master'

2014-02-18 14:15:40 +00: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 pull request #6075 from skv-headless/remove_deprecated_finders

2014-01-22 11:04:56 -08:00