Dmitriy Zaporozhets 4e77b0b52d Merge branch '6-3-stable' of dev.gitlab.org:gitlab/gitlabhq into release/6-3 ...

Conflicts:
	Gemfile.lock
	VERSION
	app/assets/javascripts/api.js.coffee
	app/models/user.rb
	app/views/help/index.html.haml
	doc/install/installation.md
	doc/update/5.4-to-6.0.md
	doc/update/6.0-to-6.1.md
	doc/update/6.1-to-6.2.md
	lib/api/api.rb
	lib/api/entities.rb
	lib/gitlab/ldap/user.rb
	lib/tasks/gitlab/check.rake

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

2013-11-29 10:01:43 +02:00

..

concerns

Add description to MergeRequest model

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

network

Remove grit require

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

.gitkeep

init commit

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

ability.rb

Group ownership completely based on users_groups relation now

2013-09-26 14:49:22 +03:00

broadcast_message.rb

Annotate

2013-11-13 14:10:03 +02: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

Add additional validation to push event

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

flowdock_service.rb

Annotate

2013-11-13 14:10:03 +02: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

Add GollumWiki#empty? method

2013-10-09 17:17:52 +02:00

group.rb

Remove outdated group callback

2013-10-31 14:42:10 +02:00

hipchat_service.rb

Nicer icons for enabled/disabled stuff

2013-11-20 14:05:42 +02:00

issue.rb

Issue-4769 - Unable to update case of label

2013-10-02 08:18:28 -05:00

key.rb

Reannotate

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

merge_request.rb

Fix bugs when discussion visible in wrong project

2013-10-07 14:49:01 +03: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

Annotate!

2013-10-01 15:15:28 +03: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

Annotate!

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

project_group_link.rb

Add group_access validation to ProjectGroupLink

2013-10-03 10:04:07 +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-3-stable' of dev.gitlab.org:gitlab/gitlabhq into release/6-3

2013-11-29 10:01:43 +02:00

protected_branch.rb

replace Gitolited mixin with Gitlab::ShellAdapter

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

repository.rb

Fix recent branches order. Added counters

2013-11-15 09:18:06 +02: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

Fix README detection for subdir

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

user.rb

Merge branch '6-3-stable' of dev.gitlab.org:gitlab/gitlabhq into release/6-3

2013-11-29 10:01:43 +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

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