Revert "Fix merge conflicts - squashed commit"

This reverts commit 3e991230.

app/assets/javascripts/search_autocomplete.js.coffee

@@ -20,7 +20,8 @@ class @SearchAutocomplete
     @dropdown = @wrap.find('.dropdown')
     @dropdownContent = @dropdown.find('.dropdown-content')
-    @locationBadgeEl = @getElement('.location-badge')
+    @locationBadgeEl = @getElement('.search-location-badge')
+    @locationText = @getElement('.location-text')
     @scopeInputEl = @getElement('#scope')
     @searchInput = @getElement('.search-input')
     @projectInputEl = @getElement('#search_project_id')
@@ -132,7 +133,7 @@ class @SearchAutocomplete
       scope: @scopeInputEl.val()
       # Location badge
-      _location: @locationBadgeEl.text()
+      _location: @locationText.text()
     }
   bindEvents: ->
@@ -142,14 +143,12 @@ class @SearchAutocomplete
     @searchInput.on 'click', @onSearchInputClick
     @searchInput.on 'focus', @onSearchInputFocus
     @clearInput.on 'click', @onClearInputClick
-    @locationBadgeEl.on 'click', =>
-      @searchInput.focus()
   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).closest('.search-form').length
+    if not $.contains(@dropdown[0], e.target) and @isFocused and not $(e.target).parents('ul').length
       @onSearchInputBlur()
   enableAutocomplete: ->
@@ -222,8 +221,10 @@ class @SearchAutocomplete
     category = if item.category? then "#{item.category}: " else ''
     value = if item.value? then item.value else ''
-    badgeText = "#{category}#{value}"
-    @locationBadgeEl.text(badgeText).show()
+    html = "<span class='location-badge'>
+              <i class='location-text'>#{category}#{value}</i>
+            </span>"
+    @locationBadgeEl.html(html)
     @wrap.addClass('has-location-badge')
   restoreOriginalState: ->
@@ -232,8 +233,9 @@ class @SearchAutocomplete
     for input in inputs
       @getElement("##{input}").val(@originalState[input])
+
     if @originalState._location is ''
