Revert "squashed merge and fixed conflicts"

This reverts commit 13e37a3e.

.gitlab-ci.yml

@@ -7,8 +7,7 @@ services:
 cache:
   key: "ruby21"
   paths:
-  - vendor/apt
-  - vendor/ruby
+  - vendor
 variables:
   MYSQL_ALLOW_EMPTY_PASSWORD: "1"
@@ -92,7 +91,9 @@ update-knapsack:
     - export KNAPSACK_REPORT_PATH=knapsack/spinach_node_${CI_NODE_INDEX}_${CI_NODE_TOTAL}_report.json
     - export KNAPSACK_GENERATE_REPORT=true
     - cp knapsack/spinach_report.json ${KNAPSACK_REPORT_PATH}
-    - knapsack spinach "-r rerun" || retry '[ ! -e tmp/spinach-rerun.txt ] || bundle exec spinach -r rerun $(cat tmp/spinach-rerun.txt)'
+    - knapsack spinach "-r rerun"
+    # retry failed tests 3 times
+    - retry '[ ! -e tmp/spinach-rerun.txt ] || bin/spinach -r rerun $(cat tmp/spinach-rerun.txt)'
   artifacts:
     paths:
     - knapsack/

.rubocop.yml

@@ -349,7 +349,7 @@ Style/MultilineArrayBraceLayout:
 # Avoid multi-line chains of blocks.
 Style/MultilineBlockChain:
-  Enabled: true
+  Enabled: false
 # Ensures newlines after multiline block do statements.
 Style/MultilineBlockLayout:

CHANGELOG

@@ -2,18 +2,14 @@ Please view this file on the master branch, on stable branches it's out of date.
 v 8.9.0 (unreleased)
   - Fix Error 500 when using closes_issues API with an external issue tracker
-  - Add more information into RSS feed for issues (Alexander Matyushentsev)
   - Bulk assign/unassign labels to issues.
   - Ability to prioritize labels !4009 / !3205 (Thijs Wouters)
   - Fix endless redirections when accessing user OAuth applications when they are disabled
   - Allow enabling wiki page events from Webhook management UI
   - Bump rouge to 1.11.0
   - Fix issue with arrow keys not working in search autocomplete dropdown
-  - Fix an issue where note polling stopped working if a window was in the
-    background during a refresh.
   - Make EmailsOnPushWorker use Sidekiq mailers queue
   - Fix wiki page events' webhook to point to the wiki repository
-  - Don't show tags for revert and cherry-pick operations
   - Fix issue todo not remove when leave project !4150 (Long Nguyen)
   - Allow customisable text on the 'nearly there' page after a user signs up
   - Bump recaptcha gem to 3.0.0 to remove deprecated stoken support
@@ -22,19 +18,11 @@ v 8.9.0 (unreleased)
   - Added descriptions to notification settings dropdown
   - Improve note validation to prevent errors when creating invalid note via API
   - Reduce number of fog gem dependencies
-  - Implement a fair usage of shared runners
   - Remove project notification settings associated with deleted projects
   - Fix 404 page when viewing TODOs that contain milestones or labels in different projects
-  - Add a metric for the number of new Redis connections created by a transaction
-  - Fix Error 500 when viewing a blob with binary characters after the 1024-byte mark
   - Redesign navigation for project pages
-  - Added shortcut 'y' for copying a files content hash URL #14470
   - Fix groups API to list only user's accessible projects
-  - Fix horizontal scrollbar for long commit message.
-  - Add Environments and Deployments
   - Redesign account and email confirmation emails
-  - Don't fail builds for projects that are deleted
-  - Support Docker Registry manifest v1
   - `git clone https://host/namespace/project` now works, in addition to using the `.git` suffix
   - Bump nokogiri to 1.6.8
   - Use gitlab-shell v3.0.0
@@ -45,20 +33,14 @@ v 8.9.0 (unreleased)
   - Add DB index on users.state
   - Add rake task 'gitlab:db:configure' for conditionally seeding or migrating the database
   - Changed the Slack build message to use the singular duration if necessary (Aran Koning)
-  - Fix race condition on merge when build succeeds
   - Links from a wiki page to other wiki pages should be rewritten as expected
   - Add option to project to only allow merge requests to be merged if the build succeeds (Rui Santos)
-  - Added navigation shortcuts to the project pipelines, milestones, builds and forks page. !4393
   - Fix issues filter when ordering by milestone
