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

..

application_controller.rb

Refactoring for EditTree and NewTree controllers and contexts

2013-11-05 12:21:11 +02:00

base_tree_controller.rb

Refactoring for EditTree and NewTree controllers and contexts

2013-11-05 12:21:11 +02:00

blame_controller.rb

Refactor blob finding

2013-10-01 20:34:41 +03:00

blob_controller.rb

Remove file from repository feature

2013-11-19 16:14:56 +02:00

branches_controller.rb

Refactor recent branches page

2013-08-05 17:59:58 +03:00

commit_controller.rb

Show branches list (which branches contains commit) on commit page

2013-10-21 22:54:37 +04:00

commits_controller.rb

Move projects controllers/views in Projects module

2013-06-23 19:47:22 +03:00

compare_controller.rb

Update gitlab_git to version 2.2.0. Fixes invalid diff in Compare

2013-09-16 13:33:34 +03:00

deploy_keys_controller.rb

Move projects controllers/views in Projects module

2013-06-23 19:47:22 +03:00

edit_tree_controller.rb

Refactoring for EditTree and NewTree controllers and contexts

2013-11-05 12:21:11 +02:00

graphs_controller.rb

Cache graph log

2013-06-25 13:55:03 +03:00

group_links_controller.rb

ProjectGroupLink access level

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

hooks_controller.rb

Modify permissions for project and group

2013-09-25 14:05:35 +03:00

issues_controller.rb

Add redirect from Issue#id to Issue#iid

2013-08-26 14:15:21 +03:00

labels_controller.rb

Move projects controllers/views in Projects module

2013-06-23 19:47:22 +03:00

merge_requests_controller.rb

Merge branch 'patch-2' of https://github.com/zzet/gitlabhq into zzet-patch-2

2013-09-26 22:19:01 +03:00

milestones_controller.rb

Sort active milestones by due dates (closest first)

2013-09-23 18:41:26 +02:00

network_controller.rb

Render not found when failing to look for a commit

2013-08-21 17:53:51 +09:00

new_tree_controller.rb

Improve consistency: use file_path for API create/update/delete files

2013-11-20 10:03:50 +02:00

notes_controller.rb

Merge branch 'master' into 6-0-dev

2013-07-02 11:47:09 +03:00

protected_branches_controller.rb

Move projects controllers/views in Projects module

2013-06-23 19:47:22 +03:00

raw_controller.rb

Refactor blob finding

2013-10-01 20:34:41 +03:00

refs_controller.rb

Update code to work with gitlab_git 3

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

repositories_controller.rb

Refactor recent branches page

2013-08-05 17:59:58 +03:00

services_controller.rb

Move projects controllers/views in Projects module

2013-06-23 19:47:22 +03:00

snippets_controller.rb

Modify permissions for project and group

2013-09-25 14:05:35 +03:00

tags_controller.rb

create corresponding events when create branch/tag with UI

2013-07-17 15:11:03 +03:00

team_members_controller.rb

New feature: Ability to leave project

2013-11-05 16:41:29 +02:00

tree_controller.rb

Refactoring for EditTree and NewTree controllers and contexts

2013-11-05 12:21:11 +02:00

walls_controller.rb

Move projects controllers/views in Projects module

2013-06-23 19:47:22 +03:00

wikis_controller.rb

Move projects controllers/views in Projects module

2013-06-23 19:47:22 +03:00