-      @locationBadgeEl.hide()
+      @locationBadgeEl.empty()
     else
       @addLocationBadge(
         value: @originalState._location
@@ -242,7 +244,7 @@ class @SearchAutocomplete
     @dropdown.removeClass 'open'
   badgePresent: ->
-    @locationBadgeEl.length
+    @locationBadgeEl.children().length
   resetSearchState: ->
     inputs = Object.keys @originalState
@@ -255,7 +257,7 @@ class @SearchAutocomplete
       @getElement("##{input}").val('')
   removeLocationBadge: ->
-    @locationBadgeEl.hide()
+    @locationBadgeEl.empty()
     # Reset state
     @resetSearchState()

app/assets/javascripts/shortcuts_dashboard_navigation.js.coffee

@@ -3,10 +3,10 @@
 class @ShortcutsDashboardNavigation extends Shortcuts
  constructor: ->
    super()
-   Mousetrap.bind('g a', -> ShortcutsDashboardNavigation.findAndFollowLink('.dashboard-shortcuts-activity'))
-   Mousetrap.bind('g i', -> ShortcutsDashboardNavigation.findAndFollowLink('.dashboard-shortcuts-issues'))
-   Mousetrap.bind('g m', -> ShortcutsDashboardNavigation.findAndFollowLink('.dashboard-shortcuts-merge_requests'))
-   Mousetrap.bind('g p', -> ShortcutsDashboardNavigation.findAndFollowLink('.dashboard-shortcuts-projects'))
+   Mousetrap.bind('g a', -> ShortcutsDashboardNavigation.findAndFollowLink('.shortcuts-activity'))
+   Mousetrap.bind('g i', -> ShortcutsDashboardNavigation.findAndFollowLink('.shortcuts-issues'))
+   Mousetrap.bind('g m', -> ShortcutsDashboardNavigation.findAndFollowLink('.shortcuts-merge_requests'))
+   Mousetrap.bind('g p', -> ShortcutsDashboardNavigation.findAndFollowLink('.shortcuts-projects'))
  @findAndFollowLink: (selector) ->
    link = $(selector).attr('href')

app/assets/javascripts/shortcuts_issuable.coffee

@@ -6,10 +6,6 @@ class @ShortcutsIssuable extends ShortcutsNavigation
     super()
     Mousetrap.bind('a', @openSidebarDropdown.bind(@, 'assignee'))
     Mousetrap.bind('m', @openSidebarDropdown.bind(@, 'milestone'))
-    Mousetrap.bind('r', =>
-      @replyWithSelectedText()
-      return false
-    )
     Mousetrap.bind('j', =>
       @prevIssue()
       return false

app/assets/javascripts/sidebar.js.coffee

@@ -12,7 +12,7 @@ toggleSidebar = ->
     niceScrollBars.updateScrollBar();
   ), 300
-$(document).on("click", '.toggle-nav-collapse, .side-nav-toggle', (e) ->
+$(document).on("click", '.toggle-nav-collapse', (e) ->
   e.preventDefault()
   toggleSidebar()

app/assets/javascripts/graphs/stat_graph_contributors.js.coffee → app/assets/javascripts/stat_graph_contributors.js.coffee

 #= require d3
+#= require stat_graph_contributors_util
 class @ContributorsStatGraph
   init: (log) ->

app/assets/javascripts/graphs/stat_graph_contributors_graph.js.coffee → app/assets/javascripts/stat_graph_contributors_graph.js.coffee

 #= require d3
+#= require jquery
+#= require underscore
 class @ContributorsGraph
   MARGIN:

app/assets/javascripts/user_tabs.js.coffee

@@ -26,10 +26,6 @@
 #         Personal projects
 #       </a>
 #     </li>
-#    <li class="snippets-tab">
-#       <a data-action="snippets" data-target="#snippets" data-toggle="tab" href="/u/username/snippets">
-#       </a>
-#     </li>
 #   </ul>
 #
 #   <div class="tab-content">
@@ -45,9 +41,6 @@
 #     <div class="tab-pane" id="projects">
 #       Projects content
 #     </div>
-#     <div class="tab-pane" id="snippets">
-#       Snippets content
-#     </div>
 #   </div>
 #
 #   <div class="loading-status">
@@ -107,7 +100,7 @@ class @UserTabs
     if action is 'activity'
       @loadActivities(source)
-    if action in ['groups', 'contributed', 'projects', 'snippets']
+    if action in ['groups', 'contributed', 'projects']
       @loadTab(source, action)
   loadTab: (source, action) ->

app/assets/javascripts/users/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 d3
-#= require_tree .

app/assets/javascripts/users/calendar.js.coffee

-class @Calendar
-  constructor: (timestamps, @calendar_activities_path) ->
-    @currentSelectedDate = ''
-    @daySpace = 1
-    @daySize = 15
-    @daySizeWithSpace = @daySize + (@daySpace * 2)
-    @monthNames = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec']
-    @months = []
-    @highestValue = 0
-
-    # Get the highest value from the timestampes
-    _.each timestamps, (count) =>
-      if count > @highestValue
-        @highestValue = count
-
-    # Loop through the timestamps to create a group of objects
-    # The group of objects will be grouped based on the day of the week they are
-    @timestampsTmp = []
-    i = 0
-    group = 0
-    _.each timestamps, (count, date) =>
-      newDate = new Date parseInt(date) * 1000
-      day = newDate.getDay()
-
-      # Create a new group array if this is the first day of the week
-      # or if is first object
-      if (day is 0 and i isnt 0) or i is 0
-        @timestampsTmp.push []
-        group++
-
-      innerArray = @timestampsTmp[group-1]
-
-      # Push to the inner array the values that will be used to render map
-      innerArray.push
-        count: count
-        date: newDate
-        day: day
-
-      i++
-
-    # Init color functions
-    @color = @initColor()
-    @colorKey = @initColorKey()
-
-    # Init the svg element
-    @renderSvg(group)
-    @renderDays()
-    @renderMonths()
-    @renderDayTitles()
-    @renderKey()
-
-    @initTooltips()
-
-  renderSvg: (group) ->
-    @svg = d3.select '.js-contrib-calendar'
-      .append 'svg'
-      .attr 'width', (group + 1) * @daySizeWithSpace
-      .attr 'height', 167
-      .attr 'class', 'contrib-calendar'
-
-  renderDays: ->
-    @svg.selectAll 'g'
-      .data @timestampsTmp
-      .enter()
-      .append 'g'
-      .attr 'transform', (group, i) =>
-        _.each group, (stamp, a) =>
-          if a is 0 and stamp.day is 0
-            month = stamp.date.getMonth()
-            x = (@daySizeWithSpace * i + 1) + @daySizeWithSpace
-            lastMonth = _.last(@months)
-            if lastMonth?
-              lastMonthX = lastMonth.x
-
-            if !lastMonth?
-              @months.push
-                month: month
-                x: x
-            else if month isnt lastMonth.month and x - @daySizeWithSpace isnt lastMonthX
-              @months.push
-                month: month
-                x: x
-
-        "translate(#{(@daySizeWithSpace * i + 1) + @daySizeWithSpace}, 18)"
-      .selectAll 'rect'
-      .data (stamp) ->
-        stamp
-      .enter()
-      .append 'rect'
-      .attr 'x', '0'
-      .attr 'y', (stamp, i) =>
-        (@daySizeWithSpace * stamp.day)
-      .attr 'width', @daySize
-      .attr 'height', @daySize
-      .attr 'title', (stamp) =>
-        contribText = 'No contributions'
-
-        if stamp.count > 0
-          contribText = "#{stamp.count} contribution#{if stamp.count > 1 then 's' else ''}"
-
-        date = dateFormat(stamp.date, 'mmm d, yyyy')
-
-        "#{contribText}<br />#{date}"
-      .attr 'class', 'user-contrib-cell js-tooltip'
-      .attr 'fill', (stamp) =>
-        if stamp.count isnt 0
-          @color(stamp.count)
-        else
-          '#ededed'
-      .attr 'data-container', 'body'
-      .on 'click', @clickDay
-
-  renderDayTitles: ->
-    days = [{
-      text: 'M'
-      y: 29 + (@daySizeWithSpace * 1)
-    }, {
-      text: 'W'
-      y: 29 + (@daySizeWithSpace * 3)
-    }, {
-      text: 'F'
-      y: 29 + (@daySizeWithSpace * 5)
-    }]
-    @svg.append 'g'
-      .selectAll 'text'
-      .data days
-      .enter()
-      .append 'text'
-      .attr 'text-anchor', 'middle'
-      .attr 'x', 8
-      .attr 'y', (day) ->
-        day.y
-      .text (day) ->
-        day.text
-      .attr 'class', 'user-contrib-text'
-
-  renderMonths: ->
-    @svg.append 'g'
-      .selectAll 'text'
-      .data @months
-      .enter()
-      .append 'text'
-      .attr 'x', (date) ->
-        date.x
-      .attr 'y', 10
-      .attr 'class', 'user-contrib-text'
-      .text (date) =>
-        @monthNames[date.month]
-
-  renderKey: ->
-    keyColors = ['#ededed', @colorKey(0), @colorKey(1), @colorKey(2), @colorKey(3)]
-    @svg.append 'g'
-      .attr 'transform', "translate(18, #{@daySizeWithSpace * 8 + 16})"
-      .selectAll 'rect'
-      .data keyColors
-      .enter()
-      .append 'rect'
-      .attr 'width', @daySize
-      .attr 'height', @daySize
-      .attr 'x', (color, i) =>
-        @daySizeWithSpace * i
-      .attr 'y', 0
-      .attr 'fill', (color) ->
-        color
-
-  initColor: ->
-    d3.scale
-      .linear()
-      .range(['#acd5f2', '#254e77'])
-      .domain([0, @highestValue])
-
-  initColorKey: ->
-    d3.scale
-      .linear()
-      .range(['#acd5f2', '#254e77'])
-      .domain([0, 3])
-
-  clickDay: (stamp) =>
-    if @currentSelectedDate isnt stamp.date
-      @currentSelectedDate = stamp.date
-      formatted_date = @currentSelectedDate.getFullYear() + "-" + (@currentSelectedDate.getMonth()+1) + "-" + @currentSelectedDate.getDate()
-
-      $.ajax
-        url: @calendar_activities_path
-        data:
-          date: formatted_date
-        cache: false
-        dataType: 'html'
-        beforeSend: ->
-          $('.user-calendar-activities').html '<div class="text-center"><i class="fa fa-spinner fa-spin user-calendar-activities-loading"></i></div>'
-        success: (data) ->
-          $('.user-calendar-activities').html data
-    else
-      $('.user-calendar-activities').html ''
-
-  initTooltips: ->
-    $('.js-contrib-calendar .js-tooltip').tooltip
-      html: true

app/assets/javascripts/users_select.js.coffee

@@ -93,9 +93,7 @@ class @UsersSelect
       $dropdown.glDropdown(
         data: (term, callback) =>
-          isAuthorFilter = $('.js-author-search')
-
-          @users term, term is '' and isAuthorFilter, (users) =>
+          @users term, (users) =>
             if term.length is 0
               showDivider = 0
@@ -140,7 +138,7 @@ class @UsersSelect
         toggleLabel: (selected) ->
           if selected && 'id' of selected
-            if selected.text then selected.text else selected.name
+            selected.name
           else
             defaultLabel
@@ -221,7 +219,7 @@ class @UsersSelect
         multiple: $(select).hasClass('multiselect')
         minimumInputLength: 0
         query: (query) =>
-          @users query.term, @projectId?, (users) =>
+          @users query.term, (users) =>
             data = { results: users }
             if query.term.length == 0
@@ -304,7 +302,7 @@ class @UsersSelect
   # Return users list. Filtered by query
   # Only active users retrieved
-  users: (query, fromProject, callback) =>
+  users: (query, callback) =>
     url = @buildUrl(@usersPath)
     $.ajax(
@@ -313,7 +311,7 @@ class @UsersSelect
         search: query
         per_page: 20
         active: true
-        project_id: @projectId if fromProject
+        project_id: @projectId
         group_id: @groupId
         current_user: @showCurrentUser
         author_id: @authorId

app/assets/stylesheets/application.scss

@@ -8,7 +8,9 @@
  *= require select2
  *= require_self
  *= require dropzone/basic
+ *= require cal-heatmap
  *= require cropper.css
+ *= require animate
 */
 /*

app/assets/stylesheets/framework.scss

@@ -5,7 +5,6 @@
 @import 'framework/tw_bootstrap';
 @import "framework/layout";
-@import "framework/animations.scss";
 @import "framework/avatar.scss";
 @import "framework/blocks.scss";
 @import "framework/buttons.scss";

app/assets/stylesheets/framework/animations.scss

-// This file is based off animate.css 3.5.1, available here:
-// https://github.com/daneden/animate.css/blob/3.5.1/animate.css
-// 
-// animate.css - http://daneden.me/animate
-// Version - 3.5.1
-// Licensed under the MIT license - http://opensource.org/licenses/MIT
-// 
-// Copyright (c) 2016 Daniel Eden
-
-.animated {
-  -webkit-animation-duration: 1s;
-  animation-duration: 1s;
-  -webkit-animation-fill-mode: both;
-  animation-fill-mode: both;
-}
-
-.animated.infinite {
-  -webkit-animation-iteration-count: infinite;
-  animation-iteration-count: infinite;
-}
-
-.animated.hinge {
-  -webkit-animation-duration: 2s;
-  animation-duration: 2s;
-}
-
-.animated.flipOutX,
-.animated.flipOutY,
-.animated.bounceIn,
-.animated.bounceOut {
-  -webkit-animation-duration: .75s;
-  animation-duration: .75s;
-}
-
-@-webkit-keyframes pulse {
-  from {
-    -webkit-transform: scale3d(1, 1, 1);
-    transform: scale3d(1, 1, 1);
-  }
-
-  50% {
-    -webkit-transform: scale3d(1.05, 1.05, 1.05);
-    transform: scale3d(1.05, 1.05, 1.05);
-  }
-
-  to {
-    -webkit-transform: scale3d(1, 1, 1);
-    transform: scale3d(1, 1, 1);
-  }
-}
-
-@keyframes pulse {
-  from {
-    -webkit-transform: scale3d(1, 1, 1);
-    transform: scale3d(1, 1, 1);
-  }
-
-  50% {
-    -webkit-transform: scale3d(1.05, 1.05, 1.05);
-    transform: scale3d(1.05, 1.05, 1.05);
-  }
-
-  to {
-    -webkit-transform: scale3d(1, 1, 1);
-    transform: scale3d(1, 1, 1);
-  }
-}
-
-.pulse {
-  -webkit-animation-name: pulse;
-  animation-name: pulse;
-}

app/assets/stylesheets/framework/avatar.scss

@@ -45,7 +45,6 @@
   &.s32 { font-size: 20px; line-height: 32px; }
   &.s40 { font-size: 16px; line-height: 40px; }
   &.s60 { font-size: 32px; line-height: 60px; }
-  &.s70 { font-size: 34px; line-height: 70px; }
   &.s90 { font-size: 36px; line-height: 90px; }
   &.s110 { font-size: 40px; line-height: 112px; font-weight: 300; }
   &.s140 { font-size: 72px; line-height: 140px; }

app/assets/stylesheets/framework/blocks.scss

@@ -24,8 +24,8 @@
   background-color: $background-color;
   padding: $gl-padding;
   margin-bottom: 0;
-  border-top: 1px solid $white-dark;
-  border-bottom: 1px solid $white-dark;
+  border-top: 1px solid $border-color;
+  border-bottom: 1px solid $border-color;
   color: $gl-gray;
   &.oneline-block {
@@ -110,9 +110,9 @@
   .cover-title {
     color: $gl-header-color;
     margin: 0;
-    font-size: 24px;
+    font-size: 23px;
     font-weight: normal;
-    margin-bottom: 5px;
+    margin: 16px 0 5px;
     color: #4c4e54;
     font-size: 23px;
     line-height: 1.1;
@@ -137,6 +137,7 @@
   }
   .cover-desc {
+    padding: 0 $gl-padding 3px;
     color: $gl-text-color;
     &.username:last-child {
@@ -204,7 +205,7 @@
 .content-block {
   padding: $gl-padding 0;
-  border-bottom: 1px solid $white-dark;
+  border-bottom: 1px solid $border-color;
   &.oneline-block {
     line-height: 36px;

app/assets/stylesheets/framework/buttons.scss

@@ -16,19 +16,6 @@
   @include btn-default;
 }
-@mixin btn-outline($background, $text, $border, $hover-background, $hover-text, $hover-border) {
-  background-color: $background;
-  color: $text;
-  border-color: $border;
-
-  &:hover,
-  &:focus {
-    background-color: $hover-background;
-    color: $hover-text;
-    border-color: $hover-border;;
-  }
-}
-
 @mixin btn-color($light, $border-light, $normal, $border-normal, $dark, $border-dark, $color) {
   background-color: $light;
   border-color: $border-light;
@@ -119,14 +106,11 @@
     @include btn-blue;
   }
+  &.btn-close,
   &.btn-warning {
     @include btn-orange;
   }
-  &.btn-close {
-    @include btn-outline($white-light, $orange-normal, $orange-normal, $orange-light, $white-light, $orange-light);
-  }
-
   &.btn-danger,
   &.btn-remove,
   &.btn-red {

app/assets/stylesheets/framework/calendar.scss

 .calender-block {
-  padding-left: 0;
-  padding-right: 0;
-
   @media (min-width: $screen-sm-min) and (max-width: $screen-lg-min) {
     overflow-x: scroll;
   }
 }
 .user-calendar-activities {
+  .calendar_onclick_hr {
+    padding: 0;
+    margin: 10px 0;
+  }
+
   .str-truncated {
     max-width: 70%;
   }
-  .user-calendar-activities-loading {
-    font-size: 24px;
+  .text-expander {
+    background: #eee;
+    color: #555;
+    padding: 0 5px;
+    cursor: pointer;
+    margin-left: 4px;
+    &:hover {
+      background-color: #ddd;
+    }
   }
 }
-.user-calendar {
-  text-align: center;
-  .calendar {
-    display: inline-block;
+/**
+* This overwrites the default values of the cal-heatmap gem
+*/
+.calendar {
+  .qi {
+    fill: #fff;
+  }
+  .q1 {
+    fill: #ededed !important;
   }
-}
-.user-contrib-cell {
-  &:hover {
-    cursor: pointer;
-    stroke: #000;
+  .q2 {
+    fill: #acd5f2 !important;
   }
-}
-.user-contrib-text {
-  font-size: 12px;
-  fill: #959494;
-}
-.calendar-hint {
-  margin-top: -23px;
-  float: right;
-  font-size: 12px;
+  .q3 {
+    fill: #7fa8d1 !important;
+  }
+  .q4 {
+    fill: #49729b !important;
+  }
+
+  .q5 {
+    fill: #254e77 !important;
+  }
+
+  .future {
+    visibility: hidden;
+  }
+
+  .domain-background {
+    fill: none;
+    shape-rendering: crispedges;
+  }
+
+  .ch-tooltip {
+    padding: 3px;
+    font-weight: 550;
+  }
 }

app/assets/stylesheets/framework/common.scss

@@ -289,7 +289,7 @@ table {
   text-shadow: none;
   @media (min-width: $screen-sm-min) {
-    margin-top: 8px;
+    margin-top: 11px;
   }
 }