-  - Added artifacts:when to .gitlab-ci.yml - this requires GitLab Runner 1.3
-  - Bamboo Service: Fix missing credentials & URL handling when base URL contains a path (Benjamin Schmid)
-  - TeamCity Service: Fix URL handling when base URL contains a path
   - Todos will display target state if issuable target is 'Closed' or 'Merged'
   - Fix bug when sorting issues by milestone due date and filtering by two or more labels
   - Add support for using Yubikeys (U2F) for two-factor authentication
   - Link to blank group icon doesn't throw a 404 anymore
   - Remove 'main language' feature
-  - Toggle whitespace button now available for compare branches diffs #17881
   - Pipelines can be canceled only when there are running builds
   - Use downcased path to container repository as this is expected path by Docker
   - Projects pending deletion will render a 404 page
@@ -70,59 +52,34 @@ v 8.9.0 (unreleased)
   - Use Knapsack only in CI environment
   - Cache project build count in sidebar nav
   - Add milestone expire date to the right sidebar
-  - Manually mark a issue or merge request as a todo
   - Fix markdown_spec to use before instead of before(:all) to properly cleanup database after testing
   - Reduce number of queries needed to render issue labels in the sidebar
   - Improve error handling importing projects
   - Remove duplicated notification settings
   - Put project Files and Commits tabs under Code tab
-  - Decouple global notification level from user model
   - Replace Colorize with Rainbow for coloring console output in Rake tasks.
   - Add workhorse controller and API helpers
   - An indicator is now displayed at the top of the comment field for confidential issues.
-  - Show categorised search queries in the search autocomplete
   - RepositoryCheck::SingleRepositoryWorker public and private methods are now instrumented
   - Improve issuables APIs performance when accessing notes !4471
   - External links now open in a new tab
-  - Prevent default actions of disabled buttons and links
   - Markdown editor now correctly resets the input value on edit cancellation !4175
   - Toggling a task list item in a issue/mr description does not creates a Todo for mentions
   - Improved UX of date pickers on issue & milestone forms
   - Cache on the database if a project has an active external issue tracker.
   - Put project Labels and Milestones pages links under Issues and Merge Requests tabs as subnav
-  - All classes in the Banzai::ReferenceParser namespace are now instrumented
-  - Remove deprecated issues_tracker and issues_tracker_id from project model
-  - Allow users to create confidential issues in private projects
-  - Measure CPU time for instrumented methods
-  - Instrument private methods and private instance methods by default instead just public methods
-  - Only show notes through JSON on confidential issues that the user has access to
-  - Updated the allocations Gem to version 1.0.5
-  - The background sampler now ignores classes without names
-  - Update design for `Close` buttons
-  - New custom icons for navigation
-  - Horizontally scrolling navigation on project, group, and profile settings pages
-  - Hide global side navigation by default
-  - Fix project Star/Unstar project button tooltip
-  - Remove tanuki logo from side navigation; center on top nav
-  - Include user relationships when retrieving award_emoji
-  - Various associations are now eager loaded when parsing issue references to reduce the number of queries executed
-  - Set inverse_of for Project/Service association to reduce the number of queries
-
-v 8.8.5
-  - Import GitHub repositories respecting the API rate limit !4166
-  - Fix todos page throwing errors when you have a project pending deletion !4300
-  - Disable Webhooks before proceeding with the GitHub import !4470
-  - Fix importer for GitHub comments on diff !4488
-  - Adjust the SAML control flow to allow LDAP identities to be added to an existing SAML user !4498
-  - Fix incremental trace upload API when using multi-byte UTF-8 chars in trace !4541
-  - Prevent unauthorized access for projects build traces
-  - Forbid scripting for wiki files
-  - Only show notes through JSON on confidential issues that the user has access to
+
+v 8.8.5 (unreleased)
+  - Ensure branch cleanup regardless of whether the GitHub import process succeeds
+  - Fix todos page throwing errors when you have a project pending deletion
+  - Reduce number of SQL queries when rendering user references
+  - Import GitHub repositories respecting the API rate limit
+  - Fix importer for GitHub comments on diff
+  - Disable Webhooks before proceeding with the GitHub import
+  - Fix incremental trace upload API when using multi-byte UTF-8 chars in trace
 v 8.8.4
   - Fix LDAP-based login for users with 2FA enabled. !4493
-  - Added descriptions to notification settings dropdown
-  - Due date can be removed from milestones
 v 8.8.3
   - Fix 404 page when viewing TODOs that contain milestones or labels in different projects. !4312
