Revert "Fix merge conflicts - squashed commit"

This reverts commit 3e991230.

app/assets/javascripts/blob/blob_gitignore_selector.js.coffee

-class @BlobGitignoreSelector
-  constructor: (opts) ->
-    {
-      @dropdown
-      @editor
-      @$wrapper        = @dropdown.closest('.gitignore-selector')
-      @$filenameInput  = $('#file_name')
-      @data           = @dropdown.data('filenames')
-    } = opts
-
-    @dropdown.glDropdown(
-      data: @data,
-      filterable: true,
-      selectable: true,
-      search:
-        fields: ['name']
-      clicked: @onClick
-      text: (gitignore) ->
-        gitignore.name
-    )
-
-    @toggleGitignoreSelector()
-    @bindEvents()
-
-  bindEvents: ->
-    @$filenameInput
-      .on 'keyup blur', (e) =>
-        @toggleGitignoreSelector()
-
-  toggleGitignoreSelector: ->
-    filename = @$filenameInput.val() or $('.editor-file-name').text().trim()
-    @$wrapper.toggleClass 'hidden', filename isnt '.gitignore'
-
-  onClick: (item, el, e) =>
-    e.preventDefault()
-    @requestIgnoreFile(item.name)
-
-  requestIgnoreFile: (name) ->
-    Api.gitignoreText name, @requestIgnoreFileSuccess.bind(@)
-
-  requestIgnoreFileSuccess: (gitignore) ->
-    @editor.setValue(gitignore.content, 1)
-    @editor.focus()
-
-class @BlobGitignoreSelectors
-  constructor: (opts) ->
-    {
-      @$dropdowns = $('.js-gitignore-selector')
-      @editor
-    } = opts
-
-    @$dropdowns.each (i, dropdown) =>
-      $dropdown = $(dropdown)
-
-      new BlobGitignoreSelector(
-        dropdown: $dropdown,
-        editor: @editor
-      )

app/assets/javascripts/blob/edit_blob.js.coffee

@@ -13,7 +13,6 @@ class @EditBlob
     @initModePanesAndLinks()
     new BlobLicenseSelector(@editor)
-    new BlobGitignoreSelectors(editor: @editor)
   initModePanesAndLinks: ->
     @$editModePanes = $(".js-edit-mode-pane")

app/assets/javascripts/calendar.js.coffee

+class @Calendar
+  constructor: (timestamps, starting_year, starting_month, calendar_activities_path) ->
+    cal = new CalHeatMap()
+    cal.init
+      itemName: ["contribution"]
+      data: timestamps
+      start: new Date(starting_year, starting_month)
+      domainLabelFormat: "%b"
+      id: "cal-heatmap"
+      domain: "month"
+      subDomain: "day"
+      range: 12
+      tooltip: true
+      label:
+        position: "top"
+      legend: [
+        0
+        10
+        20
+        30
+      ]
+      legendCellPadding: 3
+      cellSize: $('.user-calendar').width() / 73
+      onClick: (date, count) ->
+        formated_date = date.getFullYear() + "-" + (date.getMonth()+1) + "-" + date.getDate()
+        $.ajax
+          url: calendar_activities_path
+          data:
+            date: formated_date
+          cache: false
+          dataType: "html"
+          success: (data) ->
+            $(".user-calendar-activities").html data
+

app/assets/javascripts/ci/application.js.coffee

+# This is a manifest file that'll be compiled into application.js, which will include all the files
+# listed below.
+#
+# Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
+# or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path.
+#
+# It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
+# the compiled file.
+#
+# WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD
+# GO AFTER THE REQUIRES BELOW.
+#
 #= require pager
 #= require jquery_nested_form
 #= require_tree .
+#
+$(document).on 'click', '.edit-runner-link', (event) ->
+  event.preventDefault()
+
+  descr = $(this).closest('.runner-description').first()
+  descr.addClass('hide')
+  form = descr.next('.runner-description-form')
+  descrInput = form.find('input.description')
+  originalValue = descrInput.val()
+  form.removeClass('hide')
+  form.find('.cancel').on 'click', (event) ->
+    event.preventDefault()
+
+    form.addClass('hide')
+    descrInput.val(originalValue)
+    descr.removeClass('hide')
 $(document).on 'click', '.assign-all-runner', ->
   $(this).replaceWith('<i class="fa fa-refresh fa-spin"></i> Assign in progress..')

