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

..

concerns

fix most of warnings

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

assembla_service_spec.rb

Integration with Assembla

2013-11-21 13:18:02 +01:00

broadcast_message_spec.rb

Customization and previewing of broadcast messages

2013-12-18 17:43:45 -05:00

commit_spec.rb

Link issues from comments and automatically close them

2013-08-25 18:58:41 -04:00

deploy_key_spec.rb

Reannotate

2013-08-21 12:34:02 +03:00

deploy_keys_project_spec.rb

Annotated

2013-06-19 15:40:33 +03:00

event_spec.rb

fix most of warnings

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

flowdock_service_spec.rb

Annotate

2013-11-13 14:10:03 +02:00

forked_project_link_spec.rb

Replace context with service in specs

2014-01-16 20:29:18 +02:00

gitlab_ci_service_spec.rb

Annotated

2013-06-19 15:40:33 +03:00

gollum_wiki_spec.rb

Revert "More escaping"

2013-11-05 15:35:49 +02:00

group_spec.rb

Update user access level when adding to group.

2013-10-14 15:15:14 +02:00

issue_spec.rb

Link issues from comments and automatically close them

2013-08-25 18:58:41 -04:00

key_spec.rb

Reannotate

2013-08-21 12:34:02 +03:00

merge_request_spec.rb

fix most of warnings

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

milestone_spec.rb

Reannotate

2013-08-21 12:34:02 +03:00

namespace_spec.rb

Annotate!

2013-10-01 15:15:28 +03:00

note_spec.rb

Add note for assignee changes

2014-01-06 15:38:13 -06:00

project_group_link_spec.rb

Add group_access validation to ProjectGroupLink

2013-10-03 10:04:07 +03:00

project_security_spec.rb

Project has now correct owner and creator. Increased test coverage

2013-01-02 19:00:00 +02:00

project_snippet_spec.rb

Reannotate

2013-08-21 12:34:02 +03:00

project_spec.rb

Added a simple test to web_url_without_protocol.

2014-01-20 08:00:50 -05:00

project_team_spec.rb

remove tests for unexisting methods

2013-02-26 11:17:02 +02:00

protected_branch_spec.rb

Fixed: post-receive, project remove, tests

2013-02-05 12:47:50 +02:00

service_hook_spec.rb

Annotate web_hooks table

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

service_spec.rb

Added can_test? mehod to Service model and added tests

2013-08-09 22:02:34 +02:00

snippet_spec.rb

Reannotate

2013-08-21 12:34:02 +03:00

system_hook_spec.rb

Annotate web_hooks table

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

user_spec.rb

Merge pull request #6072 from jvanbaarsen/fix-3516

2014-01-19 10:29:06 -08:00

users_group_spec.rb

Reannotate

2013-08-21 12:34:02 +03:00

users_project_spec.rb

Reannotate

2013-08-21 12:34:02 +03:00

web_hook_spec.rb

Annotate web_hooks table

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

wiki_page_spec.rb

Revert "More escaping"

2013-11-05 15:35:49 +02:00