@@ -238,9 +195,6 @@ v 8.8.0
 v 8.7.7
   - Fix import by `Any Git URL` broken if the URL contains a space
-  - Prevent unauthorized access to other projects build traces
-  - Forbid scripting for wiki files
-  - Only show notes through JSON on confidential issues that the user has access to
 v 8.7.6
   - Fix links on wiki pages for relative url setups. !4131 (Artem Sidorenko)
@@ -403,11 +357,6 @@ v 8.7.0
   - Add RAW build trace output and button on build page
   - Add incremental build trace update into CI API
-v 8.6.9
-  - Prevent unauthorized access to other projects build traces
-  - Forbid scripting for wiki files
-  - Only show notes through JSON on confidential issues that the user has access to
-
 v 8.6.8
   - Prevent privilege escalation via "impersonate" feature
   - Prevent privilege escalation via notes API
@@ -562,10 +511,6 @@ 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.13
-  - Prevent unauthorized access to other projects build traces
-  - Forbid scripting for wiki files
-
 v 8.5.12
   - Prevent privilege escalation via "impersonate" feature
   - Prevent privilege escalation via notes API
@@ -727,10 +672,6 @@ v 8.5.0
   - Show label row when filtering issues or merge requests by label (Nuttanart Pornprasitsakul)
   - Add Todos
-v 8.4.11
-  - Prevent unauthorized access to other projects build traces
-  - Forbid scripting for wiki files
-
 v 8.4.10
   - Prevent privilege escalation via "impersonate" feature
   - Prevent privilege escalation via notes API
@@ -867,10 +808,6 @@ 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.10
-  - Prevent unauthorized access to other projects build traces
-  - Forbid scripting for wiki files
-
 v 8.3.9
   - Prevent privilege escalation via "impersonate" feature
   - Prevent privilege escalation via notes API
@@ -989,10 +926,6 @@ v 8.3.0
   - Expose Git's version in the admin area
   - Show "New Merge Request" buttons on canonical repos when you have a fork (Josh Frye)
-v 8.2.6
-  - Prevent unauthorized access to other projects build traces
-  - Forbid scripting for wiki files
-
 v 8.2.5
   - Prevent privilege escalation via "impersonate" feature
   - Prevent privilege escalation via notes API

Gemfile

@@ -210,9 +210,6 @@ gem 'mousetrap-rails', '~> 1.4.6'
 # Detect and convert string character encoding
 gem 'charlock_holmes', '~> 0.7.3'
-# Parse duration
-gem 'chronic_duration', '~> 0.10.6'
-
 gem "sass-rails", '~> 5.0.0'
 gem "coffee-rails", '~> 4.1.0'
 gem "uglifier", '~> 2.7.2'
@@ -227,6 +224,7 @@ gem 'gon',                '~> 6.0.1'
 gem 'jquery-atwho-rails', '~> 1.3.2'
 gem 'jquery-rails',       '~> 4.1.0'
 gem 'jquery-ui-rails',    '~> 5.0.0'
+gem 'raphael-rails',      '~> 2.1.2'
 gem 'request_store',      '~> 1.3.0'
 gem 'select2-rails',      '~> 3.5.9'
 gem 'virtus',             '~> 1.0.1'
@@ -247,7 +245,7 @@ end
 group :development do
   gem "foreman"
-  gem 'brakeman', '~> 3.3.0', require: false
+  gem 'brakeman', '~> 3.2.0', require: false
   gem 'letter_opener_web', '~> 1.3.0'
   gem 'quiet_assets', '~> 1.0.2'

Gemfile.lock

@@ -50,7 +50,7 @@ GEM
     after_commit_queue (1.3.0)
       activerecord (>= 3.0)
     akismet (2.0.0)
-    allocations (1.0.5)
+    allocations (1.0.4)
     arel (6.0.3)
     asana (0.4.0)
       faraday (~> 0.9)
@@ -97,7 +97,16 @@ GEM
     bootstrap-sass (3.3.6)
       autoprefixer-rails (>= 5.2.1)
       sass (>= 3.3.4)
-    brakeman (3.3.2)
+    brakeman (3.2.1)
+      erubis (~> 2.6)
+      haml (>= 3.0, < 5.0)
+      highline (>= 1.6.20, < 2.0)
+      ruby2ruby (~> 2.3.0)
+      ruby_parser (~> 3.8.1)
+      safe_yaml (>= 1.0)
+      sass (~> 3.0)
+      slim (>= 1.3.6, < 4.0)
+      terminal-table (~> 1.4)
     browser (2.0.3)
     builder (3.2.2)
     bullet (5.0.0)
