Dmitriy Zaporozhets 0c5a9f20b5 Merge branch '6-1-stable' of https://dev.gitlab.org/gitlab/gitlabhq into 6-1-stable-ee ...

Conflicts:
	VERSION
	app/controllers/application_controller.rb
	app/controllers/omniauth_callbacks_controller.rb
	app/models/merge_request.rb
	app/models/user.rb
	app/views/groups/_projects.html.haml
	config/routes.rb
	db/schema.rb
	doc/install/installation.md

2013-09-27 15:24:54 +03:00

..

concerns

Add description to MergeRequest model

2013-09-09 16:32:43 +03:00

network

Remove the dependancy of grit from class Network::Graph

2013-08-20 12:05:23 +09:00

.gitkeep

init commit

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

ability.rb

Fix 404 if Group guest visit empty group page

2013-09-11 21:00:16 +03:00

campfire_service.rb

Annotated

2013-06-19 15:40:33 +03: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

Merge branch 'feature/internal_ids' of /home/git/repositories/gitlab/gitlabhq

2013-08-20 19:30:38 +00:00

forked_project_link.rb

Annotated

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

gitlab_ci_service.rb

Annotated

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

gollum_wiki.rb

fix gollum git instructions. related to #3562

2013-04-10 14:35:44 +03:00

group.rb

Merge branch '6-1-stable' of https://dev.gitlab.org/gitlab/gitlabhq into 6-1-stable-ee

2013-09-27 15:24:54 +03:00

hipchat_service.rb

Annotated

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

issue.rb

Add description to MergeRequest model

2013-09-09 16:32:43 +03:00

key.rb

Reannotate

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

merge_request.rb

Add description to MergeRequest model

2013-09-09 16:32:43 +03:00

milestone.rb

Reannotate

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

namespace.rb

Fix typos

2013-07-29 12:47:06 +02:00

note.rb

Link issues from comments and automatically close them

2013-08-25 18:58:41 -04: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

pivotaltracker_service.rb

Syntax cleanup

2013-09-25 16:54:34 +02:00

project_group_link.rb

ProjectGroupLink access level

2013-08-20 13:59:43 +03:00

project_hook.rb

Reannotate

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

project_snippet.rb

Reannotate

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

project_team.rb

Merge branch '6-1-stable' of https://dev.gitlab.org/gitlab/gitlabhq into 6-1-stable-ee

2013-09-27 15:24:54 +03:00

project.rb

Merge branch '6-1-stable' of https://dev.gitlab.org/gitlab/gitlabhq into 6-1-stable-ee

2013-09-27 15:24:54 +03:00

protected_branch.rb

replace Gitolited mixin with Gitlab::ShellAdapter

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

repository.rb

Link issues from comments and automatically close them

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

service_hook.rb

Reannotate

2013-08-21 12:34:02 +03: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

Reannotate

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

tree.rb

Gitlab::Git::Tree & Blob added

2013-04-02 22:37:20 +03:00

user.rb

Merge branch '6-1-stable' of https://dev.gitlab.org/gitlab/gitlabhq into 6-1-stable-ee

2013-09-27 15:24:54 +03: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

Reannotate

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

wiki_page.rb

Fixed wrong last-edit time for wiki

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