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_helpers_spec.rb

Style guide fixes (spacing)

2013-09-09 13:18:10 -04:00

commits_spec.rb

Extract commits API to separate file

2014-02-18 12:41:21 +02:00

files_spec.rb

Complete api files CRUD

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

groups_spec.rb

Merge branch '6-4-stable' of dev.gitlab.org:gitlab/gitlabhq into 6-4-from-ce

2013-12-23 12:57:22 +02:00

internal_spec.rb

Archiving old projects; archived projects aren't shown on dashboard

2013-12-16 14:39:14 +01:00

issues_spec.rb

Fixing unsafe use of Thread.current variable :current_user

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

ldap_spec.rb

LDAP groups api

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

merge_requests_spec.rb

Added tests of Create and Update MR description.

2014-03-10 12:39:29 -07:00

milestones_spec.rb

Fixing unsafe use of Thread.current variable :current_user

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

namespaces_spec.rb

Namespaces api specs

2013-11-15 15:29:53 +02:00

notes_spec.rb

Fixing unsafe use of Thread.current variable :current_user

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

project_hooks_spec.rb

Make changes to tests

2014-01-22 21:03:52 +02:00

project_members_spec.rb

Move project members api to separate file

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

projects_spec.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_spec.rb

Extract commits API to separate file

2014-02-18 12:41:21 +02:00

services_spec.rb

Make changes to tests

2014-01-22 21:03:52 +02:00

session_spec.rb

Fix session spec because of password length

2013-11-25 22:33:04 +02:00

system_hooks_spec.rb

Refactor API classes. So api classes like Gitlab::Issues become API::Issues

2013-05-14 15:33:31 +03:00

users_spec.rb

Remove deprecated finders

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