Dmitriy Zaporozhets b165b097f5 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-7-to-ee ...

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

Conflicts:
	LICENSE
	VERSION
	app/controllers/omniauth_callbacks_controller.rb
	app/helpers/application_helper.rb
	app/helpers/merge_requests_helper.rb
	app/models/group.rb
	app/models/project.rb
	app/models/project_team.rb
	app/views/admin/groups/edit.html.haml
	app/views/groups/_projects.html.haml
	app/views/groups/edit.html.haml
	db/schema.rb
	doc/install/installation.md
	doc/integration/README.md
	lib/gitlab/git_access.rb
	lib/gitlab/markdown.rb
	spec/helpers/merge_requests_helper.rb
	spec/models/merge_request_spec.rb

2014-06-17 10:53:44 +03:00

..

application_controller.rb

Adding authenticated public mode (internal).

2013-11-26 22:22:07 -06: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

Improve authorization for new/edit blob pages

2014-01-24 21:29:52 +02:00

branches_controller.rb

Changed some stuff around after rebase

2014-05-23 20:26:31 +02:00

commit_controller.rb

Prevent commit page error if cant collect branches where commit exists

2014-06-11 22:08:39 +03:00

commits_controller.rb

Drop rjs from Infinite scrolling

2013-11-28 11:38:20 +02:00

compare_controller.rb

Use gitlab_git 5.4.0 without BROKEN_DIFF constant

2014-02-12 12:54:49 +02:00

deploy_keys_controller.rb

fix most of warnings

2013-12-15 00:05:10 +04:00

edit_tree_controller.rb

Editing preview

2014-04-15 19:02:02 +04:00

git_hooks_controller.rb

GitHooks scaffold

2014-03-20 14:07:58 +02:00

graphs_controller.rb

Cache graph log

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

group_links_controller.rb

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-7-to-ee

2014-06-17 10:53:44 +03:00

hooks_controller.rb

Fix url generation error on hook invalid create

2014-04-06 19:42:24 +04:00

issues_controller.rb

Show/hide issue assignee avatar depends on drag-n-drop column in milestone view

2014-06-16 12:17:34 +03:00

labels_controller.rb

Fix 500 error when generate labels on labels page. Fixes #1311

2014-06-04 11:08:21 +03:00

merge_requests_controller.rb

Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into ce-7-to-ee

2014-06-17 10:53:44 +03:00

milestones_controller.rb

Add sorting to merge requests on milestone page

2014-06-11 17:11:52 +03: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 authorization for new/edit blob pages

2014-01-24 21:29:52 +02:00

notes_controller.rb

Serialize last_fetched_at as a string with seconds

2014-04-28 12:42:01 +02:00

protected_branches_controller.rb

Move protected branches to Project settings

2014-05-23 14:25:55 +03:00

raw_controller.rb

Fixes #6207 Allow raw download of *.msi files

2014-02-13 20:09:11 +01:00

refs_controller.rb

Load last commit for files per 10 items.

2014-06-12 12:01:54 +03:00

repositories_controller.rb

Remove archives older than 2 hours.

2014-04-09 15:09:11 +02:00

services_controller.rb

Move projects controllers/views in Projects module

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

snippets_controller.rb

Update commentable controllers with new note vars

2013-12-25 22:32:48 +02:00

tags_controller.rb

Update tags_controller.rb to use CreateTagService.

2014-05-28 07:59:02 -04:00

team_members_controller.rb

Remove deprecated finders

2014-01-19 23:39:56 +04:00

tree_controller.rb

Refactoring for EditTree and NewTree controllers and contexts

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

wikis_controller.rb

Fix styling issues.

2014-05-05 11:55:49 +02:00