Dmitriy Zaporozhets 903726c846 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into upstream-ce ...

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

Conflicts:
	CHANGELOG
	Gemfile
	VERSION
	app/models/group.rb
	app/views/groups/edit.html.haml
	db/schema.rb
	doc/install/installation.md
	doc/update/5.4-to-6.0.md

2014-02-11 10:15:13 +02:00

..

concerns

Fix wrong issues appears at Dashboard#issues page

2014-02-10 15:04:52 +02:00

network

Remove grit require

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

project_services

Merge branch 'hipchat-remove-hash' of /mnt/ebs/repositories/Tenzer/gitlab-ce

2014-01-26 15:22:13 +00:00

.gitkeep

init commit

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

ability.rb

Fix Issues#bulk_update

2014-02-10 15:36:58 +02:00

broadcast_message.rb

Add validations to BroadcastMessage color and font

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

commit.rb

Use new tags/branches from gitlab_git

2014-02-03 18:13:24 +02: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

Better submodule links.

2014-02-05 20:44:14 -06:00

group.rb

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into upstream-ce

2014-02-11 10:15:13 +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_diff.rb

Set mr_diff state to collected if diff is ok

2014-01-22 15:30:14 +02:00

merge_request.rb

Fix bug with merge request branch select

2014-01-31 13:24:38 +02:00

milestone.rb

Reannotate

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

namespace.rb

added group avatars

2014-01-28 08:38:00 +01:00

note.rb

Fix bug with cross-reference note on commit

2014-02-07 12:34:30 +02: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 upstream-ce

2014-02-11 10:15:13 +02:00

project.rb

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into upstream-ce

2014-02-11 10:15:13 +02:00

protected_branch.rb

replace Gitolited mixin with Gitlab::ShellAdapter

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

repository.rb

Show last commit for Blob#show

2014-02-10 21:46:46 +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

Improve code according to new gitlab_git

2014-02-04 14:46:15 +02:00

user.rb

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into upstream-ce

2014-02-11 10:15:13 +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