Commit 5b9a1d6781613e3420575b3440e7ffe92cbb5c8f

allow to create merge request using post method

Commit diff

app/controllers/merge_requests_controller.rb

 
2626 def create
2727 @merge_request = @repository.proposed_merge_requests.new(params[:merge_request])
2828 @merge_request.user = current_user
29 if @merge_request.save
30 flash[:success] = %Q{You sent a merge request to "#{@merge_request.target_repository.name}"}
31 redirect_to project_repository_path(@project, @repository) and return
32 else
33 @repositories = @project.repositories.find(:all, :conditions => ["id != ?", @repository.id])
34 render :action => "new"
29 respond_to do |format|
30 if @merge_request.save
31 format.html {
32 flash[:success] = %Q{You sent a merge request to "#{@merge_request.target_repository.name}"}
33 redirect_to project_repository_path(@project, @repository) and return
34 }
35 format.xml { render :xml => @merge_request, :status => :created }
36 else
37 format.html {
38 @repositories = @project.repositories.find(:all, :conditions => ["id != ?", @repository.id])
39 render :action => "new"
40 }
41 format.xml { render :xml => @merge_request.errors, :status => :unprocessable_entity }
42 end
3543 end
3644 end
3745
toggle raw diff

app/models/project.rb

 
109109 builder.repositories :type => "array" do
110110 repositories.each { |repo|
111111 builder.repository do
112 builder.id repo.id
112113 builder.name repo.name
113114 builder.owner repo.user.login
114115 end
toggle raw diff

config/routes.rb

 
3838 }, :as => "repos") do |repo|
3939 repo.resources :committers, :name_prefix => nil, :collection => {:auto_complete_for_user_login => :post, :list => :get, :create => :post}
4040 repo.resources :comments, :member => { :commmit => :get }
41 repo.resources :merge_requests, :member => { :resolve => :put }
41 repo.resources :merge_requests, :member => { :resolve => :put }, :collection => { :create => :post }
4242 repo.commit_comment "comments/commit/:sha", :controller => "comments",
4343 :action => "commit", :conditions => { :method => :get }
4444
toggle raw diff