Dmitriy Zaporozhets ec02cdf205 Merge branch 'master' into mr-filter-by-title ...

Conflicts:
	app/controllers/projects/merge_requests_controller.rb

2015-03-12 16:29:03 -07: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

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

2015-02-20 17:20:03 +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

Upgrade to Rails 4.1.9

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

forks_controller.rb

Merge branch 'master' into rails-4.1.9

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

graphs_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

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

Use same constant for amount of items per page

2015-03-12 15:37:00 -07: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

Merge branch 'master' into mr-filter-by-title

2015-03-12 16:29:03 -07: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

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

Merge branch 'master' into rails-4.1.9

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

repositories_controller.rb

Introduce shortcuts for routing helpers

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

services_controller.rb

Merge branch 'emails-on-push'

2015-03-08 16:49:11 -07:00

snippets_controller.rb

Upgrade to Rails 4.1.9

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

tags_controller.rb

Use same constant for amount of items per page

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

team_members_controller.rb

Add brakeman rake task and improve code security

2015-03-02 18:11:50 -08: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

Use same constant for amount of items per page

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