Merge branch 'master' into gitlab-flavored-markdown

app/assets/stylesheets/sections/issues.scss

@@ -51,25 +51,51 @@
 
 input.check_all_issues { 
   float:left;
-  padding: 8px 0;
-  margin: 14px 0;
+  padding: 0;
+  margin:0;
   margin-right: 10px;
+  position: relative;
+  top: 8px;
+  height: 22px;
+}
+
+.issues_content { 
+  .title { 
+    height: 40px;
+  }
 }
 
 #issues-table-holder { 
+  .issues_filters { 
+    form { 
+      padding:0;
+      margin:0;
+      margin-top:7px
+    }
+  } 
+
   .issues_bulk_update { 
-    padding: 0 5px;
     margin: 0;
     form { 
+      padding:0;
       margin:0;
-      padding-bottom:5px;
+      margin-top:7px
     }
     .update_selected_issues { 
       position:relative;
       top:-2px;
-      margin-left:3px;
+      margin-left:4px;
+      float:left;
     }
-
     
+    .update_issues_text { 
+      padding:3px;
+      line-height: 18px;
+      float:left;
+    }
   }
 }
+
+#update_status { 
+  width:100px;
+}

app/assets/stylesheets/sections/nav.scss

@@ -14,6 +14,7 @@ ul.main_menu {
   background-image: -moz-linear-gradient(#eee 6.6%, #dfdfdf);
   background-image: -o-linear-gradient(#eee 6.6%, #dfdfdf);
   position:relative;
+  overflow:hidden;
   @include shade;
   .count { 
     position: relative;

app/controllers/application_controller.rb

@@ -4,6 +4,7 @@ class ApplicationController < ActionController::Base
   before_filter :set_current_user_for_mailer
   before_filter :check_token_auth
   before_filter :set_current_user_for_observers
+  before_filter :dev_tools if Rails.env == 'development'
 
   protect_from_forgery
 
@@ -142,4 +143,8 @@ class ApplicationController < ActionController::Base
   def render_full_content
     @full_content = true
   end
+
+  def dev_tools
+    Rack::MiniProfiler.authorize_request
+  end
 end

app/helpers/application_helper.rb

@@ -122,7 +122,7 @@ module ApplicationHelper
   end
 
   def markdown(text)
-    @__renderer ||= Redcarpet::Markdown.new(Redcarpet::Render::GitlabHTML.new(self, filter_html: true), {
+    @__renderer ||= Redcarpet::Markdown.new(Redcarpet::Render::GitlabHTML.new(self, filter_html: true, with_toc_data: true), {
       no_intra_emphasis: true,
       tables: true,
       fenced_code_blocks: true,

app/models/web_hook.rb

@@ -11,7 +11,16 @@ class WebHook < ActiveRecord::Base
               message: "should be a valid url" }
 
   def execute(data)
-    WebHook.post(url, body: data.to_json, headers: { "Content-Type" => "application/json" })
+    parsed_url = URI.parse(url)
+    if parsed_url.userinfo.blank?
+      WebHook.post(url, body: data.to_json, headers: { "Content-Type" => "application/json" })
+    else
+      post_url = url.gsub(parsed_url.userinfo+"@", "")
+      WebHook.post(post_url,
+                   body: data.to_json,
+                   headers: { "Content-Type" => "application/json" }, 
+                   basic_auth: {username: parsed_url.user, password: parsed_url.password})
+    end
   end
   
 end

app/views/issues/_show.html.haml

@@ -1,6 +1,7 @@
 %li.wll{ :id => dom_id(issue), :class => issue_css_classes(issue), :url => project_issue_path(issue.project, issue) }
-  .issue_check
-    = check_box_tag dom_id(issue,"selected"), nil, false, 'data-id' => issue.id, :class => "selected_issue", :disabled => !can?(current_user, :modify_issue, issue)
+  - if controller.controller_name == 'issues'
+    .issue_check
+      = check_box_tag dom_id(issue,"selected"), nil, false, 'data-id' => issue.id, :class => "selected_issue", :disabled => !can?(current_user, :modify_issue, issue)
   .right
     - issue.labels.each do |label|
       %span.label.label-issue.grouped

app/views/issues/index.html.haml

@@ -22,13 +22,13 @@
 
       .issues_bulk_update.hide
         = form_tag bulk_update_project_issues_path(@project), :method => :post  do 
-          %span Update selected issues with 
-           
-          = select_tag('update[status]', options_for_select(['open', 'closed']), :prompt => "Status")
-          = select_tag('update[assignee_id]', options_from_collection_for_select(@project.users.all, "id", "name", params[:assignee_id]), :prompt => "Assignee")
-          = select_tag('update[milestone_id]', options_from_collection_for_select(@project.milestones.order("id desc").all, "id", "title", params[:milestone_id]), :prompt => "Milestone")
-          = hidden_field_tag 'update[issues_ids]', []
-          = hidden_field_tag :f, params[:f]
+          %span.update_issues_text Update selected issues with  
+          .left
+            = select_tag('update[status]', options_for_select(['open', 'closed']), :prompt => "Status")
+            = select_tag('update[assignee_id]', options_from_collection_for_select(@project.users.all, "id", "name", params[:assignee_id]), :prompt => "Assignee")
+            = select_tag('update[milestone_id]', options_from_collection_for_select(@project.milestones.order("id desc").all, "id", "title", params[:milestone_id]), :prompt => "Milestone")
+            = hidden_field_tag 'update[issues_ids]', []
+            = hidden_field_tag :f, params[:f]
           = button_tag "Save", :class => "btn update_selected_issues"
       .issues_filters
         .left

app/views/projects/new.html.haml

@@ -6,7 +6,7 @@
 %div.ajax_loader.hide
   %center
     %div.padded= image_tag "ajax_loader.gif"
-    %h3.prepend-top Creating project & repository. Please wait for few minutes
+    %h3.prepend-top Creating project & repository. Please wait a few minutes
 
 :javascript
   $(function(){ new Projects(); });