@@ -124,8 +133,6 @@ GEM
       mime-types (>= 1.16)
     cause (0.1)
     charlock_holmes (0.7.3)
-    chronic_duration (0.10.6)
-      numerizer (~> 0.1.1)
     chunky_png (1.3.5)
     cliver (0.3.2)
     coderay (1.1.0)
@@ -277,7 +284,7 @@ GEM
       posix-spawn (~> 0.3)
     gitlab_emoji (0.3.1)
       gemojione (~> 2.2, >= 2.2.1)
-    gitlab_git (10.1.3)
+    gitlab_git (10.1.0)
       activesupport (~> 4.0)
       charlock_holmes (~> 0.7.3)
       github-linguist (~> 4.7.0)
@@ -331,6 +338,7 @@ GEM
     hashie (3.4.3)
     health_check (1.5.1)
       rails (>= 2.3.0)
+    highline (1.7.8)
     hipchat (1.5.2)
       httparty
       mimemagic
@@ -400,7 +408,7 @@ GEM
       mime-types (>= 1.16, < 4)
     mail_room (0.7.0)
     method_source (0.8.2)
-    mime-types (2.99.2)
+    mime-types (2.99.1)
     mimemagic (0.3.0)
     mini_portile2 (2.1.0)
     minitest (5.7.0)
@@ -416,7 +424,6 @@ GEM
     nokogiri (1.6.8)
       mini_portile2 (~> 2.1.0)
       pkg-config (~> 1.1.7)
-    numerizer (0.1.1)
     oauth (0.4.7)
     oauth2 (1.0.0)
       faraday (>= 0.8, < 0.10)
@@ -556,6 +563,7 @@ GEM
     rainbow (2.1.0)
     raindrops (0.15.0)
     rake (10.5.0)
+    raphael-rails (2.1.2)
     rb-fsevent (0.9.6)
     rb-inotify (0.9.5)
       ffi (>= 0.5.0)
@@ -634,7 +642,10 @@ GEM
     ruby-saml (1.1.2)
       nokogiri (>= 1.5.10)
       uuid (~> 2.3)
-    ruby_parser (3.8.2)
+    ruby2ruby (2.3.0)
+      ruby_parser (~> 3.1)
+      sexp_processor (~> 4.0)
+    ruby_parser (3.8.1)
       sexp_processor (~> 4.1)
     rubyntlm (0.5.2)
     rubypants (0.2.0)
@@ -644,7 +655,7 @@ GEM
     safe_yaml (1.0.4)
     sanitize (2.1.0)
       nokogiri (>= 1.4.4)
-    sass (3.4.22)
+    sass (3.4.21)
     sass-rails (5.0.4)
       railties (>= 4.0.0, < 5.0)
       sass (~> 3.1)
@@ -693,6 +704,9 @@ GEM
       tilt (>= 1.3, < 3)
     six (0.2.0)
     slack-notifier (1.2.1)
+    slim (3.0.6)
+      temple (~> 0.7.3)
+      tilt (>= 1.3.3, < 2.1)
     slop (3.6.0)
     spinach (0.8.10)
       colorize
@@ -733,8 +747,10 @@ GEM
       railties (>= 3.2.5, < 6)
     teaspoon-jasmine (2.2.0)
       teaspoon (>= 1.0.0)
+    temple (0.7.6)
     term-ansicolor (1.3.2)
       tins (~> 1.0)
+    terminal-table (1.5.2)
     test_after_commit (0.4.2)
       activerecord (>= 3.2)
     thin (1.6.4)
@@ -743,7 +759,7 @@ GEM
       rack (~> 1.0)
     thor (0.19.1)
     thread_safe (0.3.5)
-    tilt (2.0.5)
+    tilt (2.0.2)
     timecop (0.8.1)
     timfel-krb5-auth (0.8.3)
     tinder (1.10.1)
@@ -832,7 +848,7 @@ DEPENDENCIES
   better_errors (~> 1.0.1)
   binding_of_caller (~> 0.7.2)
   bootstrap-sass (~> 3.3.0)
-  brakeman (~> 3.3.0)
+  brakeman (~> 3.2.0)
   browser (~> 2.0.3)
   bullet
   bundler-audit
