Dmitriy Zaporozhets 1a17289bd3 Merge branch 'remove_source_branch_button' of https://github.com/jacob-carlborg/gitlabhq into jacob-carlborg-remove_source_branch_button ... Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: app/assets/javascripts/merge_requests.js.coffee app/assets/stylesheets/sections/merge_requests.scss app/controllers/projects/merge_requests_controller.rb		2014-04-06 13:54:54 +03:00
..
assets	Merge branch 'remove_source_branch_button' of https://github.com/jacob-carlborg/gitlabhq into jacob-carlborg-remove_source_branch_button	2014-04-06 13:54:54 +03:00
controllers	Merge branch 'remove_source_branch_button' of https://github.com/jacob-carlborg/gitlabhq into jacob-carlborg-remove_source_branch_button	2014-04-06 13:54:54 +03:00
finders	Fix deprecation warning output	2014-03-24 15:00:01 +02:00
helpers	Merge branch 'master' into request/relative_submodules	2014-04-04 23:50:39 +02:00
mailers	Fix the merge notification email not being sent	2014-03-24 15:11:35 +01:00
models	Fix MR fork validation and services load	2014-04-03 10:36:10 +03:00
observers	Only send email when project access level changes.	2014-04-03 13:24:05 +02:00
services	Add note when MR assignee changes. Add more tests to MR services	2014-04-03 18:16:05 +03:00
uploaders
views	Merge branch 'remove_source_branch_button' of https://github.com/jacob-carlborg/gitlabhq into jacob-carlborg-remove_source_branch_button	2014-04-06 13:54:54 +03:00
workers	Merge branch 'import-timeout' of https://dev.gitlab.org/dzaporozhets/gitlabhq into dzaporozhets/gitlabhq-import-timeout	2014-03-14 12:00:21 +02:00