app/assets/javascripts/ci/build.coffee

 class CiBuild
   @interval: null
-  @state: null
-  constructor: (build_url, build_status, build_state) ->
+  constructor: (build_url, build_status) ->
     clearInterval(CiBuild.interval)
-    @state = build_state
-
     @initScrollButtonAffix()
     if build_status == "running" || build_status == "pending"
@@ -28,22 +25,15 @@ class CiBuild
       #
       CiBuild.interval = setInterval =>
         if window.location.href.split("#").first() is build_url
-          last_state = @state
           $.ajax
-            url: build_url + "/trace.json?state=" + encodeURIComponent(@state)
+            url: build_url
             dataType: "json"
-            success: (log) =>
-              return unless last_state is @state
-
-              if log.state and log.status is "running"
-                @state = log.state
-                if log.append
-                  $('.fa-refresh').before log.html
-                else
-                  $('#build-trace code').html log.html
-                  $('#build-trace code').append '<i class="fa fa-refresh fa-spin"/>'
+            success: (build) =>
+              if build.status == "running"
+                $('#build-trace code').html build.trace_html
+                $('#build-trace code').append '<i class="fa fa-refresh fa-spin"/>'
                 @checkAutoscroll()
-              else if log.status isnt build_status
+              else if build.status != build_status
                 Turbolinks.visit build_url
       , 4000

app/assets/javascripts/dispatcher.js.coffee

@@ -16,6 +16,7 @@ class Dispatcher
     shortcut_handler = null
     switch page
       when 'projects:issues:index'
+        Issues.init()
         Issuable.init()
         shortcut_handler = new ShortcutsNavigation()
       when 'projects:issues:show'
@@ -118,7 +119,7 @@ class Dispatcher
             new UsersSelect()
           when 'projects'
             new NamespaceSelect()
-      when 'dashboard', 'root'
+      when 'dashboard'
         shortcut_handler = new ShortcutsDashboardNavigation()
       when 'profiles'
         new Profile()

app/assets/javascripts/due_date_select.js.coffee

@@ -11,7 +11,6 @@ class @DueDateSelect
       $block = $dropdown.closest('.block')
       $selectbox = $dropdown.closest('.selectbox')
       $value = $block.find('.value')
-      $valueContent = $block.find('.value-content')
       $sidebarValue = $('.js-due-date-sidebar-value', $block)
       fieldName = $dropdown.data('field-name')
@@ -24,15 +23,11 @@ class @DueDateSelect
           $value.removeAttr('style')
       )
-      addDueDate = (isDropdown) ->
+      addDueDate = ->
         # Create the post date
         value = $("input[name='#{fieldName}']").val()
-
-        if value isnt ''
-          date = new Date value.replace(new RegExp('-', 'g'), ',')
-          mediumDate = $.datepicker.formatDate 'M d, yy', date
-        else
-          mediumDate = 'None'
+        date = new Date value.replace(new RegExp('-', 'g'), ',')
+        mediumDate = $.datepicker.formatDate 'M d, yy', date
         data = {}
         data[abilityName] = {}
@@ -44,35 +39,23 @@ class @DueDateSelect
           data: data
           beforeSend: ->
             $loading.fadeIn()
-            if isDropdown
-              $dropdown.trigger('loading.gl.dropdown')
-              $selectbox.hide()
+            $dropdown.trigger('loading.gl.dropdown')
+            $selectbox.hide()
             $value.removeAttr('style')
-            $valueContent.html(mediumDate)
+            $value.html(mediumDate)
             $sidebarValue.html(mediumDate)
-
-            if value isnt ''
-              $('.js-remove-due-date-holder').removeClass 'hidden'
-            else
-              $('.js-remove-due-date-holder').addClass 'hidden'
         ).done (data) ->
-          if isDropdown
-            $dropdown.trigger('loaded.gl.dropdown')
-            $dropdown.dropdown('toggle')
+          $dropdown.trigger('loaded.gl.dropdown')
+          $dropdown.dropdown('toggle')
           $loading.fadeOut()