@@ -841,7 +857,6 @@ DEPENDENCIES
   capybara-screenshot (~> 1.0.0)
   carrierwave (~> 0.10.0)
   charlock_holmes (~> 0.7.3)
-  chronic_duration (~> 0.10.6)
   coffee-rails (~> 4.1.0)
   connection_pool (~> 2.0)
   coveralls (~> 0.8.2)
@@ -937,6 +952,7 @@ DEPENDENCIES
   rails (= 4.2.6)
   rails-deprecated_sanitizer (~> 1.0.3)
   rainbow (~> 2.1.0)
+  raphael-rails (~> 2.1.2)
   rblineprof
   rdoc (~> 3.6)
   recaptcha (~> 3.0)

app/assets/javascripts/LabelManager.js.coffee

@@ -42,10 +42,10 @@ class @LabelManager
       $from = @prioritizedLabels
     if $from.find('li').length is 1
-      $from.find('.empty-message').removeClass('hidden')
+      $from.find('.empty-message').show()
     if not $target.find('li').length
-      $target.find('.empty-message').addClass('hidden')
+      $target.find('.empty-message').hide()
     $label.detach().appendTo($target)
@@ -54,9 +54,6 @@ class @LabelManager
     if action is 'remove'
       xhr = $.ajax url: url, type: 'DELETE'
-
-      # Restore empty message
-      $from.find('.empty-message').removeClass('hidden') unless $from.find('li').length
     else
       xhr = @savePrioritySort($label, action)

app/assets/javascripts/application.js.coffee

@@ -32,6 +32,10 @@
 #= require bootstrap/tooltip
 #= require bootstrap/popover
 #= require select2
+#= require raphael
+#= require g.raphael
+#= require g.bar
+#= require branch-graph
 #= require ace/ace
 #= require ace/ext-searchbox
 #= require underscore
@@ -121,10 +125,9 @@ window.onload = ->
     setTimeout shiftWindow, 100
 $ ->
-  gl.utils.preventDisabledButtons()
   bootstrapBreakpoint = bp.getBreakpointSize()
-  $(".nav-sidebar").niceScroll(cursoropacitymax: '0.4', cursorcolor: '#FFF', cursorborder: "1px solid #FFF")
+  $(".nicescroll").niceScroll(cursoropacitymax: '0.4', cursorcolor: '#FFF', cursorborder: "1px solid #FFF")
   # Click a .js-select-on-focus field, select the contents
   $(".js-select-on-focus").on "focusin", ->
@@ -254,31 +257,3 @@ $ ->
   gl.awardsHandler = new AwardsHandler()
   checkInitialSidebarSize()
   new Aside()
-
-  # Sidenav pinning
-  if $(window).width() < 1440 and $.cookie('pin_nav') is 'true'
-    $.cookie('pin_nav', 'false')
-    $('.page-with-sidebar')
-      .toggleClass('page-sidebar-collapsed page-sidebar-expanded')
-      .removeClass('page-sidebar-pinned')
-    $('.navbar-fixed-top').removeClass('header-pinned-nav')
-
-  $(document)
-    .off 'click', '.js-nav-pin'
-    .on 'click', '.js-nav-pin', (e) ->
-      e.preventDefault()
-
-      $(this).toggleClass 'is-active'
-
-      if $.cookie('pin_nav') is 'true'
-        $.cookie 'pin_nav', 'false'
-        $('.page-with-sidebar')
-          .removeClass('page-sidebar-pinned')
-          .toggleClass('page-sidebar-collapsed page-sidebar-expanded')
-        $('.navbar-fixed-top')
-          .removeClass('header-pinned-nav')
-          .toggleClass('header-collapsed header-expanded')
-      else
-        $.cookie 'pin_nav', 'true'
-        $('.page-with-sidebar').addClass('page-sidebar-pinned')
-        $('.navbar-fixed-top').addClass('header-pinned-nav')

app/assets/javascripts/awards_handler.coffee

@@ -40,7 +40,7 @@ class @AwardsHandler
     $menu = $ '.emoji-menu'
     if $addBtn.hasClass 'js-note-emoji'
-      $addBtn.closest('.note').find('.js-awards-block').addClass 'current'
+      $addBtn.parents('.note').find('.js-awards-block').addClass 'current'
     else
       $addBtn.closest('.js-awards-block').addClass 'current'

app/assets/javascripts/ci/build.coffee

@@ -17,8 +17,6 @@ class @CiBuild
       .off 'resize.build'
       .on 'resize.build', @hideSidebar
