Dmitriy Zaporozhets 2df9a76042 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into 6_5_ce ...

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

Conflicts:
	CHANGELOG
	VERSION
	app/assets/stylesheets/generic/common.scss
	app/views/projects/edit.html.haml
	config.ru
	db/schema.rb
	doc/install/installation.md
	doc/update/6.0-to-6.1.md
	doc/update/6.1-to-6.2.md
	lib/gitlab/upgrader.rb

2014-01-21 18:15:49 +02:00

..

api_helpers_spec.rb

Style guide fixes (spacing)

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

files_spec.rb

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

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

Extend API Issues, MergeRequets, Milestones with iid field

2013-10-14 16:39:54 +03: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

ProjectHook API supports new event fields

2013-12-04 13:37:39 +02:00

projects_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

repositories_spec.rb

Add support for various archive formats.

2014-01-02 10:18:56 -06:00

services_spec.rb

API: set gitlab-ci service for project

2013-10-29 16:39:46 +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

Added test cases to verify admin status of users created via API.

2013-09-29 19:55:09 +03:00