Merge remote-tracking branch 'ce/master'

e3d66bd0 · Robert Speicher · 3b5cd10e · 8f094531 · e3d66bd0 · e3d66bd0
Commit e3d66bd0 authored Apr 06, 2016 by Robert Speicher
80 changed files
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,7 +2,6 @@ image: "ruby:2.1"

 services:
  - mysql:latest
-  - postgres:latest
  - redis:latest
  - elasticsearch:latest

@@ -38,134 +37,86 @@ spec:feature:
  script:
    - RAILS_ENV=test bundle exec rake assets:precompile 2>/dev/null
    - RAILS_ENV=test SIMPLECOV=true bundle exec rake spec:feature
-  tags:
-    - ruby
-    - mysql

 spec:api:
  stage: test
  script:
    - RAILS_ENV=test SIMPLECOV=true bundle exec rake spec:api
-  tags:
-    - ruby
-    - mysql

 spec:models:
  stage: test
  script:
    - RAILS_ENV=test SIMPLECOV=true bundle exec rake spec:models
-  tags:
-    - ruby
-    - mysql

 spec:lib:
  stage: test
  script:
    - RAILS_ENV=test SIMPLECOV=true bundle exec rake spec:lib
-  tags:
-    - ruby
-    - mysql

 spec:services:
  stage: test
  script:
    - RAILS_ENV=test SIMPLECOV=true bundle exec rake spec:services
-  tags:
-    - ruby
-    - mysql

 spec:other:
  stage: test
  script:
    - RAILS_ENV=test SIMPLECOV=true bundle exec rake spec:other
-  tags:
-    - ruby
-    - mysql

 spinach:project:half:
  stage: test
  script:
    - RAILS_ENV=test bundle exec rake assets:precompile 2>/dev/null
    - RAILS_ENV=test SIMPLECOV=true bundle exec rake spinach:project:half
-  tags:
-    - ruby
-    - mysql

 spinach:project:rest:
  stage: test
  script:
    - RAILS_ENV=test bundle exec rake assets:precompile 2>/dev/null
    - RAILS_ENV=test SIMPLECOV=true bundle exec rake spinach:project:rest
-  tags:
-    - ruby
-    - mysql

 spinach:other:
  stage: test
  script:
    - RAILS_ENV=test bundle exec rake assets:precompile 2>/dev/null
    - RAILS_ENV=test SIMPLECOV=true bundle exec rake spinach:other
-  tags:
-    - ruby
-    - mysql

 teaspoon:
  stage: test
  script:
    - RAILS_ENV=test bundle exec teaspoon
-  tags:
-    - ruby
-    - mysql

 rubocop:
  stage: test
  script:
    - bundle exec rubocop
-  tags:
-    - ruby
-    - mysql

 scss-lint:
  stage: test
  script:
    - bundle exec rake scss_lint
-  tags:
-    - ruby

 brakeman:
  stage: test
  script:
    - bundle exec rake brakeman
-  tags:
-    - ruby
-    - mysql

 flog:
  stage: test
  script:
    - bundle exec rake flog
-  tags:
-    - ruby
-    - mysql

 flay:
  stage: test
  script:
    - bundle exec rake flay
-  tags:
-    - ruby
-    - mysql

 bundler:audit:
  stage: test
  only:
    - master
  script:
-    - "bundle exec bundle-audit update"
-    - "bundle exec bundle-audit check --ignore OSVDB-115941"
-  tags:
-    - ruby
-    - mysql
+    - "bundle exec bundle-audit check --update --ignore OSVDB-115941"

 # Ruby 2.2 jobs

@@ -181,9 +132,6 @@ spec:feature:ruby22:
    key: "ruby22"
    paths:
    - vendor
-  tags:
-    - ruby
-    - mysql

 spec:api:ruby22:
  stage: test
@@ -196,9 +144,6 @@ spec:api:ruby22:
    key: "ruby22"
    paths:
    - vendor
-  tags:
-    - ruby
-    - mysql

 spec:models:ruby22:
  stage: test
@@ -211,9 +156,6 @@ spec:models:ruby22:
    key: "ruby22"
    paths:
    - vendor
-  tags:
-    - ruby
-    - mysql

 spec:lib:ruby22:
  stage: test
@@ -226,9 +168,6 @@ spec:lib:ruby22:
    key: "ruby22"
    paths:
    - vendor
-  tags:
-    - ruby
-    - mysql

 spec:services:ruby22:
  stage: test
@@ -241,9 +180,6 @@ spec:services:ruby22:
    key: "ruby22"
    paths:
    - vendor
-  tags:
-    - ruby
-    - mysql

 spec:other:ruby22:
  stage: test
@@ -256,9 +192,6 @@ spec:other:ruby22:
    key: "ruby22"
    paths:
    - vendor
-  tags:
-    - ruby
-    - mysql

 spinach:project:half:ruby22:
  stage: test
@@ -272,9 +205,6 @@ spinach:project:half:ruby22:
    key: "ruby22"
    paths:
    - vendor
-  tags:
-    - ruby
-    - mysql

 spinach:project:rest:ruby22:
  stage: test
@@ -288,9 +218,6 @@ spinach:project:rest:ruby22:
    key: "ruby22"
    paths:
    - vendor
-  tags:
-    - ruby
-    - mysql

 spinach:other:ruby22:
  stage: test
@@ -304,10 +231,6 @@ spinach:other:ruby22:
    key: "ruby22"
    paths:
    - vendor
-  tags:
-    - ruby
-    - mysql
-

 notify:slack:
  stage: notifications

--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,16 +3,19 @@ Please view this file on the master branch, on stable branches it's out of date.
 v 8.7.0 (unreleased)
  - All images in discussions and wikis now link to their source files !3464 (Connor Shea).
  - Improved Markdown rendering performance !3389 (Yorick Peterse)
-  - Don't attempt to look up an avatar in repo if repo directory does not exist (Stan hu)
+  - Don't attempt to look up an avatar in repo if repo directory does not exist (Stan Hu)
  - Preserve time notes/comments have been updated at when moving issue
  - Make HTTP(s) label consistent on clone bar (Stan Hu)
  - Expose label description in API (Mariusz Jachimowicz)
  - Allow back dating on issues when created through the API
+  - Fix Error 500 after renaming a project path (Stan Hu)
  - Fix avatar stretching by providing a cropping feature
+  - Allow SAML to handle external users based on user's information !3530
  - Add endpoints to archive or unarchive a project !3372
  - Add links to CI setup documentation from project settings and builds pages
  - Handle nil descriptions in Slack issue messages (Stan Hu)
  - Add default scope to projects to exclude projects pending deletion
+  - Ensure empty recipients are rejected in BuildsEmailService
  - Implement 'Groups View' as an option for dashboard preferences !3379 (Elias W.)
  - Implement 'TODOs View' as an option for dashboard preferences !3379 (Elias W.)
  - Gracefully handle notes on deleted commits in merge requests (Stan Hu)
@@ -22,6 +25,10 @@ v 8.7.0 (unreleased)
  - Improved UX of the navigation sidebar
  - Build status notifications
  - Update GitLab Pages to 0.2.2: fixes content-type of predefined 404 page
+  - API: Expose user location (Robert Schilling)
+
+v 8.6.5 (unreleased)
+  - Check permissions when user attempts to import members from another project

 v 8.6.4
  - Don't attempt to fetch any tags from a forked repo (Stan Hu)
@@ -141,6 +148,9 @@ v 8.6.0
  - Trigger a todo for mentions on commits page
  - Let project owners and admins soft delete issues and merge requests

+v 8.5.9
+  - Don't attempt to fetch any tags from a forked repo (Stan Hu).
+
 v 8.5.8
  - Bump Git version requirement to 2.7.4

@@ -300,6 +310,12 @@ v 8.5.0
  - Show label row when filtering issues or merge requests by label (Nuttanart Pornprasitsakul)
  - Add Todos

+v 8.4.7
+  - Don't attempt to fetch any tags from a forked repo (Stan Hu).
+
+v 8.4.6
+  - Bump Git version requirement to 2.7.4
+
 v 8.4.5
  - No CE-specific changes

@@ -419,6 +435,12 @@ v 8.4.0
  - Add IP check against DNSBLs at account sign-up
  - Added cache:key to .gitlab-ci.yml allowing to fine tune the caching

+v 8.3.6
+  - Don't attempt to fetch any tags from a forked repo (Stan Hu).
+
+v 8.3.5
+  - Bump Git version requirement to 2.7.4
+
 v 8.3.4
  - Use gitlab-workhorse 0.5.4 (fixes API routing bug)


--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -99,7 +99,7 @@ GEM
    bullet (5.0.0)
      activesupport (>= 3.0.0)
      uniform_notifier (~> 1.9.0)
-    bundler-audit (0.4.0)
+    bundler-audit (0.5.0)
      bundler (~> 1.2)
      thor (~> 0.18)
    byebug (8.2.1)

--- a/app/assets/javascripts/gl_dropdown.js.coffee
+++ b/app/assets/javascripts/gl_dropdown.js.coffee
 class GitLabDropdownFilter
  BLUR_KEYCODES = [27, 40]
+  ARROW_KEY_CODES = [38, 40]
  HAS_VALUE_CLASS = "has-value"

  constructor: (@input, @options) ->
@@ -22,19 +23,23 @@ class GitLabDropdownFilter
    # Key events
    timeout = ""
    @input.on "keyup", (e) =>
+      keyCode = e.which
+
+      return if ARROW_KEY_CODES.indexOf(keyCode) >= 0
+
      if @input.val() isnt "" and !$inputContainer.hasClass HAS_VALUE_CLASS
        $inputContainer.addClass HAS_VALUE_CLASS
      else if @input.val() is "" and $inputContainer.hasClass HAS_VALUE_CLASS
        $inputContainer.removeClass HAS_VALUE_CLASS

-      if e.keyCode is 13 and @input.val() isnt ""
+      if keyCode is 13 and @input.val() isnt ""
        if @options.enterCallback
          @options.enterCallback()
        return

      clearTimeout timeout
      timeout = setTimeout =>
-        blur_field = @shouldBlur e.keyCode
+        blur_field = @shouldBlur keyCode
        search_text = @input.val()

        if blur_field and @filterInputBlur
@@ -96,6 +101,7 @@ class GitLabDropdown
  LOADING_CLASS = "is-loading"
  PAGE_TWO_CLASS = "is-page-two"
  ACTIVE_CLASS = "is-active"
+  currentIndex = -1

  FILTER_INPUT = '.dropdown-input .dropdown-input-field'

@@ -145,11 +151,11 @@ class GitLabDropdown
        data: =>
          return @fullData
        callback: (data) =>
+          currentIndex = -1
          @parseData data
-          @highlightRow 1
        enterCallback: =>
          if @enterCallback
-            @selectFirstRow()
+            @selectRowAtIndex 0

    # Event listeners

@@ -171,10 +177,11 @@ class GitLabDropdown
        selector = ".dropdown-page-one .dropdown-content a"

      @dropdown.on "click", selector, (e) ->
-        selected = self.rowClicked $(@)
+        $el = $(@)
+        selected = self.rowClicked $el

        if self.options.clicked
-          self.options.clicked(selected)
+          self.options.clicked(selected, $el, e)

  # Finds an element inside wrapper element
  getElement: (selector) ->
@@ -218,6 +225,8 @@ class GitLabDropdown
        return true

  opened: =>
+    @addArrowKeyEvent()
+
    contentHtml = $('.dropdown-content', @dropdown).html()
    if @remote && contentHtml is ""
      @remote.execute()
@@ -228,6 +237,7 @@ class GitLabDropdown
    @dropdown.trigger('shown.gl.dropdown')

  hidden: (e) =>
+    @removeArrayKeyEvent()
    if @options.filterable
      @dropdown
        .find(".dropdown-input-field")
@@ -307,11 +317,11 @@ class GitLabDropdown
      if @highlight
        text = @highlightTextMatches(text, @filterInput.val())

-      html = "<li>"
-      html += "<a href='#{url}' class='#{cssClass}'>"
-      html += text
-      html += "</a>"
-      html += "</li>"
+      html = "<li>
+        <a href='#{url}' class='#{cssClass}'>
+          #{text}
+        </a>
+      </li>"

    return html