-    @updateArtifactRemoveDate()
-
     if $('#build-trace').length
       @getInitialBuildTrace()
       @initScrollButtonAffix()
@@ -105,10 +103,3 @@ class @CiBuild
       $('.js-build-sidebar')
         .removeClass 'right-sidebar-collapsed'
         .addClass 'right-sidebar-expanded'
-
-  updateArtifactRemoveDate: ->
-    $date = $('.js-artifacts-remove')
-
-    if $date.length
-      date = $date.text()
-      $date.text $.timefor(new Date(date), ' ')

app/assets/javascripts/dispatcher.js.coffee

@@ -29,7 +29,6 @@ class Dispatcher
         new Todos()
       when 'projects:milestones:new', 'projects:milestones:edit'
         new ZenMode()
-        new DueDateSelect()
         new GLForm($('.milestone-form'))
       when 'groups:milestones:new'
         new ZenMode()
@@ -54,13 +53,9 @@ class Dispatcher
         new Diff()
         shortcut_handler = new ShortcutsIssuable(true)
         new ZenMode()
-        new MergedButtons()
-      when 'projects:merge_requests:commits', 'projects:merge_requests:builds'
-        new MergedButtons()
       when "projects:merge_requests:diffs"
         new Diff()
         new ZenMode()
-        new MergedButtons()
       when 'projects:merge_requests:index'
         shortcut_handler = new ShortcutsNavigation()
         Issuable.init()
@@ -73,7 +68,9 @@ class Dispatcher
         new Diff()
         new ZenMode()
         shortcut_handler = new ShortcutsNavigation()
-      when 'projects:commits:show', 'projects:activity'
+      when 'projects:commits:show'
+        shortcut_handler = new ShortcutsNavigation()
+      when 'projects:activity'
         shortcut_handler = new ShortcutsNavigation()
       when 'projects:show'
         shortcut_handler = new ShortcutsNavigation()
@@ -99,7 +96,6 @@ class Dispatcher
       when 'projects:blob:show', 'projects:blame:show'
         new LineHighlighter()
         shortcut_handler = new ShortcutsNavigation()
-        new ShortcutsBlob true
       when 'projects:labels:new', 'projects:labels:edit'
         new Labels()
       when 'projects:labels:index'
@@ -133,11 +129,15 @@ class Dispatcher
         new Project()
         new ProjectAvatar()
         switch path[1]
+          when 'compare'
+            shortcut_handler = new ShortcutsNavigation()
           when 'edit'
             shortcut_handler = new ShortcutsNavigation()
             new ProjectNew()
-          when 'new', 'show'
+          when 'new'
             new ProjectNew()
+          when 'show'
+            new ProjectShow()
           when 'wikis'
             new Wikis()
             shortcut_handler = new ShortcutsNavigation()
@@ -146,9 +146,9 @@ class Dispatcher
           when 'snippets'
             shortcut_handler = new ShortcutsNavigation()
             new ZenMode() if path[2] == 'show'
-          when 'labels', 'graphs', 'compare', 'pipelines', 'forks', \
-          'milestones', 'project_members', 'deploy_keys', 'builds', \
-          'hooks', 'services', 'protected_branches'
+          when 'labels', 'graphs'
+            shortcut_handler = new ShortcutsNavigation()
+          when 'project_members', 'deploy_keys', 'hooks', 'services', 'protected_branches'
             shortcut_handler = new ShortcutsNavigation()
     # If we haven't installed a custom shortcut handler, install the default one

app/assets/javascripts/due_date_select.js.coffee

 class @DueDateSelect
   constructor: ->
-    # Milestone edit/new form
-    $datePicker = $('.datepicker')
-
-    if $datePicker.length
-      $dueDate = $('#milestone_due_date')
-      $datePicker.datepicker
-        dateFormat: 'yy-mm-dd'
-        onSelect: (dateText, inst) ->
-          $dueDate.val(dateText)
-      .datepicker('setDate', $.datepicker.parseDate('yy-mm-dd', $dueDate.val()))
-
-    $('.js-clear-due-date').on 'click', (e) ->
-      e.preventDefault()
-      $.datepicker._clearDate($datePicker)
-
-    # Issuable sidebar
     $loading = $('.js-issuable-update .due_date')
       .find('.block-loading')
       .hide()
@@ -48,7 +32,7 @@ class @DueDateSelect
           date = new Date value.replace(new RegExp('-', 'g'), ',')
           mediumDate = $.datepicker.formatDate 'M d, yy', date
         else
