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

Move issues sort logic to Issuable concern

2014-01-14 20:49:32 +02:00

network

Remove grit require

2013-09-30 13:59:16 +03:00

project_services

Move EmailOnPush logic to async worker

2013-12-18 13:42:12 +02:00

.gitkeep

init commit

2011-10-09 00:36:38 +03:00

ability.rb

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

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

broadcast_message.rb

Add validations to BroadcastMessage color and font

2013-12-19 20:11:01 +02:00

commit.rb

Improved large commit handling.

2013-09-07 14:44:03 +03:00

deploy_key.rb

Reannotate

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

deploy_keys_project.rb

Annotated

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

event.rb

Fixed default scope deprecation warning

2013-12-10 12:11:27 +02:00

forked_project_link.rb

Annotated

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

gollum_wiki.rb

Unused http_url member in project & gollum_wiki

2013-12-02 11:13:53 +01:00

group.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

issue.rb

Duplicate opened scope for issue

2013-12-17 23:32:19 +03:00

key.rb

Reannotate

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

merge_request.rb

Fix mr controller specs

2014-01-14 10:47:28 +02:00

milestone.rb

Reannotate

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

namespace.rb

Admin can transfer project to any namespace

2013-11-15 15:25:37 +02:00

note.rb

Add note for assignee changes

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

notification.rb

save each notification setting with ajax on change

2013-04-04 22:11:51 +03:00

personal_snippet.rb

Reannotate

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

project_group_link.rb

Add group_access validation to ProjectGroupLink

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

project_hook.rb

Annotate web_hooks table

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

project_snippet.rb

Reannotate

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

project_team.rb

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into 6_5_ce

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

project.rb

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into 6_5_ce

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

protected_branch.rb

replace Gitolited mixin with Gitlab::ShellAdapter

2013-03-21 21:01:14 +02:00

repository.rb

README link from project home page

2013-11-29 13:52:10 +02:00

service_hook.rb

Annotate web_hooks table

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

service.rb

Added can_test? mehod to Service model and added tests

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

snippet.rb

Reannotate

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

system_hook.rb

Annotate web_hooks table

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

tree.rb

Fix README detection for subdir

2013-10-13 16:03:16 +03:00

user.rb

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into 6_5_ce

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

users_group.rb

Reannotate

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

users_project.rb

If user is owner of project it cant be removed from this project

2013-08-27 12:47:28 +03:00

web_hook.rb

Disable SSL peer verification for all webhooks

2014-01-15 15:29:22 +01:00

wiki_page.rb

Fixed wrong last-edit time for wiki

2013-08-16 16:59:26 +03:00