@@ -322,11 +332,11 @@ class GitLabDropdown
    ).join('')

  noResults: ->
-    html = "<li>"
-    html += "<a class='dropdown-menu-empty-link is-focused'>"
-    html += "No matching results."
-    html += "</a>"
-    html += "</li>"
+    html = "<li class='dropdown-menu-empty-link'>
+      <a href='#' class='is-focused'>
+        No matching results.
+      </a>
+    </li>"

  highlightRow: (index) ->
    if @filterInput.val() isnt ""
@@ -351,6 +361,8 @@ class GitLabDropdown
      # Toggle the dropdown label
      if @options.toggleLabel
        $(@el).find(".dropdown-toggle-text").text @options.toggleLabel
+      else
+        selectedObject
    else
      if !value?
        field.remove()
@@ -366,7 +378,7 @@ class GitLabDropdown
      if @options.toggleLabel
        $(@el).find(".dropdown-toggle-text").text @options.toggleLabel(selectedObject)
      if value?
-        if !field.length
+        if !field.length and fieldName
          # Create hidden input for form
          input = "<input type='hidden' name='#{fieldName}' value='#{value}' />"
          if @options.inputId?
@@ -378,16 +390,81 @@ class GitLabDropdown

      return selectedObject

-  selectFirstRow: ->
-    selector = '.dropdown-content li:first-child a'
+  selectRowAtIndex: (index) ->
+    selector = ".dropdown-content li:not(.divider):eq(#{index}) a"
+
    if @dropdown.find(".dropdown-toggle-page").length
-      selector = ".dropdown-page-one .dropdown-content li:first-child a"
+      selector = ".dropdown-page-one #{selector}"

    # simulate a click on the first link
-    $(selector).trigger "click"
+    $(selector, @dropdown).trigger "click"
+
+  addArrowKeyEvent: ->
+    ARROW_KEY_CODES = [38, 40]
+    $input = @dropdown.find(".dropdown-input-field")
+
+    selector = '.dropdown-content li:not(.divider)'
+    if @dropdown.find(".dropdown-toggle-page").length
+      selector = ".dropdown-page-one #{selector}"
+
+    $('body').on 'keydown', (e) =>
+      currentKeyCode = e.which
+
+      if ARROW_KEY_CODES.indexOf(currentKeyCode) >= 0
+        e.preventDefault()
+        e.stopImmediatePropagation()
+
+        PREV_INDEX = currentIndex
+        $listItems = $(selector, @dropdown)
+
+        # if @options.filterable
+        #   $input.blur()
+
+        if currentKeyCode is 40
+          # Move down
+          currentIndex += 1 if currentIndex < ($listItems.length - 1)
+        else if currentKeyCode is 38
+          # Move up
+          currentIndex -= 1 if currentIndex > 0
+
+        @highlightRowAtIndex($listItems, currentIndex) if currentIndex isnt PREV_INDEX
+
+        return false
+
+      if currentKeyCode is 13
+        @selectRowAtIndex currentIndex
+
+  removeArrayKeyEvent: ->
+    $('body').off 'keydown'
+
+  highlightRowAtIndex: ($listItems, index) ->
+    # Remove the class for the previously focused row
+    $('.is-focused', @dropdown).removeClass 'is-focused'
+
+    # Update the class for the row at the specific index
+    $listItem = $listItems.eq(index)
+    $listItem.find('a:first-child').addClass "is-focused"
+
+    # Dropdown content scroll area
+    $dropdownContent = $listItem.closest('.dropdown-content')
+    dropdownScrollTop = $dropdownContent.scrollTop()
+    dropdownContentHeight = $dropdownContent.outerHeight()
+    dropdownContentTop = $dropdownContent.prop('offsetTop')
+    dropdownContentBottom = dropdownContentTop + dropdownContentHeight
+
+    # Get the offset bottom of the list item
+    listItemHeight = $listItem.outerHeight()
+    listItemTop = $listItem.prop('offsetTop')
+    listItemBottom = listItemTop + listItemHeight
+
+    if listItemBottom > dropdownContentBottom + dropdownScrollTop
+      # Scroll the dropdown content down
+      $dropdownContent.scrollTop(listItemBottom - dropdownContentBottom)
+    else if listItemTop < dropdownContentTop + dropdownScrollTop
+      # Scroll the dropdown content up
+      $dropdownContent.scrollTop(listItemTop - dropdownContentTop)

 $.fn.glDropdown = (opts) ->
  return @.each ->
    if (!$.data @, 'glDropdown')
      $.data(@, 'glDropdown', new GitLabDropdown @, opts)
-
--- a/app/assets/javascripts/issue.js.coffee
+++ b/app/assets/javascripts/issue.js.coffee
@@ -6,25 +6,10 @@ class @Issue
  constructor: ->
    # Prevent duplicate event bindings
    @disableTaskList()
-    @fixAffixScroll()
    if $('a.btn-close').length
      @initTaskList()
      @initIssueBtnEventListeners()

-  fixAffixScroll: ->
-    fixAffix = ->
-      $discussion = $('.issuable-discussion')
-      $sidebar = $('.issuable-sidebar')
-      if $sidebar.hasClass('no-affix')
-        $sidebar.removeClass(['affix-top','affix'])
-      discussionHeight = $discussion.height()
-      sidebarHeight = $sidebar.height()
-      if sidebarHeight > discussionHeight
-        $discussion.height(sidebarHeight + 50)
-        $sidebar.addClass('no-affix')
-    $(window).on('resize', fixAffix)
-    fixAffix()
-
  initTaskList: ->
    $('.detail-page-description .js-task-list-container').taskList('enable')
    $(document).on 'tasklist:changed', '.detail-page-description .js-task-list-container', @updateTaskList
@@ -49,7 +34,7 @@ class @Issue
          issueStatus = if isClose then 'close' else 'open'
          new Flash(issueFailMessage, 'alert')
        success: (data, textStatus, jqXHR) ->
-          if data.saved
+          if 'id' of data
            $(document).trigger('issuable:change');
            if isClose
              $('a.btn-close').addClass('hidden')

--- a/app/assets/javascripts/issues.js.coffee
+++ b/app/assets/javascripts/issues.js.coffee
@@ -26,6 +26,20 @@

    $(".selected_issue").bind "change", Issues.checkChanged

+  # Update state filters if present in page
+  updateStateFilters: ->
+    stateFilters =  $('.issues-state-filters')
+    newParams = {}
+    paramKeys = ['author_id', 'label_name', 'milestone_title', 'assignee_id', 'issue_search']
+
+    for paramKey in paramKeys
+      newParams[paramKey] = gl.utils.getUrlParameter(paramKey) or ''
+
+    if stateFilters.length
+      stateFilters.find('a').each ->
+        initialUrl = $(this).attr 'href'
+        $(this).attr 'href', gl.utils.mergeUrlParams(newParams, initialUrl)
+
  # Make sure we trigger ajax request only after user stop typing
  initSearch: ->
    @timer = null
@@ -54,6 +68,7 @@
        # Change url so if user reload a page - search results are saved
        history.replaceState {page: issuesUrl}, document.title, issuesUrl
        Issues.reload()
+        Issues.updateStateFilters()
      dataType: "json"

  checkChanged: ->

--- a/app/assets/javascripts/lib/url_utility.js.coffee
+++ b/app/assets/javascripts/lib/url_utility.js.coffee
+((w) ->
+
+  w.gl ?= {}
+  w.gl.utils ?= {}
+
+  w.gl.utils.getUrlParameter = (sParam) ->
+    sPageURL = decodeURIComponent(window.location.search.substring(1))
+    sURLVariables = sPageURL.split('&')
+    sParameterName = undefined
+    i = 0
+    while i < sURLVariables.length
+      sParameterName = sURLVariables[i].split('=')
+      if sParameterName[0] is sParam
+        return if sParameterName[1] is undefined then true else sParameterName[1]
+      i++
+
+  # #
+  #  @param {Object} params - url keys and value to merge
+  #  @param {String} url
+  # #
+  w.gl.utils.mergeUrlParams = (params, url) ->
+    newUrl = decodeURIComponent(url)
+    for paramName, paramValue of params
+      pattern = new RegExp "\\b(#{paramName}=).*?(&|$)"
+      if url.search(pattern) >= 0
+        newUrl = newUrl.replace pattern, "$1#{paramValue}$2"
+      else
+        newUrl = "#{newUrl}#{(if newUrl.indexOf('?') > 0 then '&' else '?')}#{paramName}=#{paramValue}"
+    newUrl
+
+) window
--- a/app/assets/javascripts/merge_request.js.coffee
+++ b/app/assets/javascripts/merge_request.js.coffee
@@ -15,8 +15,6 @@ class @MergeRequest
    this.$('.show-all-commits').on 'click', =>
      this.showAllCommits()

-    @fixAffixScroll();
-
    @initTabs()

    # Prevent duplicate event bindings
@@ -30,20 +28,6 @@ class @MergeRequest
  $: (selector) ->
    this.$el.find(selector)

-  fixAffixScroll: ->
-    fixAffix = ->
-      $discussion = $('.issuable-discussion')
-      $sidebar = $('.issuable-sidebar')
-      if $sidebar.hasClass('no-affix')
-        $sidebar.removeClass(['affix-top','affix'])
-      discussionHeight = $discussion.height()
-      sidebarHeight = $sidebar.height()
-      if sidebarHeight > discussionHeight
-        $discussion.height(sidebarHeight + 50)
-        $sidebar.addClass('no-affix')
-    $(window).on('resize', fixAffix)
-    fixAffix()
-
  initTabs: ->
    if @opts.action != 'new'
      # `MergeRequests#new` has no tab-persisting or lazy-loading behavior

--- a/app/assets/javascripts/merge_request_widget.js.coffee
+++ b/app/assets/javascripts/merge_request_widget.js.coffee
@@ -15,6 +15,8 @@ class @MergeRequestWidget
    @pollCIStatus()
    notifyPermissions()

+  setOpts: (@opts) ->
+
  mergeInProgress: (deleteSourceBranch = false)->
    $.ajax
      type: 'GET'
@@ -59,7 +61,7 @@ class @MergeRequestWidget
      @getCIStatus(true)

      @readyForCICheck = false
-    ), 5000
+    ), 10000

  getCIStatus: (showNotification) ->
    _this = @
@@ -72,6 +74,10 @@ class @MergeRequestWidget
        @firstCICheck = false
        @opts.ci_status = data.status

+      if @opts.ci_status is ''
+        @opts.ci_status = data.status
+        return
+
      if data.status isnt @opts.ci_status
        @showCIStatus data.status
        if data.coverage

--- a/app/assets/javascripts/notes.js.coffee
+++ b/app/assets/javascripts/notes.js.coffee
@@ -251,13 +251,11 @@ class @Notes
  Sets some hidden fields in the form.
  ###
  setupMainTargetNoteForm: ->
-
    # find the form
    form = $(".js-new-note-form")

-    # insert the form after the button
-    form.clone().replaceAll $(".js-main-target-form")
-    form = form.prev("form")
+    # Set a global clone of the form for later cloning
+    @formClone = form.clone()

    # show the form
    @setupNoteForm(form)
@@ -266,9 +264,7 @@ class @Notes
    form.removeClass "js-new-note-form"
    form.addClass "js-main-target-form"

-    # remove unnecessary fields and buttons
    form.find("#note_line_code").remove()
-    form.find(".js-close-discussion-note-form").remove()

  ###
  General note form setup.
@@ -297,7 +293,14 @@ class @Notes
      else
        previewButton.removeClass("turn-on").addClass "turn-off"

+    textarea.on 'focus', ->
+      $(this).closest('.md-area').addClass 'is-focused'
+
+    textarea.on 'blur', ->
+      $(this).closest('.md-area').removeClass 'is-focused'
+
    autosize(textarea)
+
    new Autosave textarea, [
      "Note"
      form.find("#note_commit_id").val()
@@ -307,7 +310,6 @@ class @Notes
    ]

    # remove notify commit author checkbox for non-commit notes
-    form.find(".js-notify-commit-author").remove()  if form.find("#note_noteable_type").val() isnt "Commit"
    GitLab.GfmAutoComplete.setup()
    new DropzoneInput(form)
    form.show()