-          mediumDate = 'No due date'
+          mediumDate = 'None'
         data = {}
         data[abilityName] = {}
@@ -66,8 +50,7 @@ class @DueDateSelect
               $selectbox.hide()
             $value.css('display', '')
-            cssClass = if Date.parse(mediumDate) then 'bold' else 'no-value'
-            $valueContent.html("<span class='#{cssClass}'>#{mediumDate}</span>")
+            $valueContent.html(mediumDate)
             $sidebarValue.html(mediumDate)
             if value isnt ''

app/assets/javascripts/issuable.js.coffee

@@ -56,6 +56,13 @@ issuable_created = false
         Issuable.filterResults $('.filter-form')
         $('.js-label-select').trigger('update.label')
+  toggleLabelFilters: ->
+    $filteredLabels = $('.filtered-labels')
+    if $filteredLabels.find('.label-row').length > 0
+      $filteredLabels.removeClass('hidden')
+    else
+      $filteredLabels.addClass('hidden')
+
   filterResults: (form) =>
     formData = form.serialize()
@@ -64,16 +71,58 @@ issuable_created = false
     issuesUrl = formAction
     issuesUrl += ("#{if formAction.indexOf('?') < 0 then '?' else '&'}")
     issuesUrl += formData
-    Turbolinks.visit(issuesUrl);
+    $.ajax
+      type: 'GET'
+      url: formAction
+      data: formData
+      complete: ->
+        $('.issues-holder, .merge-requests-holder').css('opacity', '1.0')
+      success: (data) ->
+        $('.issues-holder, .merge-requests-holder').html(data.html)
+        # Change url so if user reload a page - search results are saved
+        history.replaceState {page: issuesUrl}, document.title, issuesUrl
+        Issuable.reload()
+        Issuable.updateStateFilters()
+        $filteredLabels = $('.filtered-labels')
+
+        if typeof Issuable.labelRow is 'function'
+          $filteredLabels.html(Issuable.labelRow(data))
+        Issuable.toggleLabelFilters()
+
+      dataType: "json"
+
+  reload: ->
+    if Issuable.created
+      Issuable.initChecks()
+
+    $('#filter_issue_search').val($('#issue_search').val())
   initChecks: ->
-    $('.check_all_issues').off('click').on('click', ->
+    $('.check_all_issues').on 'click', ->
       $('.selected_issue').prop('checked', @checked)
       Issuable.checkChanged()
-    )
-    $('.selected_issue').off('change').on('change', Issuable.checkChanged)
+    $('.selected_issue').on 'change', Issuable.checkChanged
+
+  updateStateFilters: ->
+    stateFilters =  $('.issues-state-filters, .dropdown-menu-sort')
+    newParams = {}
+    paramKeys = ['author_id', 'milestone_title', 'assignee_id', 'issue_search', 'issue_search']
+
+    for paramKey in paramKeys
+      newParams[paramKey] = gl.utils.getParameterValues(paramKey)[0] or ''
+
+    if stateFilters.length
+      stateFilters.find('a').each ->
+        initialUrl = gl.utils.removeParamQueryString($(this).attr('href'), 'label_name[]')
+        labelNameValues = gl.utils.getParameterValues('label_name[]')
+        if labelNameValues
+          labelNameQueryString = ("label_name[]=#{value}" for value in labelNameValues).join('&')
+          newUrl = "#{gl.utils.mergeUrlParams(newParams, initialUrl)}&#{labelNameQueryString}"
+        else
+          newUrl = gl.utils.mergeUrlParams(newParams, initialUrl)
+        $(this).attr 'href', newUrl
   checkChanged: ->
     checked_issues = $('.selected_issue:checked')

app/assets/javascripts/issuable_form.js.coffee

@@ -102,10 +102,6 @@ class @IssuableForm
             return {
               results: data
             }
-          data: (query) ->
-            {
-              search: query
-            }
         formatResult: (project) ->
           project.name_with_namespace
         formatSelection: (project) ->

app/assets/javascripts/issues-bulk-assignment.js.coffee

@@ -9,9 +9,6 @@ class @IssuableBulkActions
     @bindEvents()
-    # Fixes bulk-assign not working when navigating through pages
-    Issuable.initChecks();
-
   getElement: (selector) ->
     @container.find selector
