Merge branch 'master' into karlhungus-mr-on-fork

Conflicts:
	app/contexts/filter_context.rb
	app/contexts/search_context.rb
	app/models/merge_request.rb
	app/models/note.rb
	app/views/shared/_merge_requests.html.haml
	spec/controllers/commit_controller_spec.rb
	spec/services/notification_service_spec.rb

9 files changed, 21 insertions, 22 deletions

diff --git a/app/assets/javascripts/behaviors/toggler_behavior.coffee b/app/assets/javascripts/behaviors/toggler_behavior.coffee
index d2181e7b759..7e438c51c1c 100644
--- a/app/assets/javascripts/behaviors/toggler_behavior.coffee
+++ b/app/assets/javascripts/behaviors/toggler_behavior.coffee
@@ -11,3 +11,7 @@ $ ->
     container = $(".js-toggle-visibility-container")
     container.toggleClass("hide")
     e.preventDefault()
+  
+  $("body").on "click", ".js-toggle-button", (e) ->
+    $(@).closest(".js-toggle-container").find(".js-toggle-content").toggle()
+    e.preventDefault()
diff --git a/app/assets/javascripts/branch-graph.js.coffee b/app/assets/javascripts/branch-graph.js.coffee
index 6e069f264f1..318538509a5 100644
--- a/app/assets/javascripts/branch-graph.js.coffee
+++ b/app/assets/javascripts/branch-graph.js.coffee
@@ -62,22 +62,22 @@ class BranchGraph
     cuday = 0
     cumonth = ""
 
-    r.rect(0, 0, 26, @barHeight).attr fill: "#222"
-    r.rect(26, 0, 20, @barHeight).attr fill: "#444"
+    r.rect(0, 0, 40, @barHeight).attr fill: "#222"
+    r.rect(40, 0, 30, @barHeight).attr fill: "#444"
 
     for day, mm in @days
       if cuday isnt day[0]
         # Dates
-        r.text(36, @offsetY + @unitTime * mm, day[0])
+        r.text(55, @offsetY + @unitTime * mm, day[0])
           .attr(
             font: "12px Monaco, monospace"
-            fill: "#DDD"
+            fill: "#BBB"
           )
         cuday = day[0]
 
       if cumonth isnt day[1]
         # Months
-        r.text(13, @offsetY + @unitTime * mm, day[1])
+        r.text(20, @offsetY + @unitTime * mm, day[1])
           .attr(
             font: "12px Monaco, monospace"
             fill: "#EEE"
diff --git a/app/assets/javascripts/dispatcher.js.coffee b/app/assets/javascripts/dispatcher.js.coffee
index d490233c2ec..b0b947dd476 100644
--- a/app/assets/javascripts/dispatcher.js.coffee
+++ b/app/assets/javascripts/dispatcher.js.coffee
@@ -39,7 +39,9 @@ class Dispatcher
 
     switch path.first()
       when 'admin' then new Admin()
-      when 'wikis' then new Wikis()
+      when 'projects'
+        new Wikis() if path[1] == 'wikis'
+
 
   initSearch: ->
     autocomplete_json = $('.search-autocomplete-json').data('autocomplete-opts')
diff --git a/app/assets/javascripts/extensions/jquery.js.coffee b/app/assets/javascripts/extensions/jquery.js.coffee
index 8a997fe318e..40fb6cb9fc3 100644
--- a/app/assets/javascripts/extensions/jquery.js.coffee
+++ b/app/assets/javascripts/extensions/jquery.js.coffee
@@ -7,3 +7,7 @@ $.fn.enableButton = ->
   $(@).removeAttr('disabled').
     removeClass('disabled')
 
+$.fn.disableButton = ->
+  $(@).attr('disabled', 'disabled').
+    addClass('disabled')
+
diff --git a/app/assets/javascripts/gfm_auto_complete.js.coffee b/app/assets/javascripts/gfm_auto_complete.js.coffee
index c8c57b91e03..e22761e57a4 100644
--- a/app/assets/javascripts/gfm_auto_complete.js.coffee
+++ b/app/assets/javascripts/gfm_auto_complete.js.coffee
@@ -44,7 +44,7 @@ GitLab.GfmAutoComplete =
       tpl: @Issues.template
       callbacks:
         before_save: (issues) ->
-          $.map issues, (i) -> id: i.id, title: i.title, search: "#{i.id} #{i.title}"
+          $.map issues, (i) -> id: i.id, title: sanitize(i.title), search: "#{i.id} #{i.title}"
 
     input.one "focus", =>
       $.getJSON(@dataSource).done (data) ->
diff --git a/app/assets/javascripts/main.js.coffee b/app/assets/javascripts/main.js.coffee
index f65211c5d13..f22c7a28f35 100644
--- a/app/assets/javascripts/main.js.coffee
+++ b/app/assets/javascripts/main.js.coffee
@@ -119,7 +119,7 @@ $ ->
 
 
   # Commit show suppressed diff
-  $(".supp_diff_link").bind "click", ->
+  $(".content").on "click", ".supp_diff_link", ->
     $(@).next('table').show()
     $(@).remove()
 
diff --git a/app/assets/javascripts/merge_requests.js.coffee b/app/assets/javascripts/merge_requests.js.coffee
index 769a940959b..153198ca5c5 100644
--- a/app/assets/javascripts/merge_requests.js.coffee
+++ b/app/assets/javascripts/merge_requests.js.coffee
@@ -22,12 +22,7 @@ class MergeRequest
     this.$('.show-all-commits').on 'click', =>
       this.showAllCommits()
     
-    modal = $('#modal_merge_info').modal modal: true, show:false
-
-    $('.how_to_merge_link').bind "click", ->
-      modal.show()
-    $('.modal-header .close').bind "click", ->
-      modal.hide()
+    modal = $('#modal_merge_info').modal(show: false)
 
   # Local jQuery finder
   $: (selector) ->
diff --git a/app/assets/javascripts/notes.js b/app/assets/javascripts/notes.js
index 5e1e4dc4113..5225623c1f0 100644
--- a/app/assets/javascripts/notes.js
+++ b/app/assets/javascripts/notes.js
@@ -227,10 +227,11 @@ var NoteList = {
     // Show the attachment delete link
     note.find(".js-note-attachment-delete").show();
 
+    GitLab.GfmAutoComplete.setup();
+
     var form = note.find(".note-edit-form");
     form.show();
 
-
     var textarea = form.find("textarea");
     var p = $("<p></p>").text(textarea.val());
     var hidden_div = $('<div class="note-original-content"></div>').append(p);
diff --git a/app/assets/javascripts/wikis.js.coffee b/app/assets/javascripts/wikis.js.coffee
index f2867c8026e..17e790e5b7c 100644
--- a/app/assets/javascripts/wikis.js.coffee
+++ b/app/assets/javascripts/wikis.js.coffee
@@ -1,10 +1,5 @@
 class Wikis
   constructor: ->
-    modal = $('#modal-new-wiki').modal({modal: true, show:false})
-
-    $('.add-new-wiki').bind "click", ->
-      modal.show()
-
     $('.build-new-wiki').bind "click", ->
       field = $('#new_wiki_path')
       slug = field.val()
@@ -13,7 +8,5 @@ class Wikis
       if(slug.length > 0)
         location.href = path + "/" + slug
 
-    $('.modal-header .close').bind "click", ->
-      modal.hide()
 
 @Wikis = Wikis