Dmitriy Zaporozhets fae2e540b6 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into upstream-ce-6-8 ...

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

Conflicts:
	CHANGELOG
	Gemfile.lock
	README.md
	VERSION
	app/assets/javascripts/application.js
	db/schema.rb
	doc/install/installation.md
	doc/update/4.2-to-5.0.md
	doc/update/5.0-to-5.1.md
	doc/update/5.1-to-5.2.md
	doc/update/5.2-to-5.3.md
	doc/update/5.4-to-6.0.md
	doc/update/6.0-to-6.1.md
	doc/update/6.0-to-6.7.md
	lib/gitlab/git_access.rb

2014-04-10 13:34:56 +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

Move branch creation logic in service

2014-04-01 10:33:23 +03:00

commit_controller.rb

Fix commit page

2014-01-15 15:31:49 +02: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

Better redirect for edit blod from MergeRequest

2014-02-26 14:06:31 +02: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

ProjectGroupLink access level

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

hooks_controller.rb

Fix url generation error on hook invalid create

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

issues_controller.rb

Move update issue code to separate service

2014-04-02 13:54:41 +03:00

labels_controller.rb

Generate labels set from issues page

2014-02-25 17:47:29 +02:00

merge_requests_controller.rb

Allow people to remove source branch of fork project in MR

2014-04-07 19:11:02 +03:00

milestones_controller.rb

Remove author_id_of_changes from app

2014-03-25 14:01:52 +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 authorization for new/edit blob pages

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

notes_controller.rb

Move services for collecting items to Finders

2014-02-25 19:15:08 +02:00

protected_branches_controller.rb

fix warnings

2013-12-25 23:29:40 +04:00

raw_controller.rb

Fixes #6207 Allow raw download of *.msi files

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

refs_controller.rb

Show last commit for Blob#show

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

Use new tags/branches from gitlab_git

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

walls_controller.rb

Move projects controllers/views in Projects module

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

wikis_controller.rb

Rename wiki variables

2014-04-09 14:35:01 +03:00