Dmitriy Zaporozhets 3a9682a3d7 Merge dev.gitlab.org:gitlab/gitlabhq into upstream-ce ...

Conflicts:
	VERSION
	app/helpers/selects_helper.rb
	app/models/project.rb
	app/views/devise/sessions/new.html.haml
	app/views/groups/_settings_nav.html.haml
	app/views/layouts/nav/_admin.html.haml
	app/views/profiles/keys/_key.html.haml
	app/views/profiles/keys/index.html.haml
	app/views/profiles/keys/show.html.haml
	app/views/projects/merge_requests/show/_mr_accept.html.haml
	config/routes.rb
	db/schema.rb
	doc/api/projects.md
	features/steps/shared/paths.rb

2015-01-08 20:37:35 -08:00

..

application_controller.rb

Refactor issues and merge requests lists

2014-12-23 18:49:39 +02:00

base_tree_controller.rb

remove auth duplication

2014-11-05 11:04:08 +02:00

blame_controller.rb

remove auth duplication

2014-11-05 11:04:08 +02:00

blob_controller.rb

remove auth duplication

2014-11-05 11:04:08 +02:00

branches_controller.rb

Sanitize branch name and ref name

2014-11-13 16:20:43 +01:00

commit_controller.rb

remove auth duplication

2014-11-05 11:04:08 +02:00

commits_controller.rb

remove auth duplication

2014-11-05 11:04:08 +02:00

compare_controller.rb

remove auth duplication

2014-11-05 11:04:08 +02:00

deploy_keys_controller.rb

Use @project on controllers, don't call method

2014-10-19 23:36:23 +02:00

edit_tree_controller.rb

Merge pull request #8030 from cirosantilli/factor-authorize

2014-10-21 11:43:12 +03:00

forks_controller.rb

Select namespace where to fork project

2014-11-13 22:06:19 +02:00

git_hooks_controller.rb

Ability to block commits with certain filenames

2014-11-03 18:22:43 +02:00

graphs_controller.rb

remove auth duplication

2014-11-05 11:04:08 +02:00

group_links_controller.rb

Fix tests for share project with group

2014-12-30 12:48:29 +02:00

hooks_controller.rb

Handle web hook exception

2014-12-04 15:07:01 +02:00

imports_controller.rb

Move projects import to separate resource. Add bare repo creation to repository controller

2014-11-30 00:50:25 +02:00

issues_controller.rb

Refactor issuable list pages

2014-12-24 11:04:33 +02: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

Merge branch 'master' into ee-from-ce

2014-12-26 15:05:43 +02:00

milestones_controller.rb

Restyle and refactor milestones filter

2015-01-06 12:32:04 -08:00

network_controller.rb

remove auth duplication

2014-11-05 11:04:08 +02:00

new_tree_controller.rb

Factor authorize_push! and authorize_code_access!

2014-10-13 21:31:49 +02:00

notes_controller.rb

Add Markdown preview to more forms

2014-10-15 23:52:33 -05:00

protected_branches_controller.rb

Update branch status with ajax call.

2014-12-26 15:37:04 +01:00

raw_controller.rb

remove auth duplication

2014-11-05 11:04:08 +02:00

refs_controller.rb

remove auth duplication

2014-11-05 11:04:08 +02:00

repositories_controller.rb

Move projects import to separate resource. Add bare repo creation to repository controller

2014-11-30 00:50:25 +02:00

services_controller.rb

Teamcity interaction using 8.1 rest api

2014-12-23 12:38:25 -05:00

snippets_controller.rb

Sanitize snippet file name in raw headers

2014-12-12 13:28:48 +02:00

tags_controller.rb

remove auth duplication

2014-11-05 11:04:08 +02:00

team_members_controller.rb

Add removal and addition of the user to the group membership to audit events.

2014-11-21 16:51:06 +01: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