Dmitriy Zaporozhets f4d43ed3b1 Merge branch 'master' into ce-upstream ...

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

Conflicts:
	app/controllers/projects/services_controller.rb
	app/models/concerns/mentionable.rb
	app/models/project.rb
	app/models/user.rb
	app/views/admin/users/index.html.haml
	app/views/projects/services/_form.html.haml
	config/gitlab.yml.example
	config/initializers/1_settings.rb
	lib/gitlab/git_access.rb
	lib/gitlab/ldap/access.rb
	lib/gitlab/ldap/person.rb
	lib/gitlab/reference_extractor.rb
	spec/lib/gitlab/ldap/access_spec.rb

2014-10-14 18:23:51 +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

diff unfold

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

branches_controller.rb

Factor error and success methods from services.

2014-09-21 11:43:05 +02:00

commit_controller.rb

Faster branch contains detection for commit

2014-09-29 16:40:13 +03:00

commits_controller.rb

Remove outdated comment from commits_controller

2014-10-07 18:52:16 +02: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

Factor error and success methods from services.

2014-09-21 11:43:05 +02:00

git_hooks_controller.rb

Remove attr_accessible from EE only models

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

graphs_controller.rb

Refactor commits graph

2014-09-29 12:05:17 +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

Add task lists to issues and merge requests

2014-10-05 22:15:27 -05:00

labels_controller.rb

Show labels help message if last label is deleted

2014-09-04 23:15:28 +02:00

merge_requests_controller.rb

Add task lists to issues and merge requests

2014-10-05 22:15:27 -05: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

Fix non-showing error message when edit file via web

2014-09-24 19:15:37 +03:00

notes_controller.rb

Dont allow edit or remove of system notes

2014-08-29 15:19:35 +03:00

protected_branches_controller.rb

Use strong params for 5 more models

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

raw_controller.rb

Prevent possible XSS issues by seting text/plain for all text files in

2014-08-28 10:42:52 +03: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

Rewrite graphs feature

2014-09-26 18:04:41 +03:00

services_controller.rb

Merge branch 'master' into ce-upstream

2014-10-14 18:23:51 +03:00

snippets_controller.rb

Snippets: public/internal/private

2014-10-09 17:09:53 +03:00

tags_controller.rb

Factor error and success methods from services.

2014-09-21 11:43:05 +02:00

team_members_controller.rb

Merge remote-tracking branch 'origin/master' into ee-7-4

2014-10-02 13:24:59 +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