-      $block.on 'click', '.js-remove-due-date', (e) ->
-        e.preventDefault()
-        $("input[name='#{fieldName}']").val ''
-        addDueDate(false)
-
       $datePicker.datepicker(
         dateFormat: 'yy-mm-dd',
         defaultDate: $("input[name='#{fieldName}']").val()
         altField: "input[name='#{fieldName}']"
         onSelect: ->
-          addDueDate(true)
+          addDueDate()
       )
     $(document)

app/assets/javascripts/gfm_auto_complete.js.coffee

@@ -18,10 +18,6 @@ GitLab.GfmAutoComplete =
   Issues:
     template: '<li><small>${id}</small> ${title}</li>'
-  # Milestones
-  Milestones:
-    template: '<li>${title}</li>'
-
   # Add GFM auto-completion to all input fields, that accept GFM input.
   setup: (wrap) ->
     @input = $('.js-gfm-input')
@@ -85,19 +81,6 @@ GitLab.GfmAutoComplete =
             title:  sanitize(i.title)
             search: "#{i.iid} #{i.title}"
-    @input.atwho
-      at: '%'
-      alias: 'milestones'
-      searchKey: 'search'
-      displayTpl: @Milestones.template
-      insertTpl: '${atwho-at}"${title}"'
-      callbacks:
-        beforeSave: (milestones) ->
-          $.map milestones, (m) ->
-            id:     m.iid
-            title:  sanitize(m.title)
-            search: "#{m.title}"
-
     @input.atwho
       at: '!'
       alias: 'mergerequests'
@@ -122,8 +105,6 @@ GitLab.GfmAutoComplete =
     @input.atwho 'load', '@', data.members
     # load issues
     @input.atwho 'load', 'issues', data.issues
-    # load milestones
-    @input.atwho 'load', 'milestones', data.milestones
     # load merge requests
     @input.atwho 'load', 'mergerequests', data.mergerequests
     # load emojis

app/assets/javascripts/gl_dropdown.js.coffee

@@ -60,36 +60,9 @@ class GitLabDropdownFilter
       results = data
       if search_text isnt ''
-        # When data is an array of objects therefore [object Array] e.g.
-        # [
-        #   { prop: 'foo' },
-        #   { prop: 'baz' }
-        # ]
-        if _.isArray(data)
-          results = fuzzaldrinPlus.filter(data, search_text,
-            key: @options.keys
-          )
-        else
-          # If data is grouped therefore an [object Object]. e.g.
-          # {
-          #   groupName1: [
-          #     { prop: 'foo' },
-          #     { prop: 'baz' }
-          #   ],
-          #   groupName2: [
-          #     { prop: 'abc' },
-          #     { prop: 'def' }
-          #   ]
-          # }
-          if gl.utils.isObject data
-            results = {}
-            for key, group of data
-              tmp = fuzzaldrinPlus.filter(group, search_text,
-                key: @options.keys
-              )
-
-              if tmp.length
-                results[key] = tmp.map (item) -> item
+        results = fuzzaldrinPlus.filter(data, search_text,
+          key: @options.keys
+        )
       @options.callback results
     else
@@ -168,9 +141,8 @@ class GitLabDropdown
     searchFields = if @options.search then @options.search.fields else [];
     if @options.data
-      # If we provided data
-      # data could be an array of objects or a group of arrays
-      if _.isObject(@options.data) and not _.isFunction(@options.data)
+      # If data is an array
+      if _.isArray @options.data
         @fullData = @options.data
         @parseData @options.data
       else
@@ -258,33 +230,19 @@ class GitLabDropdown
   parseData: (data) ->
     @renderedData = data
+    # Render each row
+    html = $.map data, (obj) =>
+      return @renderItem(obj)
+
     if @options.filterable and data.length is 0
       # render no matching results
       html = [@noResults()]
-    else
-      # Handle array groups
-      if gl.utils.isObject data
-        html = []
-        for name, groupData of data
-          # Add header for each group
-          html.push(@renderItem(header: name, name))
-
-          @renderData(groupData, name)
-            .map (item) ->
-              html.push item
-      else
-        # Render each row
-        html = @renderData(data)
     # Render the full menu
     full_html = @renderMenu(html.join(""))
     @appendMenu(full_html)