@@ -455,15 +457,15 @@ class @Notes
  Shows the note form below the notes.
  ###
  replyToDiscussionNote: (e) =>
-    form = $(".js-new-note-form")
+    form = @formClone.clone()
    replyLink = $(e.target).closest(".js-discussion-reply-button")
    replyLink.hide()

    # insert the form after the button
-    form.clone().insertAfter replyLink
+    replyLink.after form

    # show the form
-    @setupDiscussionNoteForm(replyLink, replyLink.next("form"))
+    @setupDiscussionNoteForm(replyLink, form)

  ###
  Shows the diff or discussion form and does some setup on it.
@@ -488,7 +490,9 @@ class @Notes
        .text(form.find('.js-close-discussion-note-form').data('cancel-text'))
    @setupNoteForm form
    form.find(".js-note-text").focus()
-    form.addClass "js-discussion-note-form"
+    form
+      .removeClass('js-main-target-form')
+      .addClass("discussion-form js-discussion-note-form")

  ###
  Called when clicking on the "add a comment" button on the side of a diff line.
@@ -498,9 +502,8 @@ class @Notes
  ###
  addDiffNote: (e) =>
    e.preventDefault()
-    link = e.currentTarget
-    form = $(".js-new-note-form")
-    row = $(link).closest("tr")
+    $link = $(e.currentTarget)
+    row = $link.closest("tr")
    nextRow = row.next()
    hasNotes = nextRow.is(".notes_holder")
    addForm = false
@@ -509,7 +512,7 @@ class @Notes

    # In parallel view, look inside the correct left/right pane
    if @isParallelView()
-      lineType = $(link).data("lineType")
+      lineType = $link.data("lineType")
      targetContent += "." + lineType
      rowCssToAdd = "<tr class=\"notes_holder js-temp-notes-holder\"><td class=\"notes_line\"></td><td class=\"notes_content parallel old\"></td><td class=\"notes_line\"></td><td class=\"notes_content parallel new\"></td></tr>"

@@ -531,11 +534,11 @@ class @Notes
      addForm = true

    if addForm
-      newForm = form.clone()
+      newForm = @formClone.clone()
      newForm.appendTo row.next().find(targetContent)

      # show the form
-      @setupDiscussionNoteForm $(link), newForm
+      @setupDiscussionNoteForm $link, newForm

  ###
  Called in response to "cancel" on a diff note form.
@@ -560,7 +563,6 @@ class @Notes

  cancelDiscussionForm: (e) =>
    e.preventDefault()
-    form = $(".js-new-note-form")
    form = $(e.target).closest(".js-discussion-note-form")
    @removeDiscussionNoteForm(form)


--- a/app/assets/javascripts/search_autocomplete.js.coffee
+++ b/app/assets/javascripts/search_autocomplete.js.coffee
@@ -62,6 +62,8 @@ class @SearchAutocomplete
        search:
          fields: ['text']
        data: @getData.bind(@)
+        selectable: true
+        clicked: @onClick.bind(@)

  getData: (term, callback) ->
    _this = @
@@ -102,6 +104,8 @@ class @SearchAutocomplete
            lastCategory = suggestion.category

          data.push
+            id: "#{suggestion.category.toLowerCase()}-#{suggestion.id}"
+            category: suggestion.category
            text: suggestion.label
            url: suggestion.url

@@ -133,12 +137,19 @@ class @SearchAutocomplete
    }

  bindEvents: ->
+    $(document).on 'click', @onDocumentClick
    @searchInput.on 'keydown', @onSearchInputKeyDown
    @searchInput.on 'keyup', @onSearchInputKeyUp
    @searchInput.on 'click', @onSearchInputClick
    @searchInput.on 'focus', @onSearchInputFocus
-    @searchInput.on 'blur', @onSearchInputBlur
-    @clearInput.on 'click', @onRemoveLocationClick
+    @clearInput.on 'click', @onClearInputClick
+
+  onDocumentClick: (e) =>
+    # If clicking outside the search box
+    # And search input is not focused
+    # And we are not clicking inside a suggestion
+    if not $.contains(@dropdown[0], e.target) and @isFocused and not $(e.target).parents('ul').length
+      @onSearchInputBlur()

  enableAutocomplete: ->
    # No need to enable anything if user is not logged in
@@ -181,6 +192,8 @@ class @SearchAutocomplete
          # We should display the menu only when input is not empty
          @enableAutocomplete()

+    @wrap.toggleClass 'has-value', !!e.target.value
+
    # Avoid falsy value to be returned
    return

@@ -189,27 +202,20 @@ class @SearchAutocomplete
    e.stopImmediatePropagation()

  onSearchInputFocus: =>
+    @isFocused = true
    @wrap.addClass('search-active')

-  onRemoveLocationClick: (e) =>
+  onClearInputClick: (e) =>
    e.preventDefault()
-    @removeLocationBadge()
    @searchInput.val('').focus()
-    @skipBlurEvent = true

  onSearchInputBlur: (e) =>
-    @skipBlurEvent = false
-
-    # We should wait to make sure we are not clearing the input instead
-    setTimeout( =>
-      return if @skipBlurEvent
-
+    @isFocused = false
    @wrap.removeClass('search-active')

    # If input is blank then restore state
    if @searchInput.val() is ''
      @restoreOriginalState()
-    , 150)

  addLocationBadge: (item) ->
    category = if item.category? then "#{item.category}: " else ''
@@ -268,3 +274,23 @@ class @SearchAutocomplete
              <li><a class='dropdown-menu-empty-link is-focused'>Loading...</a></li>
            </ul>"
    @dropdownContent.html(html)
+
+  onClick: (item, $el, e) ->
+    if location.pathname.indexOf(item.url) isnt -1
+      e.preventDefault()
+      if not @badgePresent
+        if item.category is 'Projects'
+          @projectInputEl.val(item.id)
+          @addLocationBadge(
+            value: 'This project'
+          )
+
+        if item.category is 'Groups'
+          @groupInputEl.val(item.id)
+          @addLocationBadge(
+            value: 'This group'
+          )
+
+      $el.removeClass('is-active')
+      @disableAutocomplete()
+      @searchInput.val('').focus()
--- a/app/assets/javascripts/zen_mode.js.coffee
+++ b/app/assets/javascripts/zen_mode.js.coffee
@@ -42,7 +42,7 @@ class @ZenMode
      $(e.currentTarget).trigger('zen_mode:leave')

    $(document).on 'zen_mode:enter', (e) =>
-      @enter(e.target.parentNode)
+      @enter($(e.target).closest('.md-area').find('.zen-backdrop'))
    $(document).on 'zen_mode:leave', (e) =>
      @exit()


--- a/app/assets/stylesheets/framework/common.scss
+++ b/app/assets/stylesheets/framework/common.scss
@@ -125,13 +125,6 @@ p.time {
  height: 150px;
 }