@@ -100,22 +97,13 @@ class @IssuableBulkActions
     $labels = @form.find('.labels-filter input[name="update[label_ids][]"]')
     $labels.each (k, label) ->
-      labelIds.push parseInt($(label).val()) if label
+      labelIds.push $(label).val() if label
     labelIds
   ###*
-   * Returns Label IDs that will be removed from issue selection
-   * @return {Array} Array of labels IDs
+   * Just an alias of @getUnmarkedIndeterminedLabels
+   * @return {Array} Array of labels
   ###
   getLabelsToRemove: ->
-    result = []
-    indeterminatedLabels = @getUnmarkedIndeterminedLabels()
-    labelsToApply = @getLabelsToApply()
-
-    indeterminatedLabels.map (id) ->
-      # We need to exclude label IDs that will be applied
-      # By not doing this will cause issues from selection to not add labels at all
-      result.push(id) if labelsToApply.indexOf(id) is -1
-
-    result
+    @getUnmarkedIndeterminedLabels()

app/assets/javascripts/labels_select.js.coffee

@@ -39,7 +39,7 @@ class @LabelsSelect
             </a>
             <% }); %>'
         )
-        labelNoneHTMLTemplate = '<span class="no-value">None</span>'
+        labelNoneHTMLTemplate = _.template('<div class="light">None</div>')
       if newLabelField.length
@@ -145,7 +145,7 @@ class @LabelsSelect
             template = labelHTMLTemplate(data)
             labelCount = data.labels.length
           else
-            template = labelNoneHTMLTemplate
+            template = labelNoneHTMLTemplate()
           $value
             .removeAttr('style')
             .html(template)

app/assets/javascripts/layout_nav.js.coffee

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

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

 ((w) ->
-  w.gl       or= {}
-  w.gl.utils or= {}
-
-  w.gl.utils.isInGroupsPage = ->
-
-    return $('body').data('page').split(':')[0] is 'groups'
-
-
-  w.gl.utils.isInProjectPage = ->
-
-    return $('body').data('page').split(':')[0] is 'projects'
-
-
-  w.gl.utils.getProjectSlug = ->
-
-    return if @isInProjectPage() then $('body').data 'project' else null
-
-
-  w.gl.utils.getGroupSlug = ->
-
-    return if @isInGroupsPage() then $('body').data 'group' else null
-
-
-
-  gl.utils.updateTooltipTitle = ($tooltipEl, newTitle) ->
-
-    $tooltipEl
-      .tooltip 'destroy'
-      .attr    'title', newTitle
-      .tooltip 'fixTitle'
-
-
-  gl.utils.preventDisabledButtons = ->
-
-    $('.btn').click (e) ->
-      if $(this).hasClass 'disabled'
-        e.preventDefault()
-        e.stopImmediatePropagation()
-        return false
-
-
   jQuery.timefor = (time, suffix, expiredLabel) ->
     return '' unless time

app/assets/javascripts/logo.js.coffee

@@ -42,3 +42,9 @@ work = ->
 $(document).on('page:fetch',  start)
 $(document).on('page:change', stop)
+
+$ ->
+  # Make logo clickable as part of a workaround for Safari visited
+  # link behaviour (See !2690).
+  $('#logo').on 'click', ->
+    Turbolinks.visit('/')

app/assets/javascripts/merged_buttons.js.coffee

-class @MergedButtons
-  constructor: ->
-    @$removeBranchWidget = $('.remove_source_branch_widget')
-    @$removeBranchProgress = $('.remove_source_branch_in_progress')
-    @$removeBranchFailed = $('.remove_source_branch_widget.failed')
-
-    @cleanEventListeners()
-    @initEventListeners()
-
-  cleanEventListeners: ->
-    $(document).off 'click', '.remove_source_branch'
-    $(document).off 'ajax:success', '.remove_source_branch'
-    $(document).off 'ajax:error', '.remove_source_branch'
-
-  initEventListeners: ->
-    $(document).on 'click', '.remove_source_branch', @removeSourceBranch
-    $(document).on 'ajax:success', '.remove_source_branch', @removeBranchSuccess
-    $(document).on 'ajax:error', '.remove_source_branch', @removeBranchError
-
-  removeSourceBranch: =>
-    @$removeBranchWidget.hide()
-    @$removeBranchProgress.show()
-
-  removeBranchSuccess: ->
-    location.reload()
-
-  removeBranchError: ->
-    @$removeBranchWidget.hide()
-    @$removeBranchProgress.hide()
-    @$removeBranchFailed.show()