-  renderData: (data, group = false) ->
-    data.map (obj, index) =>
-      return @renderItem(obj, group, index)
-
   shouldPropagate: (e) =>
     if @options.multiSelect
       $target = $(e.target)
@@ -341,10 +299,11 @@ class GitLabDropdown
     selector = '.dropdown-content'
     if @dropdown.find(".dropdown-toggle-page").length
       selector = ".dropdown-page-one .dropdown-content"
+
     $(selector, @dropdown).html html
   # Render the row
-  renderItem: (data, group = false, index = false) ->
+  renderItem: (data) ->
     html = ""
     # Divider
@@ -387,13 +346,8 @@ class GitLabDropdown
       if @highlight
         text = @highlightTextMatches(text, @filterInput.val())
-      if group
-        groupAttrs = "data-group='#{group}' data-index='#{index}'"
-      else
-        groupAttrs = ''
-
       html = "<li>
-        <a href='#{url}' #{groupAttrs} class='#{cssClass}'>
+        <a href='#{url}' class='#{cssClass}'>
           #{text}
         </a>
       </li>"
@@ -423,15 +377,9 @@ class GitLabDropdown
   rowClicked: (el) ->
     fieldName = @options.fieldName
+    selectedIndex = el.parent().index()
     if @renderedData
-      groupName = el.data('group')
-      if groupName
-        selectedIndex = el.data('index')
-        selectedObject = @renderedData[groupName][selectedIndex]
-      else
-        selectedIndex = el.closest('li').index()
-        selectedObject = @renderedData[selectedIndex]
-
+      selectedObject = @renderedData[selectedIndex]
     value = if @options.id then @options.id(selectedObject, el) else selectedObject.id
     field = @dropdown.parent().find("input[name='#{fieldName}'][value='#{value}']")
     if el.hasClass(ACTIVE_CLASS)
@@ -512,7 +460,7 @@ class GitLabDropdown
         return false
       if currentKeyCode is 13
-        @selectRowAtIndex if currentIndex < 0 then 0 else currentIndex
+        @selectRowAtIndex currentIndex
   removeArrayKeyEvent: ->
     $('body').off 'keydown'

app/assets/javascripts/graphs/application.js.coffee

-# This is a manifest file that'll be compiled into including all the files listed below.
-# Add new JavaScript/Coffee code in separate files in this directory and they'll automatically
-# be included in the compiled file accessible from http://example.com/assets/application.js
-# It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
-# the compiled file.
-#
-#= require_tree .

app/assets/javascripts/issuable.js.coffee

-issuable_created = false
 @Issuable =
   init: ->
