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

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

Conflicts:
	app/controllers/admin/application_settings_controller.rb
	app/controllers/groups/group_members_controller.rb
	app/controllers/projects/deploy_keys_controller.rb
	app/controllers/projects/project_members_controller.rb
	app/models/concerns/mentionable.rb
	app/models/project.rb
	app/models/project_team.rb
	app/models/service.rb
	app/views/admin/application_settings/_form.html.haml
	app/views/admin/groups/show.html.haml
	app/views/groups/group_members/_new_group_member.html.haml
	config/initializers/1_settings.rb
	db/schema.rb
	lib/gitlab/reference_extractor.rb
	spec/lib/gitlab/reference_extractor_spec.rb

2015-04-15 19:22:57 +03:00

..

application_controller.rb

Upgrade to Rails 4.1.9

2015-02-14 11:09:23 -07:00

avatars_controller.rb

Introduce shortcuts for routing helpers

2015-02-25 19:34:16 -08:00

blame_controller.rb

Reuse blob object fetched by Gitlab::Git::Blame.

2015-03-13 13:49:27 +01:00

blob_controller.rb

Web Editor: save to new branch

2015-02-24 11:43:20 +02:00

branches_controller.rb

Use same constant for amount of items per page

2015-03-12 15:37:00 -07:00

commit_controller.rb

Move 'require_non_empty_project' filter to front so 'assign_ref_vars' doesn't 404.

2015-02-20 17:20:03 +01:00

commits_controller.rb

Move 'require_non_empty_project' filter to front so 'assign_ref_vars' doesn't 404.

2015-02-20 17:20:03 +01:00

compare_controller.rb

Merge branch 'master' into rails-4.1.9

2015-02-21 12:55:28 -07:00

deploy_keys_controller.rb

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

2015-04-15 19:22:57 +03:00

forks_controller.rb

Merge branch 'master' into rails-4.1.9

2015-02-21 12:55:28 -07:00

git_hooks_controller.rb

git hook refactoring

2015-03-26 13:38:26 +02:00

graphs_controller.rb

Everything from gitlab_git is already UTF-8.

2015-03-13 13:49:27 +01:00

group_links_controller.rb

Update path helpers and routes for Rails 4.1.9

2015-02-27 18:21:15 -07:00

hooks_controller.rb

Upgrade to Rails 4.1.9

2015-02-14 11:09:23 -07:00

imports_controller.rb

Fixing import redirect loop

2015-03-09 16:36:41 -07:00

issues_controller.rb

tests

2015-03-16 21:38:41 +02:00

labels_controller.rb

Use same constant for amount of items per page

2015-03-12 15:37:00 -07:00

merge_requests_controller.rb

Refactor GitAccess to use instance variables.

2015-03-24 14:11:48 +01:00

milestones_controller.rb

Use same constant for amount of items per page

2015-03-12 15:37:00 -07:00

network_controller.rb

Move 'require_non_empty_project' filter to front so 'assign_ref_vars' doesn't 404.

2015-02-20 17:20:03 +01:00

notes_controller.rb

Fix bug where editing a comment with "+1" or "-1" would cause a server error

2015-03-02 15:26:00 -08:00

project_members_controller.rb

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

2015-04-15 19:22:57 +03:00

protected_branches_controller.rb

Upgrade to Rails 4.1.9

2015-02-14 11:09:23 -07:00

raw_controller.rb

Move 'require_non_empty_project' filter to front so 'assign_ref_vars' doesn't 404.

2015-02-20 17:20:03 +01:00

refs_controller.rb

Render a 404 when RefsController#logs_tree gets an HTML request

2015-04-06 23:08:28 -04:00

repositories_controller.rb

Add tests.

2015-03-31 13:37:21 +02:00

services_controller.rb

Add back jira_issue_transition_id to list of permited params.

2015-03-20 08:57:31 -07:00

snippets_controller.rb

Enforce restricted visibilities for snippets

2015-03-08 17:57:08 -06:00

tags_controller.rb

Move tag deletion to service and execute hooks and services.

2015-03-13 16:07:08 +01:00

tree_controller.rb

Merge branch 'master' into rails-4.1.9

2015-02-21 12:55:28 -07:00

uploads_controller.rb

Satisfy Rubocop.

2015-02-20 16:04:03 +01:00

wikis_controller.rb

Fix bug where Wiki pages that include a '/' were no longer accessible

2015-04-07 09:10:11 -07:00