migrated to bootstrap 2

app/views/merge_requests/_form.html.haml

@@ -1,29 +1,29 @@
-= form_for [@project, @merge_request] do |f|
+= form_for [@project, @merge_request], :html => { :class => "new_merge_request form-horizontal" } do |f|
   -if @merge_request.errors.any?
     .alert-message.block-message.error
       %ul
         - @merge_request.errors.full_messages.each do |msg|
           %li= msg
 
-  .clearfix
-    = f.label :title
-    .input= f.text_area :title, :class => "xxlarge", :maxlength => 255, :rows => 5
-  .clearfix
-    = f.label :source_branch, "From"
-    .input
+  .control-group
+    = f.label :title, :class => "control-label"
+    .controls= f.text_area :title, :class => "input-xxlarge", :maxlength => 255, :rows => 5
+  .control-group
+    = f.label :source_branch, "From", :class => "control-label"
+    .controls
       = f.select(:source_branch, @project.heads.map(&:name), { :include_blank => "Select branch" }, :style => "width:250px")
       .mr_source_commit
-  .clearfix
-    = f.label :target_branch, "To"
-    .input
+  .control-group
+    = f.label :target_branch, "To", :class => "control-label"
+    .controls
       = f.select(:target_branch, @project.heads.map(&:name), { :include_blank => "Select branch" }, :style => "width:250px")
       .mr_target_commit
   .clearfix
-    = f.label :assignee_id, "Assign to"
-    .input= f.select(:assignee_id, @project.users.all.collect {|p| [ p.name, p.id ] }, { :include_blank => "Select user" }, :style => "width:250px")
+    = f.label :assignee_id, "Assign to", :class => "control-label"
+    .controls= f.select(:assignee_id, @project.users.all.collect {|p| [ p.name, p.id ] }, { :include_blank => "Select user" }, :style => "width:250px")
 
-  .actions
-    = f.submit 'Save', :class => "primary btn"
+  .form-actions
+    = f.submit 'Save', :class => "btn-primary btn"
     - if @merge_request.new_record?
       = link_to project_merge_requests_path(@project), :class => "btn" do 
         Cancel

app/views/merge_requests/index.html.haml

@@ -8,7 +8,7 @@
 
 .ui-box
   .title
-    %ul.pills
+    %ul.nav.nav-pills
       %li{:class => ("active" if (params[:f] == "0" || !params[:f]))}
         = link_to project_merge_requests_path(@project, :f => 0) do 
           Open

app/views/merge_requests/show.html.haml

@@ -56,7 +56,7 @@
 = render "merge_requests/commits"
 
 - unless @commits.empty?
-  .tabs
+  .nav.nav-tabs
     %li.active
       = link_to "#notes", :class => "merge-notes-tab tab" do 
         Notes