-    unless issuable_created
-      issuable_created = true
-      Issuable.initTemplates()
-      Issuable.initSearch()
-      Issuable.initChecks()
+    Issuable.initTemplates()
+    Issuable.initSearch()
   initTemplates: ->
     Issuable.labelRow = _.template(
@@ -23,16 +19,7 @@ issuable_created = false
       .on 'keyup', ->
         clearTimeout(@timer)
         @timer = setTimeout( ->
-          $search = $('#issue_search')
-          $form = $('.js-filter-form')
-          $input = $("input[name='#{$search.attr('name')}']", $form)
-
-          if $input.length is 0
-            $form.append "<input type='hidden' name='#{$search.attr('name')}' value='#{_.escape($search.val())}'/>"
-          else
-            $input.val $search.val()
-
-          Issuable.filterResults $form
+          Issuable.filterResults $('#issue_search_form')
         , 500)
   toggleLabelFilters: ->
@@ -72,22 +59,15 @@ issuable_created = false
       dataType: "json"
   reload: ->
-    if Issuable.created
-      Issuable.initChecks()
+    if Issues.created
+      Issues.initChecks()
     $('#filter_issue_search').val($('#issue_search').val())
-  initChecks: ->
-    $('.check_all_issues').on 'click', ->
-      $('.selected_issue').prop('checked', @checked)
-      Issuable.checkChanged()
-
-    $('.selected_issue').on 'change', Issuable.checkChanged
-
   updateStateFilters: ->
-    stateFilters =  $('.issues-state-filters, .dropdown-menu-sort')
+    stateFilters =  $('.issues-state-filters')
     newParams = {}
-    paramKeys = ['author_id', 'milestone_title', 'assignee_id', 'issue_search', 'issue_search']
+    paramKeys = ['author_id', 'milestone_title', 'assignee_id', 'issue_search']
     for paramKey in paramKeys
       newParams[paramKey] = gl.utils.getParameterValues(paramKey)[0] or ''
@@ -102,17 +82,3 @@ issuable_created = false
         else
           newUrl = gl.utils.mergeUrlParams(newParams, initialUrl)
         $(this).attr 'href', newUrl
-
-  checkChanged: ->
-    checked_issues = $('.selected_issue:checked')
-    if checked_issues.length > 0
-      ids = $.map checked_issues, (value) ->
-        $(value).data('id')
-
-      $('#update_issues_ids').val ids
-      $('.issues-other-filters').hide()
-      $('.issues_bulk_update').show()
-    else
-      $('#update_issues_ids').val []
-      $('.issues_bulk_update').hide()
-      $('.issues-other-filters').show()

app/assets/javascripts/issuable_form.js.coffee

@@ -19,16 +19,6 @@ class @IssuableForm
     @form.on "click", ".btn-cancel", @resetAutosave
     @initWip()
-    @initMoveDropdown()
-
-    $issuableDueDate = $('#issuable-due-date')
-
-    if $issuableDueDate.length
-      $('.datepicker').datepicker(
-        dateFormat: 'yy-mm-dd',
-        onSelect: (dateText, inst) ->
-          $issuableDueDate.val dateText
-      ).datepicker 'setDate', $.datepicker.parseDate('yy-mm-dd', $issuableDueDate.val())
   initAutosave: ->
     new Autosave @titleField, [
@@ -90,19 +80,3 @@ class @IssuableForm
   addWip: ->
     @titleField.val "WIP: #{@titleField.val()}"
-
-  initMoveDropdown: ->
-    $moveDropdown = $('.js-move-dropdown')
-
-    if $moveDropdown.length
-      $('.js-move-dropdown').select2
-        ajax:
-          url: $moveDropdown.data('projects-url')
-          results: (data) ->
-            return {
-              results: data
-            }
-        formatResult: (project) ->
-          project.name_with_namespace
-        formatSelection: (project) ->
-          project.name_with_namespace

app/assets/javascripts/issues.js.coffee

+@Issues =
+  init: ->
+    Issues.created = true
+    Issues.initChecks()
+
+    $("body").on "ajax:success", ".close_issue, .reopen_issue", ->
+      t = $(this)
+      totalIssues = undefined
+      reopen = t.hasClass("reopen_issue")
+      $(".issue_counter").each ->
+        issue = $(this)
+        totalIssues = parseInt($(this).html(), 10)
+        if reopen and issue.closest(".main_menu").length
+          $(this).html totalIssues + 1
+        else
+          $(this).html totalIssues - 1
+
+  initChecks: ->
+    $(".check_all_issues").click ->
+      $(".selected_issue").prop("checked", @checked)
+      Issues.checkChanged()
+
+    $(".selected_issue").bind "change", Issues.checkChanged
+
+  checkChanged: ->
+    checked_issues = $(".selected_issue:checked")
+    if checked_issues.length > 0
+      ids = []
+      $.each checked_issues, (index, value) ->
+        ids.push $(value).attr("data-id")
+
+      $("#update_issues_ids").val ids
+      $(".issues-other-filters").hide()
+      $(".issues_bulk_update").show()
+    else
+      $("#update_issues_ids").val []
+      $(".issues_bulk_update").hide()
+      $(".issues-other-filters").show()

app/assets/javascripts/layout_nav.js.coffee

-class @LayoutNav
-  $ ->
-    $('.fade-left').addClass('end-scroll')
-    $('.scrolling-tabs').on 'scroll', (event) ->
-      $this = $(this)
-      $el = $(event.target)
-      currentPosition = $this.scrollLeft()
-      size = bp.getBreakpointSize()
-      controlBtnWidth = $('.controls').width()
-      maxPosition = $this.get(0).scrollWidth - $this.parent().width()
-      maxPosition += controlBtnWidth if size isnt 'xs' and $('.nav-control').length
-
-      $el.find('.fade-left').toggleClass('end-scroll', currentPosition is 0)
-      $el.find('.fade-right').toggleClass('end-scroll', currentPosition is maxPosition)

app/assets/javascripts/lib/type_utility.js.coffee

-((w) ->
-
-  w.gl ?= {}
-  w.gl.utils ?= {}
-
-  w.gl.utils.isObject = (obj) ->
-    obj? and (obj.constructor is Object)
-
-) window

app/assets/javascripts/lib/url_utility.js.coffee

@@ -26,19 +26,10 @@
     newUrl = decodeURIComponent(url)
     for paramName, paramValue of params
       pattern = new RegExp "\\b(#{paramName}=).*?(&|$)"
-      if not paramValue?
-        newUrl = newUrl.replace pattern, ''
-      else if url.search(pattern) isnt -1
+      if url.search(pattern) >= 0
         newUrl = newUrl.replace pattern, "$1#{paramValue}$2"
       else
         newUrl = "#{newUrl}#{(if newUrl.indexOf('?') > 0 then '&' else '?')}#{paramName}=#{paramValue}"
-
-    # Remove a trailing ampersand
-    lastChar = newUrl[newUrl.length - 1]
-
-    if lastChar is '&'
-        newUrl = newUrl.slice 0, -1
-
     newUrl
   # removes parameter query string from url. returns the modified url

app/assets/javascripts/merge_request_tabs.js.coffee

@@ -75,9 +75,6 @@ class @MergeRequestTabs
       @loadDiff($target.attr('href'))
       if bp? and bp.getBreakpointSize() isnt 'lg'
         @shrinkView()
-
-      navBarHeight = $('.navbar-gitlab').outerHeight()
-      $.scrollTo(".merge-request-details .merge-request-tabs", offset: -navBarHeight)
     else if action == 'builds'
       @loadBuilds($target.attr('href'))
       @expandView()

app/assets/javascripts/merge_request_widget.js.coffee

@@ -10,7 +10,6 @@ class @MergeRequestWidget
     $('#modal_merge_info').modal(show: false)
     @firstCICheck = true
     @readyForCICheck = false
-    @cancel = false
     clearInterval @fetchBuildStatusInterval
     @clearEventListeners()
@@ -22,16 +21,10 @@ class @MergeRequestWidget
   clearEventListeners: ->
     $(document).off 'page:change.merge_request'
-  cancelPolling: ->
-    @cancel = true
-
   addEventListeners: ->
-    allowedPages = ['show', 'commits', 'builds', 'changes']
     $(document).on 'page:change.merge_request', =>
-      page = $('body').data('page').split(':').last()
-      if allowedPages.indexOf(page) < 0
+      if $('body').data('page') isnt 'projects:merge_requests:show'
         clearInterval @fetchBuildStatusInterval
-        @cancelPolling()
         @clearEventListeners()
   mergeInProgress: (deleteSourceBranch = false)->
@@ -74,7 +67,6 @@ class @MergeRequestWidget
     $('.ci-widget-fetching').show()
     $.getJSON @opts.ci_status_url, (data) =>
-      return if @cancel
       @readyForCICheck = true
       if data.status is ''
@@ -114,7 +106,6 @@ class @MergeRequestWidget
         @firstCICheck = false
   showCIStatus: (state) ->
-    return if not state?
     $('.ci_widget').hide()
     allowed_states = ["failed", "canceled", "running", "pending", "success", "skipped", "not_found"]
     if state in allowed_states
@@ -122,7 +113,7 @@ class @MergeRequestWidget
       switch state
         when "failed", "canceled", "not_found"
           @setMergeButtonClass('btn-danger')
-        when "running"
+        when "running", "pending"
           @setMergeButtonClass('btn-warning')
         when "success"
           @setMergeButtonClass('btn-create')
@@ -135,6 +126,6 @@ class @MergeRequestWidget
     $('.ci_widget:visible .ci-coverage').text(text)
   setMergeButtonClass: (css_class) ->
-    $('.js-merge-button,.accept-action .dropdown-toggle')
+    $('.accept_merge_request')
       .removeClass('btn-danger btn-warning btn-create')
       .addClass(css_class)

app/assets/javascripts/notes.js.coffee

@@ -114,9 +114,9 @@ class @Notes
       @refresh()
     , @pollingInterval
-  refresh: =>
+  refresh: ->
     return if @refreshing is true
-    @refreshing = true
+    refreshing = true
     if not document.hidden and document.URL.indexOf(@noteable_url) is 0
       @getContent()
@@ -134,8 +134,8 @@ class @Notes
             @renderDiscussionNote(note)
           else
             @renderNote(note)
-    .always () =>
-      @refreshing = false
+      always: =>
+        @refreshing = false
   ###
   Increase @pollingInterval up to 120 seconds on every function call,
@@ -285,7 +285,6 @@ class @Notes
     form.addClass "js-main-target-form"
     form.find("#note_line_code").remove()
-    form.find("#note_type").remove()
   ###
   General note form setup.
@@ -329,7 +328,7 @@ class @Notes
     @renderDiscussionNote(note)
     # cleanup after successfully creating a diff/discussion note
-    @removeDiscussionNoteForm($(xhr.target))
+    @removeDiscussionNoteForm($("#new-discussion-note-form-#{note.discussion_id}"))
   ###
   Called in response to the edit note form being submitted
@@ -473,7 +472,6 @@ class @Notes
   setupDiscussionNoteForm: (dataHolder, form) =>
     # setup note target
     form.attr 'id', "new-discussion-note-form-#{dataHolder.data("discussionId")}"
-    form.find("#note_type").val dataHolder.data("noteType")
     form.find("#line_type").val dataHolder.data("lineType")
     form.find("#note_commit_id").val dataHolder.data("commitId")
     form.find("#note_line_code").val dataHolder.data("lineCode")

app/assets/javascripts/right_sidebar.js.coffee

@@ -10,40 +10,6 @@ class @Sidebar
     $('.dropdown').on('loading.gl.dropdown', @sidebarDropdownLoading)
     $('.dropdown').on('loaded.gl.dropdown', @sidebarDropdownLoaded)
-
-    $(document)
-      .off 'click', '.js-sidebar-toggle'
-      .on 'click', '.js-sidebar-toggle', (e, triggered) ->
-        e.preventDefault()
-        $this = $(this)
-        $thisIcon = $this.find 'i'
-        $allGutterToggleIcons = $('.js-sidebar-toggle i')
-        if $thisIcon.hasClass('fa-angle-double-right')
-          $allGutterToggleIcons
-            .removeClass('fa-angle-double-right')
-            .addClass('fa-angle-double-left')
-          $('aside.right-sidebar')
-            .removeClass('right-sidebar-expanded')
-            .addClass('right-sidebar-collapsed')
-          $('.page-with-sidebar')
-            .removeClass('right-sidebar-expanded')
-            .addClass('right-sidebar-collapsed')
-        else
-          $allGutterToggleIcons
-            .removeClass('fa-angle-double-left')
-            .addClass('fa-angle-double-right')
-          $('aside.right-sidebar')
-            .removeClass('right-sidebar-collapsed')
-            .addClass('right-sidebar-expanded')
-          $('.page-with-sidebar')
-            .removeClass('right-sidebar-collapsed')
-            .addClass('right-sidebar-expanded')
-        if not triggered
-          $.cookie("collapsed_gutter",
-            $('.right-sidebar')
-              .hasClass('right-sidebar-collapsed'), { path: '/' })
-
-
   sidebarDropdownLoading: (e) ->
     $sidebarCollapsedIcon = $(@).closest('.block').find('.sidebar-collapsed-icon')
     img = $sidebarCollapsedIcon.find('img')
@@ -110,7 +76,7 @@ class @Sidebar
       @triggerOpenSidebar() if not @isOpen()
     if action is 'hide'
-      @triggerOpenSidebar() if @isOpen()
+      @triggerOpenSidebar() is @isOpen()
   isOpen: ->
     @sidebar.is('.right-sidebar-expanded')