app/controllers/projects · db880cf39f9a68bb7d18b028fe6c1b843d5ca6cb · Forest Godfrey / gitlab-ce

Merge branch 'remove_source_branch_button' of… · 1a17289b

authored Apr 06, 2014

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

1a17289b

Name	Last commit	Last update
..
application_controller.rb		Loading commit data...
base_tree_controller.rb		Loading commit data...
blame_controller.rb		Loading commit data...
blob_controller.rb		Loading commit data...
branches_controller.rb		Loading commit data...
commit_controller.rb		Loading commit data...
commits_controller.rb		Loading commit data...
compare_controller.rb		Loading commit data...
deploy_keys_controller.rb		Loading commit data...
edit_tree_controller.rb		Loading commit data...
graphs_controller.rb		Loading commit data...
hooks_controller.rb		Loading commit data...
issues_controller.rb		Loading commit data...
labels_controller.rb		Loading commit data...
merge_requests_controller.rb		Loading commit data...
milestones_controller.rb		Loading commit data...
network_controller.rb		Loading commit data...
new_tree_controller.rb		Loading commit data...
notes_controller.rb		Loading commit data...
protected_branches_controller.rb		Loading commit data...
raw_controller.rb		Loading commit data...
refs_controller.rb		Loading commit data...
repositories_controller.rb		Loading commit data...
services_controller.rb		Loading commit data...
snippets_controller.rb		Loading commit data...
tags_controller.rb		Loading commit data...
team_members_controller.rb		Loading commit data...
tree_controller.rb		Loading commit data...
walls_controller.rb		Loading commit data...
wikis_controller.rb		Loading commit data...