Jacob Vosmaer ee8836a903 Merge commit '27cf081e1b0b1df166' into merge_ce_27cf081e1b0b1df166 ...

Conflicts:
	VERSION
	app/models/user.rb
	app/services/merge_requests/build_service.rb
	config/gitlab.yml.example
	db/schema.rb
	doc/integration/README.md
	features/project/merge_requests.feature
	features/steps/project/merge_requests.rb

2014-08-15 10:25:23 +02: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

diff unfold

2014-08-14 15:48:14 +04:00

branches_controller.rb

Changed some stuff around after rebase

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

commit_controller.rb

Refactor diff suppress logic and diff views

2014-07-15 18:28:21 +03:00

commits_controller.rb

notes count in 1 query for mr and commits

2014-06-10 16:10:53 +04:00

compare_controller.rb

Fix variable order on compare page

2014-07-29 12:42:01 +03:00

deploy_keys_controller.rb

Make app works with strong params

2014-06-26 23:24:17 +03:00

edit_tree_controller.rb

Don't remove trailing newline when editing a file in web UI editor:

2014-06-27 10:50:36 -07:00

git_hooks_controller.rb

Remove attr_accessible from EE only models

2014-07-11 14:38:56 +03: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

Prevent 500 if hook url is down, fixes #7376

2014-07-29 11:49:46 +02:00

issues_controller.rb

Allow set labels from Issue/MR forms

2014-07-29 21:23:54 +03:00

labels_controller.rb

Remove labels with ajax request

2014-08-13 19:47:03 +03:00

merge_requests_controller.rb

Allow set labels from Issue/MR forms

2014-07-29 21:23:54 +03:00

milestones_controller.rb

Project hook, milestone, snippet strong params

2014-06-26 18:51:11 +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

Note strong_params

2014-06-26 16:49:22 +03:00

protected_branches_controller.rb

Use strong params for 5 more models

2014-06-26 15:00:09 +03:00

raw_controller.rb

Fixes #6207 Allow raw download of *.msi files

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

refs_controller.rb

Increase commit log amount for tree view from 10 to 25

2014-06-26 10:29:39 +03:00

repositories_controller.rb

Fix repository archive

2014-08-13 21:28:22 +03:00

services_controller.rb

Remove attr_accessible from EE only models

2014-07-11 14:38:56 +03:00

snippets_controller.rb

Project hook, milestone, snippet strong params

2014-06-26 18:51:11 +03:00

tags_controller.rb

Update tags_controller.rb to use CreateTagService.

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

team_members_controller.rb

team member and hook strong params

2014-06-26 18:45:33 +03:00

tree_controller.rb

Check if blob or tree and redirect to the correct one.

2014-07-07 15:46:57 +02:00

wikis_controller.rb

Added ability to serve files in wiki repository

2014-06-07 11:14:33 +02:00