-// Fixes alignment on notes.
-.new_note {
-  label {
-    text-align: left;
-  }
-}
-
 // Fix issue with notes & lists creating a bunch of bottom borders.
 li.note {
  img { max-width: 100% }

--- a/app/assets/stylesheets/framework/files.scss
+++ b/app/assets/stylesheets/framework/files.scss
@@ -20,6 +20,7 @@
    margin: 0;
    text-align: left;
    padding: 10px $gl-padding;
+    word-wrap: break-word;

    .file-actions {
      float: right;

--- a/app/assets/stylesheets/framework/markdown_area.scss
+++ b/app/assets/stylesheets/framework/markdown_area.scss
 .div-dropzone-wrapper {
  .div-dropzone {
    position: relative;
-    padding: 0;
-    border: 0;
-    margin-bottom: 5px;
+    margin-bottom: -5px;

    .div-dropzone-focus {
      border-color: #66afe9 !important;
@@ -25,12 +23,10 @@

    .div-dropzone-spinner {
      position: absolute;
-      top: 100%;
-      left: 100%;
-      margin-top: -1.1em;
-      margin-left: -1.1em;
+      bottom: 10px;
+      right: 5px;
      opacity: 0;
-      font-size: 30px;
+      font-size: 20px;
      transition: opacity 200ms ease-in-out;
    }

@@ -65,17 +61,30 @@
  position: relative;
 }

+.md-header {
+  .nav-links {
+    .active {
+      a {
+        border-bottom-color: #000;
+      }
+    }
+
+    a {
+      padding-top: 0;
+      line-height: 1;
+    }
+  }
+}
+
 .referenced-users {
  color: #4c4e54;
  padding-top: 10px;
 }

 .md-preview-holder {
-  background: #fff;
-  border: 1px solid #ddd;
-  min-height: 169px;
-  padding: 5px;
-  box-shadow: none;
+  min-height: 167px;
+  padding: 10px 0;
+  overflow-x: auto;
 }

 .markdown-area {

--- a/app/assets/stylesheets/framework/typography.scss
+++ b/app/assets/stylesheets/framework/typography.scss
@@ -250,7 +250,7 @@ a > code {
 * Textareas intended for GFM
 *
 */
-textarea.js-gfm-input {
+.js-gfm-input {
  font-family: $monospace_font;
  color: $gl-text-color;
 }

--- a/app/assets/stylesheets/framework/variables.scss
+++ b/app/assets/stylesheets/framework/variables.scss
@@ -104,9 +104,9 @@ $orange-light: rgba(252, 109, 38, 0.80);
 $orange-normal: #e75e40;
 $orange-dark: #ce5237;

-$red-light: #f06559;
-$red-normal: #e52c5a;
-$red-dark: #d22852;
+$red-light: #e52c5a;
+$red-normal: #d22852;
+$red-dark: darken($red-normal, 5%);

 $border-white-light: #f1f2f4;
 $border-white-normal: #d6dae2;
@@ -128,9 +128,9 @@ $border-orange-light: #fc6d26;
 $border-orange-normal: #ce5237;
 $border-orange-dark: #c14e35;

-$border-red-light: #f24f41;
-$border-red-normal: #d22852;
-$border-red-dark: #ca264f;
+$border-red-light: #d22852;
+$border-red-normal: #ca264f;
+$border-red-dark: darken($border-red-normal, 5%);

 $help-well-bg: #fafafa;
 $help-well-border: #e5e5e5;
@@ -201,14 +201,14 @@ $award-emoji-new-btn-icon-color: #dcdcdc;
 /*
 * Search Box
 */
-$search-input-border-color: $dropdown-input-focus-border;
+$search-input-border-color: rgba(#4688f1, .8);
 $search-input-focus-shadow-color: $dropdown-input-focus-shadow;
-$search-input-width: $dropdown-width;
+$search-input-width: 244px;
 $location-badge-color: #aaa;
 $location-badge-bg: $gray-normal;
+$location-badge-active-bg: #4f91f8;
 $location-icon-color: #e7e9ed;
-$location-active-color: $gl-text-color;
-$location-active-bg: $search-input-border-color;
+$location-icon-active-color: #807e7e;

 /*
 *  Notes
@@ -217,3 +217,9 @@ $notes-light-color: #8e8e8e;
 $notes-action-color: #c3c3c3;
 $notes-role-color: #8e8e8e;
 $notes-role-border-color: #e4e4e4;
+
+$note-disabled-comment-color: #b2b2b2;
+$note-form-border-color: #e5e5e5;
+$note-toolbar-color: #959494;
+
+$zen-control-hover-color: #111;
--- a/app/assets/stylesheets/framework/zen.scss
+++ b/app/assets/stylesheets/framework/zen.scss
-.zennable {
-  a.js-zen-enter {
-    color: $gl-gray;
-    position: absolute;
-    top: 0;
-    right: 4px;
-    line-height: 56px;
-  }
-
-  a.js-zen-leave {
-    display: none;
-    color: $gl-text-color;
-    position: absolute;
-    top: 10px;
-    right: 10px;
-    padding: 5px;
-    font-size: 36px;
-
-    &:hover {
-      color: #111;
-    }
-  }
-
-  .zen-backdrop {
+.zen-backdrop {
  &.fullscreen {
    background-color: white;
    position: fixed;
@@ -47,15 +24,39 @@
      margin: 0 auto;
    }

-      a.js-zen-enter {
-        display: none;
-      }
-
-      a.js-zen-leave {
+    .zen-control-leave {
      display: block;
      position: absolute;
      top: 0;
    }
  }
+}
+
+.zen-cotrol {
+  padding: 0;
+  color: #555;
+  background: none;
+  border: 0;
+}
+
+.zen-control-full {
+  color: $note-toolbar-color;
+
+  &:hover {
+    color: $gl-link-color;
+    text-decoration: none;
+  }
+}
+
+.zen-control-leave {
+  display: none;
+  color: $gl-text-color;
+  position: absolute;
+  right: 10px;
+  padding: 5px;
+  font-size: 36px;
+
+  &:hover {
+    color: $zen-control-hover-color;
  }
 }
--- a/app/assets/stylesheets/pages/detail_page.scss
+++ b/app/assets/stylesheets/pages/detail_page.scss
@@ -33,8 +33,12 @@
  .description {
    margin-top: 6px;

-    p:last-child {
+    p {
+      overflow-x: auto;
+
+      &:last-child {
        margin-bottom: 0;
      }
    }
+  }
 }
--- a/app/assets/stylesheets/pages/diff.scss
+++ b/app/assets/stylesheets/pages/diff.scss
@@ -59,10 +59,15 @@
      border-collapse: separate;
      margin: 0;
      padding: 0;
+
      .line_holder td {
        line-height: $code_line_height;
        font-size: $code_font_size;
      }
+
+      td {
+        white-space: nowrap;
+      }
    }

    tr.line_holder.parallel {

--- a/app/assets/stylesheets/pages/merge_requests.scss
+++ b/app/assets/stylesheets/pages/merge_requests.scss
@@ -195,42 +195,6 @@
  line-height: 31px;
 }

-.disabled-comment-area {
-  padding: 16px 0;
-
-  .disabled-profile {
-    width: 40px;
-    height: 40px;
-    background: $border-gray-dark;
-    border-radius: 20px;
-    display: inline-block;
-    margin-right: 10px;
-  }
-
-  .disabled-comment {
-    background: $gray-light;
-    display: inline-block;
-    vertical-align: top;
-    height: 200px;
-    border-radius: 4px;
-    border: 1px solid $border-gray-normal;
-    padding-top: 90px;
-    text-align: center;
-    right: 20px;
-    position: absolute;
-    left: 70px;
-    margin-bottom: 20px;
-
-    span {
-      color: #b2b2b2;
-
-      a {
-        color: $md-link-color;
-      }
-    }
-  }
-}
-
 .builds {
  .table-holder {
    overflow-x: scroll;

--- a/app/assets/stylesheets/pages/note_form.scss
+++ b/app/assets/stylesheets/pages/note_form.scss
 /**
 * Note Form
 */
-
-.comment-btn {
-  @extend .btn-create;
-}
 .reply-btn {
  @extend .btn-primary;
  margin: 10px $gl-padding;
@@ -17,16 +13,17 @@
 }
 .diff-file,
 .discussion {
-  .new_note {
+  .new-note {
    margin: 0;
    border: none;
  }
 }
-.new_note {
+
+.new-note {
  display: none;
 }

-.new_note, .note-edit-form {
+.new-note, .note-edit-form {
  .note-form-actions {
    margin-top: $gl-padding;
  }
@@ -40,21 +37,18 @@
  img {
    max-width: 100%;
  }
+}

-  .note_text {
-    width: 100%;
-  }
+.note-textarea {
+  padding: 10px 0;
+  font-family: $regular_font;
+  border: 0;

-  .comment-hints {
-    margin-top: -12px;
+  &:focus {
+    outline: 0;
  }
 }

-/* loading indicator */
-.notes-busy {
-  margin: 18px;
-}
-
 .note-image-attach {
  @extend .col-md-4;
  margin-left: 45px;
@@ -62,38 +56,29 @@
 }

 .common-note-form {
-  margin: 0;
-  background: #fff;
-  padding: $gl-padding;
-  margin-left: -$gl-padding;
-  margin-right: -$gl-padding;
-  margin-bottom: -$gl-padding;
-}
+  .md-area {
+    padding: $gl-padding-top $gl-padding;
+    border: 1px solid $note-form-border-color;
+    border-radius: $border-radius-base;

-.note-form-actions {
-  .note-form-option {
-    margin-top: 8px;
-    margin-left: 30px;
-    @extend .pull-left;
-  }
+    &.is-focused {
+      border-color: $focus-border-color;
+      box-shadow: 0 0 2px rgba(#000, .2),
+                  0 0 4px rgba($focus-border-color, .4);

-  .js-notify-commit-author {
-    float: left;
+      .comment-toolbar,
+      .nav-links {
+        border-color: $focus-border-color;
      }
-
-  .write-preview-btn {
-    // makes the "absolute" position for links relative to this
-    position: relative;
-
-    // preview/edit buttons
-    > a {
-      position: absolute;
-      right: 5px;
-      top: 8px;
    }
  }
 }

+.discussion-form {
+  padding: $gl-padding-top $gl-padding;
+  background-color: #fff;
+}
+
 .note-edit-form {
  display: none;
  font-size: 15px;
@@ -152,11 +137,49 @@
  }
 }

-.comment-hints {
-  color: #999;
-  background: #fff;
-  padding: 7px;
-  margin-top: -7px;
-  border: 1px solid $border-color;
-  font-size: 13px;
+.comment-toolbar {
+  padding-top: $gl-padding-top;
+  color: $note-toolbar-color;
+  border-top: 1px solid $border-color;
+}
+
+.toolbar-button {
+  padding: 0;
+  background: none;
+  border: 0;
+  font-size: 14px;
+  line-height: 16px;
+
+  &:hover,
+  &:focus {
+    color: $gl-link-color;
+    outline: 0;
+  }
+
+  @media (min-width: $screen-md-min) {
+    float: left;
+    margin-right: $gl-padding;
+
+    &:last-child {
+      float: right;
+      margin-right: 0;
+    }
+  }
+}
+
+.toolbar-button-icon {
+  position: relative;
+  top: 1px;
+  margin-right: 3px;
+  color: inherit;
+  font-size: 16px;
+}
+
+.toolbar-text {
+  font-size: 14px;
+  line-height: 16px;
+
+  @media (min-width: $screen-md-min) {
+    float: left;
+  }
 }
--- a/app/assets/stylesheets/pages/notes.scss
+++ b/app/assets/stylesheets/pages/notes.scss
@@ -20,6 +20,12 @@ ul.notes {

  .timeline-content {
    margin-left: 55px;
+
+    &.timeline-content-form {
+      @media (max-width: $screen-sm-max) {
+        margin-left: 0;
+      }
+    }
  }

  .note-created-ago, .note-updated-at {
@@ -76,7 +82,7 @@ ul.notes {
        // On diffs code should wrap nicely and not overflow
        pre {
          code {
-            white-space: pre-wrap;
+            white-space: pre;
          }
        }

@@ -149,7 +155,7 @@ ul.notes {
    &.notes_content {
      background-color: #fff;
      border-width: 1px 0;
-      padding-top: 0;
+      padding: 0;
      vertical-align: top;
      &.parallel {
        border-width: 1px;
@@ -281,3 +287,21 @@ ul.notes {
    }
  }
 }
+
+.disabled-comment {
+  margin-left: -$gl-padding-top;
+  margin-right: -$gl-padding-top;
+  background-color: $gray-light;
+  border-radius: $border-radius-base;
+  border: 1px solid $border-gray-normal;
+  color: $note-disabled-comment-color;
+  line-height: 200px;
+
+  .disabled-comment-text {
+    line-height: normal;
+  }
+
+  a {
+    color: $gl-link-color;
+  }
+}
--- a/app/assets/stylesheets/pages/projects.scss
+++ b/app/assets/stylesheets/pages/projects.scss
@@ -315,7 +315,7 @@ pre.light-well {
 }

 .git-empty {
-  margin: 0 7px;
+  margin: 0 7px 7px;

  h5 {
    color: #5c5d5e;
@@ -401,7 +401,7 @@ pre.light-well {
  }

  .commit_short_id {
-    margin-right: 5px;
+    margin: 0 5px;
    color: $gl-link-color;
    font-weight: 600;
  }

--- a/app/assets/stylesheets/pages/search.scss
+++ b/app/assets/stylesheets/pages/search.scss
@@ -135,17 +135,18 @@

    .location-badge {
      @include transition(all .15s);
-      background-color: $location-active-bg;
+      background-color: $location-badge-active-bg;
      color: $white-light;
    }

    .search-input-wrap {
      i {
-        color: $location-active-color;
+        color: $location-icon-active-color;
+      }
    }
  }

-    &.has-location-badge {
+  &.has-value {
    .search-icon {
      display: none;
    }
@@ -155,7 +156,6 @@
      display: block;
    }
  }
-  }

  &.has-location-badge {
    .search-input-wrap {

--- a/app/assets/stylesheets/pages/status.scss
+++ b/app/assets/stylesheets/pages/status.scss
-.container-fluid .content {
+.container-fluid {
  .ci-status {
    padding: 2px 7px;
    margin-right: 5px;

--- a/app/controllers/omniauth_callbacks_controller.rb
+++ b/app/controllers/omniauth_callbacks_controller.rb
@@ -55,7 +55,7 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController
      end
    else
      saml_user = Gitlab::Saml::User.new(oauth)
-      saml_user.save
+      saml_user.save if saml_user.changed?
      @user = saml_user.gl_user

      continue_login_process

--- a/app/controllers/projects/project_members_controller.rb
+++ b/app/controllers/projects/project_members_controller.rb
@@ -107,9 +107,14 @@ class Projects::ProjectMembersController < Projects::ApplicationController
  end

  def apply_import
-    giver = Project.find(params[:source_project_id])
-    status = @project.team.import(giver, current_user)
+    source_project = Project.find(params[:source_project_id])
+
+    if can?(current_user, :read_project_member, source_project)
+      status = @project.team.import(source_project, current_user)
      notice = status ? "Successfully imported" : "Import failed"
+    else
+      return render_404
+    end

    redirect_to(namespace_project_project_members_path(project.namespace, project),
                notice: notice)

--- a/app/controllers/projects/wikis_controller.rb
+++ b/app/controllers/projects/wikis_controller.rb
@@ -99,6 +99,20 @@ class Projects::WikisController < Projects::ApplicationController
    )
  end

+  def markdown_preview
+    text = params[:text]
+
+    ext = Gitlab::ReferenceExtractor.new(@project, current_user, current_user)
+    ext.analyze(text)
+
+    render json: {
+      body: view_context.markdown(text, pipeline: :wiki, project_wiki: @project_wiki),
+      references: {
+        users: ext.users.map(&:username)
+      }
+    }
+  end
+
  def git_access
  end


--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -40,6 +40,9 @@ class ProjectsController < Projects::ApplicationController
  def update
    status = ::Projects::UpdateService.new(@project, current_user, project_params).execute

+    # Refresh the repo in case anything changed
+    @repository = project.repository
+
    respond_to do |format|
      if status
        flash[:notice] = "Project '#{@project.name}' was successfully updated."

--- a/app/models/project_services/builds_email_service.rb
+++ b/app/models/project_services/builds_email_service.rb
@@ -50,12 +50,15 @@ class BuildsEmailService < Service

  def execute(push_data)
    return unless supported_events.include?(push_data[:object_kind])
+    return unless should_build_be_notified?(push_data)

-    if should_build_be_notified?(push_data)
+    recipients = all_recipients(push_data)
+
+    if recipients.any?
      BuildEmailWorker.perform_async(
        push_data[:build_id],
-        all_recipients(push_data),
-        push_data,
+        recipients,
+        push_data
      )
    end
  end
@@ -84,7 +87,7 @@ class BuildsEmailService < Service
  end

  def all_recipients(data)
-    all_recipients = recipients.split(',')
+    all_recipients = recipients.split(',').compact.reject(&:blank?)

    if add_pusher? && data[:user][:email]
      all_recipients << "#{data[:user][:email]}"

--- a/app/views/layouts/_search.html.haml
+++ b/app/views/layouts/_search.html.haml
- if controller.controller_path =~ /^groups/
+- if controller.controller_path =~ /^groups/ && @group.persisted?
  - label = 'This group'
- if controller.controller_path =~ /^projects/
+- if controller.controller_path =~ /^projects/ && @project.persisted?
  - label = 'This project'

 .search.search-form{class: "#{'has-location-badge' if label.present?}"}

--- a/app/views/layouts/project.html.haml
+++ b/app/views/layouts/project.html.haml
@@ -5,10 +5,14 @@

 - content_for :scripts_body_top do
  - project = @target_project || @project
+  - if @project_wiki
+    - markdown_preview_path = namespace_project_wikis_markdown_preview_path(project.namespace, project)
+  - else
+    - markdown_preview_path = markdown_preview_namespace_project_path(project.namespace, project)
  - if current_user
    :javascript
      window.project_uploads_path = "#{namespace_project_uploads_path project.namespace,project}";
-      window.markdown_preview_path = "#{markdown_preview_namespace_project_path(project.namespace, project)}";
+      window.markdown_preview_path = "#{markdown_preview_path}";

 - content_for :scripts_body do
  = render "layouts/init_auto_complete" if current_user

--- a/app/views/projects/_md_preview.html.haml
+++ b/app/views/projects/_md_preview.html.haml
 .md-area
-  .md-header.clearfix
+  .md-header
    %ul.nav-links
      %li.active
-        %a.js-md-write-button(href="#md-write-holder" tabindex="-1")
+        %a.js-md-write-button{ href: "#md-write-holder" }
          Write
      %li
-        %a.js-md-preview-button(href="#md-preview-holder" tabindex="-1")
+        %a.js-md-preview-button{ href: "#md-preview-holder" }
          Preview
+      %li.pull-right
+        %button.zen-cotrol.zen-control-full.js-zen-enter{ type: 'button' }
+          Go full screen

-  %div
  .md-write-holder
    = yield
-    .md.md-preview-holder.hide
-      .js-md-preview{class: (preview_class if defined?(preview_class))}
+  .md.md-preview-holder.js-md-preview.hide{class: (preview_class if defined?(preview_class))}

  - if defined?(referenced_users) && referenced_users
    %div.referenced-users.hide

--- a/app/views/projects/_zen.html.haml
+++ b/app/views/projects/_zen.html.haml
-.zennable
-  .zen-backdrop
+.zen-backdrop
  - classes << ' js-gfm-input js-autosize markdown-area'
  - if defined?(f) && f
-      = f.text_area attr, class: classes
+    = f.text_area attr, class: classes, placeholder: "Write a comment or drag your files here..."
  - else
-      = text_area_tag attr, nil, class: classes
-    %a.js-zen-enter(tabindex="-1" href="#")
-      = icon('expand')
-      Edit in fullscreen
-    %a.js-zen-leave(tabindex="-1" href="#")
+    = text_area_tag attr, nil, class: classes, placeholder: "Write a comment or drag your files here..."
+  %a.zen-cotrol.zen-control-leave.js-zen-leave{ href: "#" }
    = icon('compress')
--- a/app/views/projects/merge_requests/widget/_show.html.haml
+++ b/app/views/projects/merge_requests/widget/_show.html.haml
@@ -22,4 +22,6 @@

  if(typeof merge_request_widget === 'undefined') {
    merge_request_widget = new MergeRequestWidget(opts);
+  } else {
+    merge_request_widget.setOpts(opts);
  }
--- a/app/views/projects/notes/_edit_form.html.haml
+++ b/app/views/projects/notes/_edit_form.html.haml
 .note-edit-form
-  = form_for note, url: namespace_project_note_path(@project.namespace, @project, note), method: :put, remote: true, authenticity_token: true, html: { class: 'edit-note js-quick-submit' } do |f|
+  = form_for note, url: namespace_project_note_path(@project.namespace, @project, note), method: :put, remote: true, authenticity_token: true, html: { class: 'edit-note common-note-form js-quick-submit' } do |f|
    = note_target_fields(note)
    = render layout: 'projects/md_preview', locals: { preview_class: 'md-preview' } do
-      = render 'projects/zen', f: f, attr: :note, classes: 'note_text js-note-text js-task-list-field'
+      = render 'projects/zen', f: f, attr: :note, classes: 'note-textarea js-note-text js-task-list-field'
      = render 'projects/notes/hints'

    .note-form-actions.clearfix
      = f.submit 'Save Comment', class: 'btn btn-nr btn-save btn-grouped js-comment-button'
-      = link_to  'Cancel', '#', class: 'btn btn-nr btn-cancel note-edit-cancel'
+      %button.btn.btn-nr.btn-cancel.note-edit-cancel{ type: 'button' }
+        Cancel
--- a/app/views/projects/notes/_form.html.haml
+++ b/app/views/projects/notes/_form.html.haml
-= form_for [@project.namespace.becomes(Namespace), @project, @note], remote: true, html: { :'data-type' => 'json', multipart: true, id: nil, class: "new_note js-new-note-form js-quick-submit common-note-form gfm-form" }, authenticity_token: true do |f|
+= form_for [@project.namespace.becomes(Namespace), @project, @note], remote: true, html: { :'data-type' => 'json', multipart: true, id: nil, class: "new-note js-new-note-form js-quick-submit common-note-form gfm-form" }, authenticity_token: true do |f|
  = hidden_field_tag :view, diff_view
  = hidden_field_tag :line_type
  = note_target_fields(@note)
@@ -8,7 +8,7 @@
  = f.hidden_field :noteable_type

  = render layout: 'projects/md_preview', locals: { preview_class: "md-preview", referenced_users: true } do
-    = render 'projects/zen', f: f, attr: :note, classes: 'note_text js-note-text'
+    = render 'projects/zen', f: f, attr: :note, classes: 'note-textarea js-note-text'
    = render 'projects/notes/hints'
    .error-alert


--- a/app/views/projects/notes/_hints.html.haml
+++ b/app/views/projects/notes/_hints.html.haml
-.comment-hints.clearfix
-  .pull-left
+.comment-toolbar.clearfix
+  .toolbar-text
+    Styling with
    = link_to 'Markdown', help_page_path('markdown', 'markdown'), target: '_blank', tabindex: -1
-    tip:
-    = random_markdown_tip
-  .pull-right
-    = link_to '#', class: 'markdown-selector', tabindex: -1 do
-      = icon('paperclip')
+    is supported
+  %button.toolbar-button.markdown-selector{ type: 'button', tabindex: '-1' }
+    = icon('file-image-o', class: 'toolbar-button-icon')
    Attach a file
--- a/app/views/projects/notes/_note.html.haml
+++ b/app/views/projects/notes/_note.html.haml
@@ -18,7 +18,7 @@
                = access
            = link_to '#', title: 'Edit comment', class: 'note-action-button js-note-edit' do
              = icon('pencil-square-o')
-            = link_to namespace_project_note_path(note.project.namespace, note.project, note), title: 'Remove comment', method: :delete, data: { confirm: 'Are you sure you want to remove this comment?' }, remote: true, class: 'note-action-button js-note-delete danger' do
+            = link_to namespace_project_note_path(note.project.namespace, note.project, note), title: 'Remove comment', method: :delete, data: { confirm: 'Are you sure you want to remove this comment?' }, remote: true, class: 'note-action-button js-note-delete' do
              = icon('trash-o')
      .note-body{class: note_editable?(note) ? 'js-task-list-container' : ''}
        .note-text

--- a/app/views/projects/notes/_notes_with_form.html.haml
+++ b/app/views/projects/notes/_notes_with_form.html.haml
 %ul#notes-list.notes.main-notes-list.timeline
  = render "projects/notes/notes"
-.js-notes-busy
-
-.js-main-target-form
- if can? current_user, :create_note, @project
+%ul.notes.timeline
+  %li.timeline-entry
+    - if can? current_user, :create_note, @project
+      .timeline-icon.hidden-xs.hidden-sm
+        %a.author_link{ href: user_path(current_user) }
+          = image_tag avatar_icon(current_user), alt: current_user.to_reference, class: 'avatar s40'
+      .timeline-content.timeline-content-form
        = render "projects/notes/form", view: diff_view
- else
-  .disabled-comment-area
-    .disabled-profile
-    .disabled-comment
-      %span
+    - else
+      .disabled-comment.text-center
+        .disabled-comment-text.inline
          Please
          = link_to "register",new_user_session_path
          or

--- a/config/gitlab.yml.example
+++ b/config/gitlab.yml.example
@@ -445,6 +445,8 @@ production: &base
      #
      # - { name: 'saml',
      #     label: 'Our SAML Provider',
+      #     groups_attribute: 'Groups',
+      #     external_groups: ['Contractors', 'Freelancers'],
      #     args: {
      #             assertion_consumer_service_url: 'https://gitlab.example.com/users/auth/saml/callback',
      #             idp_cert_fingerprint: '43:51:43:a1:b5:fc:8b:b7:0a:3a:a9:b1:0f:66:73:a8',
@@ -452,6 +454,7 @@ production: &base
      #             issuer: 'https://gitlab.example.com',
      #             name_identifier_format: 'urn:oasis:names:tc:SAML:2.0:nameid-format:transient'
      #           } }
+      #
      # - { name: 'crowd',
      #     args: {
      #       crowd_server_url: 'CROWD SERVER URL',

--- a/config/initializers/premailer.rb
+++ b/config/initializers/premailer.rb
@@ -3,5 +3,6 @@ Premailer::Rails.config.merge!(
  generate_text_part: false,
  preserve_styles: true,
  remove_comments: true,
-  remove_ids: true
+  remove_ids: true,
+  remove_scripts: false
 )
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -617,6 +617,7 @@ Rails.application.routes.draw do
          # Order matters to give priority to these matches
          get '/wikis/git_access', to: 'wikis#git_access'
          get '/wikis/pages', to: 'wikis#pages', as: 'wiki_pages'
+          post '/wikis/markdown_preview', to:'wikis#markdown_preview'
          post '/wikis', to: 'wikis#create'

          get '/wikis/*id/history', to: 'wikis#history', as: 'wiki_history', constraints: WIKI_SLUG_ID

--- a/doc/api/users.md
+++ b/doc/api/users.md
@@ -71,6 +71,7 @@ GET /users
    "state": "blocked",
    "created_at": "2012-05-23T08:01:01Z",
    "bio": null,
+    "location": null,
    "skype": "",
    "linkedin": "",
    "twitter": "",
@@ -128,6 +129,7 @@ Parameters:
  "created_at": "2012-05-23T08:00:58Z",
  "is_admin": false,
  "bio": null,
+  "location": null,
  "skype": "",
  "linkedin": "",
  "twitter": "",
@@ -156,6 +158,7 @@ Parameters:
  "confirmed_at": "2012-05-23T08:00:58Z",
  "last_sign_in_at": "2015-03-23T08:00:58Z",
  "bio": null,
+  "location": null,
  "skype": "",
  "linkedin": "",
  "twitter": "",
@@ -193,6 +196,7 @@ Parameters:
 - `extern_uid` (optional)       - External UID
 - `provider` (optional)         - External provider name
 - `bio` (optional)              - User's biography
+- `location` (optional)         - User's location
 - `admin` (optional)            - User is admin - true or false (default)
 - `can_create_group` (optional) - User can create groups - true or false
 - `confirm` (optional)          - Require confirmation - true (default) or false
@@ -220,6 +224,7 @@ Parameters:
 - `extern_uid`                  - External UID
 - `provider`                    - External provider name
 - `bio`                         - User's biography
+- `location` (optional)         - User's location
 - `admin` (optional)            - User is admin - true or false (default)
 - `can_create_group` (optional) - User can create groups - true or false
 - `external` (optional)         - Flags the user as external - true or false(default)
@@ -262,6 +267,7 @@ GET /user
  "state": "active",
  "created_at": "2012-05-23T08:00:58Z",
  "bio": null,
+  "location": null,
  "skype": "",
  "linkedin": "",
  "twitter": "",

--- a/doc/development/README.md
+++ b/doc/development/README.md
@@ -4,6 +4,7 @@
 - [CI setup](ci_setup.md) for testing GitLab
 - [Gotchas](gotchas.md) to avoid
 - [How to dump production data to staging](db_dump.md)
+- [Instrumentation](instrumentation.md)
 - [Migration Style Guide](migration_style_guide.md) for creating safe migrations
 - [Rake tasks](rake_tasks.md) for development
 - [Shell commands](shell_commands.md) in the GitLab codebase

--- a/doc/development/instrumentation.md
+++ b/doc/development/instrumentation.md
+# Instrumenting Ruby Code
+
+GitLab Performance Monitoring allows instrumenting of custom blocks of Ruby
+code. This can be used to measure the time spent in a specific part of a larger
+chunk of code. The resulting data is written to a separate series.
+
+To start measuring a block of Ruby code you should use
+`Gitlab::Metrics.measure` and give it a name for the series to store the data
+in:
+
+```ruby
+Gitlab::Metrics.measure(:user_logins) do
+  ...
+end
+```
+
+The first argument of this method is the series name and should be plural. This
+name will be prefixed with `rails_` or `sidekiq_` depending on whether the code
+was run in the Rails application or one of the Sidekiq workers. In the
+above example the final series names would be as follows:
+
+- rails_user_logins
+- sidekiq_user_logins
+
+Series names should be plural as this keeps the naming style in line with the
+other series names.
+
+By default metrics measured using a block contain a single value, "duration",
+which contains the number of milliseconds it took to execute the block. Custom
+values can be added by passing a Hash as the 2nd argument. Custom tags can be
+added by passing a Hash as the 3rd argument. A simple example is as follows:
+
+```ruby
+Gitlab::Metrics.measure(:example_series, { number: 10 }, { class: self.class.to_s }) do
+  ...
+end
+```
--- a/doc/integration/saml.md
+++ b/doc/integration/saml.md
@@ -131,8 +131,75 @@ On the sign in page there should now be a SAML button below the regular sign in
 Click the icon to begin the authentication process. If everything goes well the user
 will be returned to GitLab and will be signed in.

+## External Groups
+
+>**Note:**
+This setting is only available on GitLab 8.7 and above.
+
+SAML login includes support for external groups. You can define in the SAML
+settings which groups, to which your users belong in your IdP, you wish to be
+marked as [external](../permissions/permissions.md).
+
+### Requirements
+
+First you need to tell GitLab where to look for group information. For this you
+need to make sure that your IdP server sends a specific `AttributeStament` along
+with the regular SAML response. Here is an example:
+
+```xml
+<saml:AttributeStatement>
+  <saml:Attribute Name="Groups">
+    <saml:AttributeValue xsi:type="xs:string">SecurityGroup</saml:AttributeValue>
+    <saml:AttributeValue xsi:type="xs:string">Developers</saml:AttributeValue>
+    <saml:AttributeValue xsi:type="xs:string">Designers</saml:AttributeValue>
+  </saml:Attribute>
+</saml:AttributeStatement>
+```
+
+The name of the attribute can be anything you like, but it must contain the groups
+to which a user belongs. In order to tell GitLab where to find these groups, you need
+to add a `groups_attribute:` element to your SAML settings. You will also need to
+tell GitLab which groups are external via the `external_groups:` element:
+
+```yaml
+{ name: 'saml',
+  label: 'Our SAML Provider',
+  groups_attribute: 'Groups',
+  external_groups: ['Freelancers', 'Interns'],
+  args: {
+          assertion_consumer_service_url: 'https://gitlab.example.com/users/auth/saml/callback',
+          idp_cert_fingerprint: '43:51:43:a1:b5:fc:8b:b7:0a:3a:a9:b1:0f:66:73:a8',
+          idp_sso_target_url: 'https://login.example.com/idp',
+          issuer: 'https://gitlab.example.com',
+          name_identifier_format: 'urn:oasis:names:tc:SAML:2.0:nameid-format:transient'
+        } }
+```
+
 ## Customization

+### `auto_sign_in_with_provider`
+
+You can add this setting to your GitLab configuration to automatically redirect you
+to your SAML server for authentication, thus removing the need to click a button
+before actually signing in.
+
+For omnibus package:
+
+```ruby
+gitlab_rails['omniauth_auto_sign_in_with_provider'] = 'saml'
+```
+
+For installations from source:
+
+```yaml
+omniauth:
+  auto_sign_in_with_provider: saml
+```
+
+Please keep in mind that every sign in attempt will be redirected to the SAML server,
+so you will not be able to sign in using local credentials. Make sure that at least one
+of the SAML users has admin permissions.
+
 ### `attribute_statements`

 >**Note:**
@@ -205,6 +272,10 @@ To bypass this you can add `skip_before_action :verify_authenticity_token` to th
 where it can then be seen in the usual logs, or as a flash message in the login
 screen.

+That file is located at `/opt/gitlab/embedded/service/gitlab-rails/app/controllers`
+for Omnibus installations and by default on `/home/git/gitlab/app/controllers` for
+installations from source.
+
 ### Invalid audience

 This error means that the IdP doesn't recognize GitLab as a valid sender and

--- a/doc/markdown/markdown.md
+++ b/doc/markdown/markdown.md
@@ -31,7 +31,7 @@

 _GitLab uses the [Redcarpet Ruby library][redcarpet] for Markdown processing._

-For GitLab we developed something we call "GitLab Flavored Markdown" (GFM). It extends the standard Markdown in a few significant ways to add some useful functionality.
+GitLab uses "GitLab Flavored Markdown" (GFM). It extends the standard Markdown in a few significant ways to add some useful functionality. It was inspired by [GitHub Flavored Markdown](https://help.github.com/articles/basic-writing-and-formatting-syntax/).

 You can use GFM in


--- a/doc/permissions/permissions.md
+++ b/doc/permissions/permissions.md
@@ -54,11 +54,12 @@ documentation](../workflow/add-user/add-user.md).
 | Switch visibility level               |         |            |             |          | ✓      |
 | Transfer project to another namespace |         |            |             |          | ✓      |
 | Remove project                        |         |            |             |          | ✓      |
+| Force push to protected branches [^2] |         |            |             |          |        |
+| Remove protected branches [^2]        |         |            |             |          |        |
 | Remove pages                          |         |            |             |          | ✓      |
-| Force push to protected branches      |         |            |             |          |        |
-| Remove protected branches             |         |            |             |          |        |

 [^1]: If **Allow guest to access builds** is enabled in CI settings
+[^2]: Not allowed for Guest, Reporter, Developer, Master, or Owner

 ## Group


--- a/features/steps/shared/diff_note.rb
+++ b/features/steps/shared/diff_note.rb
@@ -125,7 +125,7 @@ module SharedDiffNote

  step 'I should only see one diff form' do
    page.within(diff_file_selector) do
-      expect(page).to have_css("form.new_note", count: 1)
+      expect(page).to have_css("form.new-note", count: 1)
    end
  end

@@ -161,7 +161,7 @@ module SharedDiffNote

  step 'I should see a temporary diff comment form' do
    page.within(diff_file_selector) do
-      expect(page).to have_css(".js-temp-notes-holder form.new_note")
+      expect(page).to have_css(".js-temp-notes-holder form.new-note")
    end
  end


--- a/features/steps/shared/note.rb
+++ b/features/steps/shared/note.rb
@@ -2,7 +2,7 @@ module SharedNote
  include Spinach::DSL

  step 'I delete a comment' do
-    page.within('.notes') do
+    page.within('.main-notes-list') do
      find('.note').hover
      find(".js-note-delete").click
    end
@@ -128,7 +128,7 @@ module SharedNote
  end

  step 'I edit the last comment with a +1' do
-    page.within(".notes") do
+    page.within(".main-notes-list") do
      find(".note").hover
      find('.js-note-edit').click
    end

--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
@@ -15,7 +15,7 @@ module API
    class User < UserBasic
      expose :created_at
      expose :is_admin?, as: :is_admin
-      expose :bio, :skype, :linkedin, :twitter, :website_url
+      expose :bio, :location, :skype, :linkedin, :twitter, :website_url
    end

    class Identity < Grape::Entity

--- a/lib/api/users.rb
+++ b/lib/api/users.rb
@@ -60,6 +60,7 @@ module API
      #   extern_uid                        - External authentication provider UID
      #   provider                          - External provider
      #   bio                               - Bio
+      #   location                          - Location of the user
      #   admin                             - User is admin - true or false (default)
      #   can_create_group                  - User can create groups - true or false
      #   confirm                           - Require user confirmation - true (default) or false
@@ -69,7 +70,7 @@ module API
      post do
        authenticated_as_admin!
        required_attributes! [:email, :password, :name, :username]
-        attrs = attributes_for_keys [:email, :name, :password, :skype, :linkedin, :twitter, :projects_limit, :username, :bio, :can_create_group, :admin, :confirm, :external]
+        attrs = attributes_for_keys [:email, :name, :password, :skype, :linkedin, :twitter, :projects_limit, :username, :bio, :location, :can_create_group, :admin, :confirm, :external]
        admin = attrs.delete(:admin)
        confirm = !(attrs.delete(:confirm) =~ (/(false|f|no|0)$/i))
        user = User.build_user(attrs)
@@ -108,6 +109,7 @@ module API
      #   website_url                       - Website url
      #   projects_limit                    - Limit projects each user can create
      #   bio                               - Bio
+      #   location                          - Location of the user
      #   admin                             - User is admin - true or false (default)
      #   can_create_group                  - User can create groups - true or false
      #   external                          - Flags the user as external - true or false(default)
@@ -116,7 +118,7 @@ module API
      put ":id" do
        authenticated_as_admin!

-        attrs = attributes_for_keys [:email, :name, :password, :skype, :linkedin, :twitter, :website_url, :projects_limit, :username, :bio, :can_create_group, :admin, :external]
+        attrs = attributes_for_keys [:email, :name, :password, :skype, :linkedin, :twitter, :website_url, :projects_limit, :username, :bio, :location, :can_create_group, :admin, :external]
        user = User.find(params[:id])
        not_found!('User') unless user


--- a/lib/banzai/filter/abstract_reference_filter.rb
+++ b/lib/banzai/filter/abstract_reference_filter.rb
@@ -119,7 +119,7 @@ module Banzai

          elsif element_node?(node)
            yield_valid_link(node) do |link, text|
-              if ref_pattern && link =~ /\A#{ref_pattern}/
+              if ref_pattern && link =~ /\A#{ref_pattern}\z/
                replace_link_node_with_href(node, link) do
                  object_link_filter(link, ref_pattern, link_text: text)
                end

--- a/lib/banzai/filter/gollum_tags_filter.rb
+++ b/lib/banzai/filter/gollum_tags_filter.rb
@@ -118,7 +118,7 @@ module Banzai
        end

        if path
-          content_tag(:img, nil, src: path)
+          content_tag(:img, nil, src: path, class: 'gfm')
        end
      end

@@ -144,12 +144,18 @@ module Banzai
      # if it is not.
      def process_page_link_tag(parts)
        if parts.size == 1
-          url = parts[0].strip
+          reference = parts[0].strip
        else
-          name, url = *parts.compact.map(&:strip)
+          name, reference = *parts.compact.map(&:strip)
        end

-        content_tag(:a, name || url, href: url)
+        if url?(reference)
+          href = reference
+        else
+          href = ::File.join(project_wiki_base_path, reference)
+        end
+
+        content_tag(:a, name || reference, href: href, class: 'gfm')
      end

      def project_wiki

--- a/lib/banzai/filter/wiki_link_filter.rb
+++ b/lib/banzai/filter/wiki_link_filter.rb
+require 'uri'
+
+module Banzai
+  module Filter
+    # HTML filter that "fixes" relative links to files in a repository.
+    #
+    # Context options:
+    #   :project_wiki
+    class WikiLinkFilter < HTML::Pipeline::Filter
+
+      def call
+        return doc unless project_wiki?
+
+        doc.search('a:not(.gfm)').each do |el|
+          process_link_attr el.attribute('href')
+        end
+
+        doc
+      end
+
+      protected
+
+      def project_wiki?
+        !context[:project_wiki].nil?
+      end
+
+      def process_link_attr(html_attr)
+        return if html_attr.blank? || file_reference?(html_attr)
+
+        uri = URI(html_attr.value)
+        if uri.relative? && uri.path.present?
+          html_attr.value = rebuild_wiki_uri(uri).to_s
+        end
+      rescue URI::Error
+        # noop
+      end
+
+      def rebuild_wiki_uri(uri)
+        uri.path = ::File.join(project_wiki_base_path, uri.path)
+        uri
+      end
+
+      def file_reference?(html_attr)
+        !File.extname(html_attr.value).blank?
+      end
+
+      def project_wiki
+        context[:project_wiki]
+      end
+
+      def project_wiki_base_path
+        project_wiki && project_wiki.wiki_base_path
+      end
+    end
+  end
+end
--- a/lib/banzai/pipeline/wiki_pipeline.rb
+++ b/lib/banzai/pipeline/wiki_pipeline.rb
@@ -2,8 +2,10 @@ module Banzai
  module Pipeline
    class WikiPipeline < FullPipeline
      def self.filters
-        @filters ||= super.insert_after(Filter::TableOfContentsFilter,
-                                        Filter::GollumTagsFilter)
+        @filters ||= begin
+          super.insert_after(Filter::TableOfContentsFilter, Filter::GollumTagsFilter)
+               .insert_before(Filter::TaskListFilter, Filter::WikiLinkFilter)
+        end
      end
    end
  end

--- a/lib/gitlab/ldap/access.rb
+++ b/lib/gitlab/ldap/access.rb
@@ -37,7 +37,10 @@ module Gitlab

      def allowed?
        if ldap_user
-          return true unless ldap_config.active_directory
+          unless ldap_config.active_directory
+            user.activate if user.ldap_blocked?
+            return true
+          end

          # Block user in GitLab if he/she was blocked in AD
          if Gitlab::LDAP::Person.disabled_via_active_directory?(user.ldap_identity.extern_uid, adapter)

--- a/lib/gitlab/metrics.rb
+++ b/lib/gitlab/metrics.rb
@@ -70,6 +70,32 @@ module Gitlab
      value.to_s.gsub('=', '\\=')
    end

+    # Measures the execution time of a block.
+    #
+    # Example:
+    #
+    #     Gitlab::Metrics.measure(:find_by_username_timings) do
+    #       User.find_by_username(some_username)
+    #     end
+    #
+    # series - The name of the series to store the data in.
+    # values - A Hash containing extra values to add to the metric.
+    # tags - A Hash containing extra tags to add to the metric.
+    #
+    # Returns the value yielded by the supplied block.
+    def self.measure(series, values = {}, tags = {})
+      return yield unless Transaction.current
+
+      start = Time.now.to_f
+      retval = yield
+      duration = (Time.now.to_f - start) * 1000.0
+      values = values.merge(duration: duration)
+
+      Transaction.current.add_metric(series, values, tags)
+
+      retval
+    end
+
    # When enabled this should be set before being used as the usual pattern
    # "@foo ||= bar" is _not_ thread-safe.
    if enabled?

--- a/lib/gitlab/saml/auth_hash.rb
+++ b/lib/gitlab/saml/auth_hash.rb
+module Gitlab
+  module Saml
+    class AuthHash < Gitlab::OAuth::AuthHash
+
+      def groups
+        get_raw(Gitlab::Saml::Config.groups)
+      end
+
+      private
+
+      def get_raw(key)
+        # Needs to call `all` because of https://git.io/vVo4u
+        # otherwise just the first value is returned
+        auth_hash.extra[:raw_info].all[key]
+      end
+
+    end
+  end
+end
--- a/lib/gitlab/saml/config.rb
+++ b/lib/gitlab/saml/config.rb
+module Gitlab
+  module Saml
+    class Config
+
+      class << self
+        def options
+          Gitlab.config.omniauth.providers.find { |provider| provider.name == 'saml' }
+        end
+
+        def groups
+          options[:groups_attribute]
+        end
+
+        def external_groups
+          options[:external_groups]
+        end
+      end
+
+    end
+  end
+end
--- a/lib/gitlab/saml/user.rb
+++ b/lib/gitlab/saml/user.rb
@@ -18,7 +18,7 @@ module Gitlab
          @user ||= find_or_create_ldap_user
        end

-        if auto_link_saml_enabled?
+        if auto_link_saml_user?
          @user ||= find_by_email
        end

@@ -26,6 +26,16 @@ module Gitlab
          @user ||= build_new_user
        end

+        if external_users_enabled?
+          # Check if there is overlap between the user's groups and the external groups
+          # setting then set user as external or internal.
+          if (auth_hash.groups & Gitlab::Saml::Config.external_groups).empty?
+            @user.external = false
+          else
+            @user.external = true
+          end
+        end
+
        @user
      end

@@ -37,11 +47,23 @@ module Gitlab
        end
      end

+      def changed?
+        gl_user.changed? || gl_user.identities.any?(&:changed?)
+      end
+
      protected

-      def auto_link_saml_enabled?
+      def auto_link_saml_user?
        Gitlab.config.omniauth.auto_link_saml_user
      end
+
+      def external_users_enabled?
+        !Gitlab::Saml::Config.external_groups.nil?
+      end
+
+      def auth_hash=(auth_hash)
+        @auth_hash = Gitlab::Saml::AuthHash.new(auth_hash)
+      end
    end
  end
 end
--- a/spec/controllers/projects/project_members_controller_spec.rb
+++ b/spec/controllers/projects/project_members_controller_spec.rb
+require('spec_helper')
+
+describe Projects::ProjectMembersController do
+  let(:project) { create(:project) }
+  let(:another_project) { create(:project, :private) }
+  let(:user) { create(:user) }
+  let(:member) { create(:user) }
+
+  before do
+    project.team << [user, :master]
+    another_project.team << [member, :guest]
+    sign_in(user)
+  end
+
+  describe '#apply_import' do
+    shared_context 'import applied' do
+      before do
+        post(:apply_import, namespace_id: project.namespace.to_param,
+                            project_id: project.to_param,
+                            source_project_id: another_project.id)
+      end
+    end
+
+    context 'when user can access source project members' do
+      before { another_project.team << [user, :guest] }
+      include_context 'import applied'
+
+      it 'imports source project members' do
+        expect(project.team_members).to include member
+        expect(response).to set_flash.to 'Successfully imported'
+        expect(response).to redirect_to(
+          namespace_project_project_members_path(project.namespace, project)
+        )
+      end
+    end
+
+    context 'when user is not member of a source project' do
+      include_context 'import applied'
+
+      it 'does not import team members' do
+        expect(project.team_members).to_not include member
+      end
+
+      it 'responds with not found' do
+        expect(response.status).to eq 404
+      end
+    end
+  end
+end
--- a/spec/controllers/projects_controller_spec.rb
+++ b/spec/controllers/projects_controller_spec.rb
@@ -83,6 +83,28 @@ describe ProjectsController do
    end
  end

+  describe "#update" do
+    render_views
+
+    let(:admin) { create(:admin) }
+
+    it "sets the repository to the right path after a rename" do
+      new_path = 'renamed_path'
+      project_params = { path: new_path }
+      controller.instance_variable_set(:@project, project)
+      sign_in(admin)
+
+      put :update,
+          namespace_id: project.namespace.to_param,
+          id: project.id,
+          project: project_params
+
+      expect(project.repository.path).to include(new_path)
+      expect(assigns(:repository).path).to eq(project.repository.path)
+      expect(response.status).to eq(200)
+    end
+  end
+
  describe "#destroy" do
    let(:admin) { create(:admin) }


--- a/spec/features/issues/filter_issues_spec.rb
+++ b/spec/features/issues/filter_issues_spec.rb
+require 'rails_helper'
+
+describe 'Filter issues', feature: true do
+
+  let!(:project)   { create(:project) }
+  let!(:user)      { create(:user)}
+  let!(:milestone) { create(:milestone, project: project) }
+  let!(:label)     { create(:label, project: project) }
+
+  before do
+    project.team << [user, :master]
+    login_as(user)
+  end
+
+  describe 'Filter issues for assignee from issues#index' do
+
+    before do
+      visit namespace_project_issues_path(project.namespace, project)
+
+      find('.js-assignee-search').click
+
+      find('.dropdown-menu-user-link', text: user.username).click
+
+      sleep 2
+    end
+
+    context 'assignee', js: true do
+      it 'should update to current user' do
+        expect(find('.js-assignee-search .dropdown-toggle-text')).to have_content(user.name)
+      end
+
+      it 'should not change when closed link is clicked' do
+        find('.issues-state-filters a', text: "Closed").click
+
+        expect(find('.js-assignee-search .dropdown-toggle-text')).to have_content(user.name)
+      end
+
+
+      it 'should not change when all link is clicked' do
+        find('.issues-state-filters a', text: "All").click
+
+        expect(find('.js-assignee-search .dropdown-toggle-text')).to have_content(user.name)
+      end
+    end
+  end
+
+  describe 'Filter issues for milestone from issues#index' do
+
+    before do
+      visit namespace_project_issues_path(project.namespace, project)
+
+      find('.js-milestone-select').click
+
+      find('.milestone-filter .dropdown-content a', text: milestone.title).click
+
+      sleep 2
+    end
+
+    context 'milestone', js: true do
+      it 'should update to current milestone' do
+        expect(find('.js-milestone-select .dropdown-toggle-text')).to have_content(milestone.title)
+      end
+
+      it 'should not change when closed link is clicked' do
+        find('.issues-state-filters a', text: "Closed").click
+
+        expect(find('.js-milestone-select .dropdown-toggle-text')).to have_content(milestone.title)
+      end
+
+
+      it 'should not change when all link is clicked' do
+        find('.issues-state-filters a', text: "All").click
+
+        expect(find('.js-milestone-select .dropdown-toggle-text')).to have_content(milestone.title)
+      end
+    end
+  end
+
+  describe 'Filter issues for assignee and label from issues#index' do
+
+    before do
+      visit namespace_project_issues_path(project.namespace, project)
+
+      find('.js-assignee-search').click
+
+      find('.dropdown-menu-user-link', text: user.username).click
+
+      sleep 2
+
+      find('.js-label-select').click
+
+      find('.dropdown-menu-labels .dropdown-content a', text: label.title).click
+
+      sleep 2
+    end
+
+    context 'assignee and label', js: true do
+      it 'should update to current assignee and label' do
+        expect(find('.js-assignee-search .dropdown-toggle-text')).to have_content(user.name)
+        expect(find('.js-label-select .dropdown-toggle-text')).to have_content(label.title)
+      end
+
+      it 'should not change when closed link is clicked' do
+        find('.issues-state-filters a', text: "Closed").click
+
+        expect(find('.js-assignee-search .dropdown-toggle-text')).to have_content(user.name)
+        expect(find('.js-label-select .dropdown-toggle-text')).to have_content(label.title)
+      end
+
+
+      it 'should not change when all link is clicked' do
+        find('.issues-state-filters a', text: "All").click
+
+        expect(find('.js-assignee-search .dropdown-toggle-text')).to have_content(user.name)
+        expect(find('.js-label-select .dropdown-toggle-text')).to have_content(label.title)
+      end
+    end
+  end
+end
--- a/spec/features/issues_spec.rb
+++ b/spec/features/issues_spec.rb
@@ -22,7 +22,7 @@ describe 'Issues', feature: true do

    before do
      visit edit_namespace_project_issue_path(project.namespace, project, issue)
-      click_link "Edit"
+      click_button "Go full screen"
    end

    it 'should open new issue popup' do

--- a/spec/features/markdown_spec.rb
+++ b/spec/features/markdown_spec.rb
@@ -39,7 +39,7 @@ describe 'GitLab Markdown', feature: true do
  end

  def doc(html = @html)
-    Nokogiri::HTML::DocumentFragment.parse(html)
+    @doc ||= Nokogiri::HTML::DocumentFragment.parse(html)
  end

  # Shared behavior that all pipelines should exhibit
@@ -230,6 +230,7 @@ describe 'GitLab Markdown', feature: true do
      file = Gollum::File.new(@project_wiki.wiki)
      expect(file).to receive(:path).and_return('images/example.jpg')
      expect(@project_wiki).to receive(:find_file).with('images/example.jpg').and_return(file)
+      allow(@project_wiki).to receive(:wiki_base_path) { '/namespace1/gitlabhq/wikis' }

      @html = markdown(@feat.raw_markdown, { pipeline: :wiki, project_wiki: @project_wiki })
    end

--- a/spec/features/notes_on_merge_requests_spec.rb
+++ b/spec/features/notes_on_merge_requests_spec.rb
@@ -152,7 +152,7 @@ describe 'Comments', feature: true do

        it 'has .new_note css class' do
          page.within('.js-temp-notes-holder') do
-            expect(subject).to have_css('.new_note')
+            expect(subject).to have_css('.new-note')
          end
        end
      end
@@ -225,6 +225,6 @@ describe 'Comments', feature: true do
  end

  def click_diff_line(data = line_code)
-    page.find(%Q{button[data-line-code="#{data}"]}, visible: false).click
+    execute_script("$('button[data-line-code=\"#{data}\"]').click()")
  end
 end
--- a/spec/javascripts/fixtures/zen_mode.html.haml
+++ b/spec/javascripts/fixtures/zen_mode.html.haml
-.zennable
+.md-area
  .zen-backdrop
    %textarea#note_note.js-gfm-input.markdown-area
    %a.js-zen-enter(tabindex="-1" href="#")

--- a/spec/javascripts/issue_spec.js.coffee
+++ b/spec/javascripts/issue_spec.js.coffee
@@ -29,7 +29,7 @@ describe 'reopen/close issue', ->
    spyOn(jQuery, 'ajax').and.callFake (req) ->
      expect(req.type).toBe('PUT')
      expect(req.url).toBe('http://gitlab.com/issues/6/close')
-      req.success saved: true
+      req.success id: 34

    $btnClose = $('a.btn-close')
    $btnReopen = $('a.btn-reopen')
@@ -94,7 +94,7 @@ describe 'reopen/close issue', ->
    spyOn(jQuery, 'ajax').and.callFake (req) ->
      expect(req.type).toBe('PUT')
      expect(req.url).toBe('http://gitlab.com/issues/6/reopen')
-      req.success saved: true
+      req.success id: 34

    $btnClose = $('a.btn-close')
    $btnReopen = $('a.btn-reopen')

--- a/spec/lib/banzai/filter/gollum_tags_filter_spec.rb
+++ b/spec/lib/banzai/filter/gollum_tags_filter_spec.rb
@@ -70,20 +70,22 @@ describe Banzai::Filter::GollumTagsFilter, lib: true do
  end

  context 'linking internal resources' do
-    it "the created link's text will be equal to the resource's text" do
+    it "the created link's text includes the resource's text and wiki base path" do
      tag = '[[wiki-slug]]'
      doc = filter("See #{tag}", project_wiki: project_wiki)
+      expected_path = ::File.join(project_wiki.wiki_base_path, 'wiki-slug')

      expect(doc.at_css('a').text).to eq 'wiki-slug'
-      expect(doc.at_css('a')['href']).to eq 'wiki-slug'
+      expect(doc.at_css('a')['href']).to eq expected_path
    end

    it "the created link's text will be link-text" do
      tag = '[[link-text|wiki-slug]]'
      doc = filter("See #{tag}", project_wiki: project_wiki)
+      expected_path = ::File.join(project_wiki.wiki_base_path, 'wiki-slug')

      expect(doc.at_css('a').text).to eq 'link-text'
-      expect(doc.at_css('a')['href']).to eq 'wiki-slug'
+      expect(doc.at_css('a')['href']).to eq expected_path
    end
  end


--- a/spec/lib/banzai/filter/issue_reference_filter_spec.rb
+++ b/spec/lib/banzai/filter/issue_reference_filter_spec.rb
@@ -95,6 +95,14 @@ describe Banzai::Filter::IssueReferenceFilter, lib: true do
      result = reference_pipeline_result("Fixed #{reference}")
      expect(result[:references][:issue]).to eq [issue]
    end
+
+    it 'does not process links containing issue numbers followed by text' do
+      href = "#{reference}st"
+      doc = reference_filter("<a href='#{href}'></a>")
+      link = doc.css('a').first.attr('href')
+
+      expect(link).to eq(href)
+    end
  end

  context 'cross-project reference' do

--- a/spec/lib/banzai/pipeline/wiki_pipeline_spec.rb
+++ b/spec/lib/banzai/pipeline/wiki_pipeline_spec.rb
@@ -11,7 +11,7 @@ describe Banzai::Pipeline::WikiPipeline do
          Foo
      MD

-      result = described_class.call(markdown, project: spy, project_wiki: double)
+      result = described_class.call(markdown, project: spy, project_wiki: spy)

      aggregate_failures do
        expect(result[:output].text).not_to include '[['
@@ -29,7 +29,7 @@ describe Banzai::Pipeline::WikiPipeline do
          Foo
      MD

-      output = described_class.to_html(markdown, project: spy, project_wiki: double)
+      output = described_class.to_html(markdown, project: spy, project_wiki: spy)

      expect(output).to include('[[<em>toc</em>]]')
    end
@@ -42,7 +42,7 @@ describe Banzai::Pipeline::WikiPipeline do
          Foo
      MD

-      output = described_class.to_html(markdown, project: spy, project_wiki: double)
+      output = described_class.to_html(markdown, project: spy, project_wiki: spy)

      aggregate_failures do
        expect(output).not_to include('<ul>')

--- a/spec/lib/gitlab/ldap/access_spec.rb
+++ b/spec/lib/gitlab/ldap/access_spec.rb
@@ -33,7 +33,7 @@ describe Gitlab::LDAP::Access, lib: true do

        it { is_expected.to be_falsey }

-        it 'should block user in GitLab' do
+        it 'blocks user in GitLab' do
          access.allowed?
          expect(user).to be_blocked
          expect(user).to be_ldap_blocked
@@ -78,6 +78,31 @@ describe Gitlab::LDAP::Access, lib: true do
        end

        it { is_expected.to be_truthy }
+
+        context 'when user cannot be found' do
+          before do
+            allow(Gitlab::LDAP::Person).to receive(:find_by_dn).and_return(nil)
+          end
+
+          it { is_expected.to be_falsey }
+
+          it 'blocks user in GitLab' do
+            access.allowed?
+            expect(user).to be_blocked
+            expect(user).to be_ldap_blocked
+          end
+        end
+
+        context 'when user was previously ldap_blocked' do
+          before do
+            user.ldap_block
+          end
+
+          it 'unblocks the user if it exists' do
+            access.allowed?
+            expect(user).not_to be_blocked
+          end
+        end
      end
    end
  end

--- a/spec/lib/gitlab/metrics_spec.rb
+++ b/spec/lib/gitlab/metrics_spec.rb
@@ -13,7 +13,7 @@ describe Gitlab::Metrics do
    end
  end

-  describe '#submit_metrics' do
+  describe '.submit_metrics' do
    it 'prepares and writes the metrics to InfluxDB' do
      connection = double(:connection)
      pool       = double(:pool)
@@ -26,7 +26,7 @@ describe Gitlab::Metrics do
    end
  end

-  describe '#prepare_metrics' do
+  describe '.prepare_metrics' do
    it 'returns a Hash with the keys as Symbols' do
      metrics = described_class.
        prepare_metrics([{ 'values' => {}, 'tags' => {} }])
@@ -51,7 +51,7 @@ describe Gitlab::Metrics do
    end
  end

-  describe '#escape_value' do
+  describe '.escape_value' do
    it 'escapes an equals sign' do
      expect(described_class.escape_value('foo=')).to eq('foo\\=')
    end
@@ -60,4 +60,45 @@ describe Gitlab::Metrics do
      expect(described_class.escape_value(10)).to eq('10')
    end
  end
+
+  describe '.measure' do
+    context 'without a transaction' do
+      it 'returns the return value of the block' do
+        val = Gitlab::Metrics.measure(:foo) { 10 }
+
+        expect(val).to eq(10)
+      end
+    end
+
+    context 'with a transaction' do
+      let(:transaction) { Gitlab::Metrics::Transaction.new }
+
+      before do
+        allow(Gitlab::Metrics::Transaction).to receive(:current).
+          and_return(transaction)
+      end
+
+      it 'adds a metric to the current transaction' do
+        expect(transaction).to receive(:add_metric).
+          with(:foo, { duration: a_kind_of(Numeric) }, { tag: 'value' })
+
+        Gitlab::Metrics.measure(:foo, {}, tag: 'value') { 10 }
+      end
+
+      it 'supports adding of custom values' do
+        values = { duration: a_kind_of(Numeric), number: 10 }
+
+        expect(transaction).to receive(:add_metric).
+          with(:foo, values, { tag: 'value' })
+
+        Gitlab::Metrics.measure(:foo, { number: 10 }, tag: 'value') { 10 }
+      end
+
+      it 'returns the return value of the block' do
+        val = Gitlab::Metrics.measure(:foo) { 10 }
+
+        expect(val).to eq(10)
+      end
+    end
+  end
 end
--- a/spec/lib/gitlab/saml/user_spec.rb
+++ b/spec/lib/gitlab/saml/user_spec.rb
--- a/spec/mailers/shared/notify.rb
+++ b/spec/mailers/shared/notify.rb
@@ -141,10 +141,12 @@ shared_examples 'a new user email' do
 end

 shared_examples 'it should have Gmail Actions links' do
+  it { is_expected.to have_body_text '<script type="application/ld+json">' }
  it { is_expected.to have_body_text /ViewAction/ }
 end

 shared_examples 'it should not have Gmail Actions links' do
+  it { is_expected.to_not have_body_text '<script type="application/ld+json">' }
  it { is_expected.to_not have_body_text /ViewAction/ }
 end


--- a/spec/models/project_services/builds_email_service_spec.rb
+++ b/spec/models/project_services/builds_email_service_spec.rb
@@ -6,18 +6,38 @@ describe BuildsEmailService do
  let(:service) { BuildsEmailService.new }

  describe :execute do
-    it "sends email" do
+    it 'sends email' do
      service.recipients = 'test@gitlab.com'
      data[:build_status] = 'failed'
      expect(BuildEmailWorker).to receive(:perform_async)
      service.execute(data)
    end

-    it "does not sends email with failed build and allowed_failure on" do
+    it 'does not send email with succeeded build and notify_only_broken_builds on' do
+      expect(service).to receive(:notify_only_broken_builds).and_return(true)
+      data[:build_status] = 'success'
+      expect(BuildEmailWorker).not_to receive(:perform_async)
+      service.execute(data)
+    end
+
+    it 'does not send email with failed build and build_allow_failure is true' do
      data[:build_status] = 'failed'
      data[:build_allow_failure] = true
      expect(BuildEmailWorker).not_to receive(:perform_async)
      service.execute(data)
    end
+
+    it 'does not send email with unknown build status' do
+      data[:build_status] = 'foo'
+      expect(BuildEmailWorker).not_to receive(:perform_async)
+      service.execute(data)
+    end
+
+    it 'does not send email when recipients list is empty' do
+      service.recipients = ' ,, '
+      data[:build_status] = 'failed'
+      expect(BuildEmailWorker).not_to receive(:perform_async)
+      service.execute(data)
+    end
  end
 end
--- a/spec/support/matchers/markdown_matchers.rb
+++ b/spec/support/matchers/markdown_matchers.rb
@@ -72,14 +72,15 @@ module MarkdownMatchers
      have_css("img[src$='#{src}']")
    end

+    prefix = '/namespace1/gitlabhq/wikis'
    set_default_markdown_messages

    match do |actual|
-      expect(actual).to have_link('linked-resource', href: 'linked-resource')
-      expect(actual).to have_link('link-text', href: 'linked-resource')
+      expect(actual).to have_link('linked-resource', href: "#{prefix}/linked-resource")
+      expect(actual).to have_link('link-text', href: "#{prefix}/linked-resource")
      expect(actual).to have_link('http://example.com', href: 'http://example.com')
      expect(actual).to have_link('link-text', href: 'http://example.com/pdfs/gollum.pdf')
-      expect(actual).to have_image('/gitlabhq/wikis/images/example.jpg')
+      expect(actual).to have_image("#{prefix}/images/example.jpg")
      expect(actual).to have_image('http://example.com/images/example.jpg')
    end
  end