Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq

Conflicts:
	VERSION
	config/gitlab.yml.example
	config/initializers/1_settings.rb
	lib/api/entities.rb
	lib/api/groups.rb

.pkgr.yml

 user: git
 group: git
+services:
+  - postgres
 before_precompile: ./bin/pkgr_before_precompile.sh
 targets:
   debian-7: &wheezy
     build_dependencies:
+      - libkrb5-dev
       - libicu-dev
       - cmake
       - pkg-config
@@ -14,6 +17,7 @@ targets:
   ubuntu-12.04: *wheezy
   ubuntu-14.04:
     build_dependencies:
+      - libkrb5-dev
       - libicu-dev
       - cmake
       - pkg-config
@@ -23,6 +27,7 @@ targets:
       - git
   centos-6:
     build_dependencies:
+      - krb5-devel
       - libicu-devel
       - cmake
       - pkgconfig

CHANGELOG

 Note: The upcoming release contains empty lines to reduce the number of merge conflicts, scroll down to see past releases.
 
+v 7.8.0
+  - Replace highlight.js with rouge-fork rugments (Stefan Tatschner)
+  - Make project search case insensitive (Hannes Rosenögger)
+  - 
+  - Expose description in groups API
+  - 
+  - 
+  - Add diff syntax highlighting in email-on-push service notifications (Hannes Rosenögger)
+  - 
+  - 
+  - 
+  - Allow more variations for commit messages closing issues (Julien Bianchi and Hannes Rosenögger)
+  - 
+  - 
+  - Show tags in commit view (Hannes Rosenögger)
+  - 
+  - 
+  - 
+  - 
+  - 
+  - 
+  - 
+  - 
+  - Fix commits pagination
+  - 
+  - 
+  - 
+  - 
+  - 
+  - 
+  - 
+  - 
+  - 
+  - 
+  - 
+  - 
+  - 
+  - 
+  - 
+  - 
+  - 
+  - 
+  - Add action property to merge request hook (Julien Bianchi)
+  - 
+  - 
+  - 
+  - 
+  - 
+  - 
+  - 
+  - 
+  - 
+  - 
+  - 
+  - 
+  - 
+  - 
+
 v 7.7.0
   - Import from GitHub.com feature
   - Add Jetbrains Teamcity CI service (Jason Lippert)
@@ -24,6 +82,10 @@ v 7.7.0
   - Trigger GitLab CI when push tags
   - When accept merge request - do merge using sidaekiq job
   - Enable web signups by default
+  - Fixes for diff comments: drag-n-drop images, selecting images
+  - Fixes for edit comments: drag-n-drop images, preview mode, selecting images, save & update 
+  - Remove password strength indicator
+  
 
 
 v 7.6.0

Gemfile

@@ -47,7 +47,7 @@ gem 'gitlab_omniauth-ldap', '1.2.0', require: "omniauth-ldap"
 gem 'net-ldap'
 
 # Git Wiki
-gem 'gollum-lib', '~> 3.0.0'
+gem 'gollum-lib', '~> 4.0.0'
 
 # Language detection
 gem "gitlab-linguist", "~> 3.0.0", require: "linguist"
@@ -267,3 +267,4 @@ end
 gem "newrelic_rpm"
 
 gem 'octokit', '3.7.0'
+gem "rugments"

Gemfile.lock

@@ -166,13 +166,14 @@ GEM
       rugged (~> 0.19)
     gherkin-ruby (0.3.1)
       racc
-    github-markup (1.1.0)
+    github-markup (1.3.1)
+      posix-spawn (~> 0.3.8)
     gitlab-flowdock-git-hook (0.4.2.2)
       gitlab-grit (>= 2.4.1)
       multi_json
     gitlab-grack (2.0.0.pre)
       rack (~> 1.5.1)
-    gitlab-grit (2.6.12)
+    gitlab-grit (2.7.2)
       charlock_holmes (~> 0.6)
       diff-lcs (~> 1.1)
       mime-types (~> 1.15)
@@ -194,11 +195,13 @@ GEM
       omniauth (~> 1.0)
       pyu-ruby-sasl (~> 0.0.3.1)
       rubyntlm (~> 0.3)
-    gollum-lib (3.0.0)
-      github-markup (~> 1.1.0)
-      gitlab-grit (~> 2.6.5)
-      nokogiri (~> 1.6.1)
-      rouge (~> 1.3.3)
+    gollum-grit_adapter (0.1.0)
+      gitlab-grit (~> 2.7.1)
+    gollum-lib (4.0.0)
+      github-markup (~> 1.3.1)
+      gollum-grit_adapter (~> 0.1.0)
+      nokogiri (~> 1.6.4)
+      rouge (~> 1.7.4)
       sanitize (~> 2.1.0)
       stringex (~> 2.5.1)
     gon (5.0.1)
@@ -297,7 +300,7 @@ GEM
       treetop (~> 1.4.8)
     method_source (0.8.2)
     mime-types (1.25.1)
-    mini_portile (0.6.0)
+    mini_portile (0.6.1)
     minitest (5.3.5)
     mousetrap-rails (1.4.6)
     multi_json (1.10.1)
@@ -309,8 +312,8 @@ GEM
       net-ssh (>= 2.6.5)
     net-ssh (2.8.0)
     newrelic_rpm (3.9.4.245)
-    nokogiri (1.6.2.1)
-      mini_portile (= 0.6.0)
+    nokogiri (1.6.5)
+      mini_portile (~> 0.6.0)
     nprogress-rails (0.1.2.3)
     oauth (0.4.7)
     oauth2 (0.8.1)
@@ -446,7 +449,7 @@ GEM
     rest-client (1.6.7)
       mime-types (>= 1.16)
     rinku (1.7.3)
-    rouge (1.3.3)
+    rouge (1.7.4)
     rspec (2.14.1)
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
@@ -466,6 +469,7 @@ GEM
     rubyntlm (0.4.0)
     rubypants (0.2.0)
     rugged (0.21.2)
+    rugments (1.0.0.beta3)
     safe_yaml (0.9.7)
     sanitize (2.1.0)
       nokogiri (>= 1.4.4)
@@ -541,7 +545,7 @@ GEM
       sprockets (~> 2.8)
     stamp (0.5.0)
     state_machine (1.2.0)
-    stringex (2.5.1)
+    stringex (2.5.2)
     temple (0.6.7)
     term-ansicolor (1.2.2)
       tins (~> 0.8)
@@ -656,7 +660,7 @@ DEPENDENCIES
   gitlab_git (= 7.0.0.rc14)
   gitlab_meta (= 7.0)
   gitlab_omniauth-ldap (= 1.2.0)
-  gollum-lib (~> 3.0.0)
+  gollum-lib (~> 4.0.0)
   gon (~> 5.0.0)
   grape (~> 0.6.1)
   grape-entity (~> 0.4.2)
@@ -709,6 +713,7 @@ DEPENDENCIES
   redis-rails
   request_store
   rspec-rails
+  rugments
   sanitize (~> 2.0)
   sass-rails (~> 4.0.2)
   sdoc

README.md

@@ -73,7 +73,7 @@ On [about.gitlab.com](https://about.gitlab.com/) you can find more information a
 ## Requirements
 
 - Ubuntu/Debian/CentOS/RHEL**
-- ruby 2.0+
+- Ruby (MRI) 2.0 or 2.1
 - git 1.7.10+
 - redis 2.0+
 - MySQL or PostgreSQL

VERSION

-7.7.0.pre-ee
+7.8.0.pre-ee

app/assets/javascripts/application.js.coffee

@@ -18,14 +18,12 @@
 #= require jquery.turbolinks
 #= require turbolinks
 #= require bootstrap
-#= require password_strength
 #= require select2
 #= require raphael
 #= require g.raphael-min
 #= require g.bar-min
 #= require chart-lib.min
 #= require branch-graph
-#= require highlight.pack
 #= require ace/ace
 #= require ace/ext-searchbox
 #= require d3
@@ -109,9 +107,19 @@ window.unbindEvents = ->
   $(document).unbind('scroll')
   $(document).off('scroll')
 
+window.shiftWindow = ->
+  scrollBy 0, -50
+
 document.addEventListener("page:fetch", unbindEvents)
 
+# Scroll the window to avoid the topnav bar
+# https://github.com/twitter/bootstrap/issues/1768
+if location.hash
+  setTimeout shiftWindow, 1
+window.addEventListener "hashchange", shiftWindow
+
 $ ->
+
   # Click a .one_click_select field, select the contents
   $(".one_click_select").on 'click', -> $(@).select()
 

app/assets/javascripts/dispatcher.js.coffee

@@ -4,7 +4,6 @@ $ ->
 class Dispatcher
   constructor: () ->
     @initSearch()
-    @initHighlight()
     @initPageScripts()
 
   initPageScripts: ->
@@ -33,17 +32,20 @@ class Dispatcher
         GitLab.GfmAutoComplete.setup()
         shortcut_handler = new ShortcutsNavigation()
         new ZenMode()
+        new DropzoneInput($('.issue-form'))
       when 'projects:merge_requests:new', 'projects:merge_requests:edit'
         GitLab.GfmAutoComplete.setup()
         new Diff()
         shortcut_handler = new ShortcutsNavigation()
         new ZenMode()
+        new DropzoneInput($('.merge-request-form'))
       when 'projects:merge_requests:show'
         new Diff()
         shortcut_handler = new ShortcutsIssueable()
         new ZenMode()
       when "projects:merge_requests:diffs"
         new Diff()
+        new ZenMode()
       when 'projects:merge_requests:index'
         shortcut_handler = new ShortcutsNavigation()
       when 'dashboard:show'
@@ -112,6 +114,7 @@ class Dispatcher
             new Wikis()
             shortcut_handler = new ShortcutsNavigation()
             new ZenMode()
+            new DropzoneInput($('.wiki-form'))
           when 'snippets', 'labels', 'graphs'
             shortcut_handler = new ShortcutsNavigation()
           when 'team_members', 'deploy_keys', 'hooks', 'services', 'protected_branches'
@@ -130,10 +133,3 @@ class Dispatcher
     project_ref = opts.data('autocomplete-project-ref')
 
     new SearchAutocomplete(path, project_id, project_ref)
-
-  initHighlight: ->
-    $('.highlight pre code').each (i, e) ->
-      $(e).html($.map($(e).html().split("\n"), (line, i) ->
-        "<span class='line' id='LC" + (i + 1) + "'>" + line + "</span>"
-      ).join("\n"))
-      hljs.highlightBlock(e)

app/assets/javascripts/dropzone_input.js.coffee

+class @DropzoneInput
+  constructor: (form) ->
+    Dropzone.autoDiscover = false
+    alertClass = "alert alert-danger alert-dismissable div-dropzone-alert"
+    alertAttr = "class=\"close\" data-dismiss=\"alert\"" + "aria-hidden=\"true\""
+    divHover = "<div class=\"div-dropzone-hover\"></div>"
+    divSpinner = "<div class=\"div-dropzone-spinner\"></div>"
+    divAlert = "<div class=\"" + alertClass + "\"></div>"
+    iconPicture = "<i class=\"fa fa-picture-o div-dropzone-icon\"></i>"
+    iconSpinner = "<i class=\"fa fa-spinner fa-spin div-dropzone-icon\"></i>"
+    btnAlert = "<button type=\"button\"" + alertAttr + ">&times;</button>"
+    project_image_path_upload = window.project_image_path_upload or null
+
+    form_textarea = $(form).find("textarea.markdown-area")
+    form_textarea.wrap "<div class=\"div-dropzone\"></div>"
+
+    form_dropzone = $(form).find('.div-dropzone')
+    form_dropzone.parent().addClass "div-dropzone-wrapper"
+    form_dropzone.append divHover
+    $(".div-dropzone-hover").append iconPicture
+    form_dropzone.append divSpinner
+    $(".div-dropzone-spinner").append iconSpinner
+    $(".div-dropzone-spinner").css
+      "opacity": 0
+      "display": "none"
+
+    # Preview button
+    $(document).off "click", ".js-md-preview-button"
+    $(document).on "click", ".js-md-preview-button", (e) ->
+      ###
+      Shows the Markdown preview.
+
+      Lets the server render GFM into Html and displays it.
+      ###
+      e.preventDefault()
+      form = $(this).closest("form")
+      # toggle tabs
+      form.find(".js-md-write-button").parent().removeClass "active"
+      form.find(".js-md-preview-button").parent().addClass "active"
+
+      # toggle content
+      form.find(".md-write-holder").hide()
+      form.find(".md-preview-holder").show()
+
+      preview = form.find(".js-md-preview")
+      mdText = form.find(".markdown-area").val()
+      if mdText.trim().length is 0
+        preview.text "Nothing to preview."
+      else
+        preview.text "Loading..."
+        $.get($(this).data("url"),
+          md_text: mdText
+        ).success (previewData) ->
+          preview.html previewData
+
+    # Write button
+    $(document).off "click", ".js-md-write-button"
+    $(document).on "click", ".js-md-write-button", (e) ->
+      ###
+      Shows the Markdown textarea.
+      ###
+      e.preventDefault()
+      form = $(this).closest("form")
+      # toggle tabs
+      form.find(".js-md-write-button").parent().addClass "active"
+      form.find(".js-md-preview-button").parent().removeClass "active"
+
+      # toggle content
+      form.find(".md-write-holder").show()
+      form.find(".md-preview-holder").hide()
+
+    dropzone = form_dropzone.dropzone(
+      url: project_image_path_upload
+      dictDefaultMessage: ""
+      clickable: true
+      paramName: "markdown_img"
+      maxFilesize: 10
+      uploadMultiple: false
+      acceptedFiles: "image/jpg,image/jpeg,image/gif,image/png"
+      headers:
+        "X-CSRF-Token": $("meta[name=\"csrf-token\"]").attr("content")
+
+      previewContainer: false
+
+      processing: ->
+        $(".div-dropzone-alert").alert "close"
+
+      dragover: ->
+        form_textarea.addClass "div-dropzone-focus"
+        form.find(".div-dropzone-hover").css "opacity", 0.7
+        return
+
+      dragleave: ->
+        form_textarea.removeClass "div-dropzone-focus"
+        form.find(".div-dropzone-hover").css "opacity", 0
+        return
+
+      drop: ->
+        form_textarea.removeClass "div-dropzone-focus"
+        form.find(".div-dropzone-hover").css "opacity", 0
+        form_textarea.focus()
+        return
+
+      success: (header, response) ->
+        child = $(dropzone[0]).children("textarea")
+        $(child).val $(child).val() + formatLink(response.link) + "\n"
+        return
+
+      error: (temp, errorMessage) ->
+        checkIfMsgExists = $(".error-alert").children().length
+        if checkIfMsgExists is 0
+          $(".error-alert").append divAlert
+          $(".div-dropzone-alert").append btnAlert + errorMessage
+        return
+
+      sending: ->
+        form_dropzone.find(".div-dropzone-spinner").css
+          "opacity": 0.7
+          "display": "inherit"
+        return
+
+      complete: ->
+        $(".dz-preview").remove()
+        $(".markdown-area").trigger "input"
+        $(".div-dropzone-spinner").css
+          "opacity": 0
+          "display": "none"
+        return
+    )
+
+    child = $(dropzone[0]).children("textarea")
+
+    formatLink = (str) ->
+      "![" + str.alt + "](" + str.url + ")"
+
+    handlePaste = (e) ->
+      e.preventDefault()
+      my_event = e.originalEvent
+
+      if my_event.clipboardData and my_event.clipboardData.items
+        processItem(my_event)
+
+    processItem = (e) ->
+      image = isImage(e)
+      if image
+        filename = getFilename(e) or "image.png"
+        text = "{{" + filename + "}}"
+        pasteText(text)
+        uploadFile image.getAsFile(), filename
+
+      else
+        text = e.clipboardData.getData("text/plain")
+        pasteText(text)
+
+    isImage = (data) ->
+      i = 0
+      while i < data.clipboardData.items.length
+        item = data.clipboardData.items[i]
+        if item.type.indexOf("image") isnt -1
+          return item
+        i++
+      return false
+
+    pasteText = (text) ->
+      caretStart = $(child)[0].selectionStart
+      caretEnd = $(child)[0].selectionEnd
+      textEnd = $(child).val().length
+
+      beforeSelection = $(child).val().substring 0, caretStart
+      afterSelection = $(child).val().substring caretEnd, textEnd
+      $(child).val beforeSelection + text + afterSelection
+      form_textarea.trigger "input"
+
+    getFilename = (e) ->
+      if window.clipboardData and window.clipboardData.getData
+        value = window.clipboardData.getData("Text")
+      else if e.clipboardData and e.clipboardData.getData
+        value = e.clipboardData.getData("text/plain")
+
+      value = value.split("\r")
+      value.first()
+
+    uploadFile = (item, filename) ->
+      formData = new FormData()
+      formData.append "markdown_img", item, filename
+      $.ajax
+        url: project_image_path_upload
+        type: "POST"
+        data: formData
+        dataType: "json"
+        processData: false
+        contentType: false
+        headers:
+          "X-CSRF-Token": $("meta[name=\"csrf-token\"]").attr("content")
+
+        beforeSend: ->
+          showSpinner()
+          closeAlertMessage()
+
+        success: (e, textStatus, response) ->
+          insertToTextArea(filename, formatLink(response.responseJSON.link))
+
+        error: (response) ->
+          showError(response.responseJSON.message)
+
+        complete: ->
+          closeSpinner()
+
+    insertToTextArea = (filename, url) ->
+      $(child).val (index, val) ->
+        val.replace("{{" + filename + "}}", url + "\n")
+
+    appendToTextArea = (url) ->
+      $(child).val (index, val) ->
+        val + url + "\n"
+
+    showSpinner = (e) ->
+      form.find(".div-dropzone-spinner").css
+        "opacity": 0.7
+        "display": "inherit"
+
+    closeSpinner = ->
+      form.find(".div-dropzone-spinner").css
+        "opacity": 0
+        "display": "none"
+
+    showError = (message) ->
+      checkIfMsgExists = $(".error-alert").children().length
+      if checkIfMsgExists is 0
+        $(".error-alert").append divAlert
+        $(".div-dropzone-alert").append btnAlert + message
+
+    closeAlertMessage = ->
+      form.find(".div-dropzone-alert").alert "close"
+
+    form.find(".markdown-selector").click (e) ->
+      e.preventDefault()
+      $(@).closest('.gfm-form').find('.div-dropzone').click()
+      return
+
+  formatLink: (str) ->
+    "![" + str.alt + "](" + str.url + ")"

app/assets/javascripts/markdown_area.js.coffee

-formatLink = (str) ->
-  "![" + str.alt + "](" + str.url + ")"
-
-$(document).ready ->
-  alertClass = "alert alert-danger alert-dismissable div-dropzone-alert"
-  alertAttr = "class=\"close\" data-dismiss=\"alert\"" + "aria-hidden=\"true\""
-  divHover = "<div class=\"div-dropzone-hover\"></div>"
-  divSpinner = "<div class=\"div-dropzone-spinner\"></div>"
-  divAlert = "<div class=\"" + alertClass + "\"></div>"
-  iconPicture = "<i class=\"fa fa-picture-o div-dropzone-icon\"></i>"
-  iconSpinner = "<i class=\"fa fa-spinner fa-spin div-dropzone-icon\"></i>"
-  btnAlert = "<button type=\"button\"" + alertAttr + ">&times;</button>"
-  project_image_path_upload = window.project_image_path_upload or null
-
-  $("textarea.markdown-area").wrap "<div class=\"div-dropzone\"></div>"
-
-  $(".div-dropzone").parent().addClass "div-dropzone-wrapper"
-
-  $(".div-dropzone").append divHover
-  $(".div-dropzone-hover").append iconPicture
-  $(".div-dropzone").append divSpinner
-  $(".div-dropzone-spinner").append iconSpinner
-  $(".div-dropzone-spinner").css
-    "opacity": 0
-    "display": "none"
-
-  # Preview button
-  $(document).off "click", ".js-md-preview-button"
-  $(document).on "click", ".js-md-preview-button", (e) ->
-    ###
-    Shows the Markdown preview.
-
-    Lets the server render GFM into Html and displays it.
-    ###
-    e.preventDefault()
-    form = $(this).closest("form")
-    # toggle tabs
-    form.find(".js-md-write-button").parent().removeClass "active"
-    form.find(".js-md-preview-button").parent().addClass "active"
-
-    # toggle content
-    form.find(".md-write-holder").hide()
-    form.find(".md-preview-holder").show()
-
-    preview = form.find(".js-md-preview")
-    mdText = form.find(".markdown-area").val()
-    if mdText.trim().length is 0
-      preview.text "Nothing to preview."
-    else
-      preview.text "Loading..."
-      $.get($(this).data("url"),
-        md_text: mdText
-      ).success (previewData) ->
-        preview.html previewData
-
-  # Write button
-  $(document).off "click", ".js-md-write-button"
-  $(document).on "click", ".js-md-write-button", (e) ->
-    ###
-    Shows the Markdown textarea.
-    ###
-    e.preventDefault()
-    form = $(this).closest("form")
-    # toggle tabs
-    form.find(".js-md-write-button").parent().addClass "active"
-    form.find(".js-md-preview-button").parent().removeClass "active"
-
-    # toggle content
-    form.find(".md-write-holder").show()
-    form.find(".md-preview-holder").hide()
-
-  dropzone = $(".div-dropzone").dropzone(
-    url: project_image_path_upload
-    dictDefaultMessage: ""
-    clickable: true
-    paramName: "markdown_img"
-    maxFilesize: 10
-    uploadMultiple: false
-    acceptedFiles: "image/jpg,image/jpeg,image/gif,image/png"
-    headers:
-      "X-CSRF-Token": $("meta[name=\"csrf-token\"]").attr("content")
-
-    previewContainer: false
-
-    processing: ->
-      $(".div-dropzone-alert").alert "close"
-
-    dragover: ->
-      $(".div-dropzone > textarea").addClass "div-dropzone-focus"
-      $(".div-dropzone-hover").css "opacity", 0.7
-      return
-
-    dragleave: ->
-      $(".div-dropzone > textarea").removeClass "div-dropzone-focus"
-      $(".div-dropzone-hover").css "opacity", 0
-      return
-
-    drop: ->
-      $(".div-dropzone > textarea").removeClass "div-dropzone-focus"
-      $(".div-dropzone-hover").css "opacity", 0
-      $(".div-dropzone > textarea").focus()
-      return
-
-    success: (header, response) ->
-      child = $(dropzone[0]).children("textarea")
-      $(child).val $(child).val() + formatLink(response.link) + "\n"
-      return
-
-    error: (temp, errorMessage) ->
-      checkIfMsgExists = $(".error-alert").children().length
-      if checkIfMsgExists is 0
-        $(".error-alert").append divAlert
-        $(".div-dropzone-alert").append btnAlert + errorMessage
-      return
-
-    sending: ->
-      $(".div-dropzone-spinner").css
-        "opacity": 0.7
-        "display": "inherit"
-      return
-
-    complete: ->
-      $(".dz-preview").remove()
-      $(".markdown-area").trigger "input"
-      $(".div-dropzone-spinner").css
-        "opacity": 0
-        "display": "none"
-      return
-  )
-
-  child = $(dropzone[0]).children("textarea")
-
-  formatLink = (str) ->
-    "![" + str.alt + "](" + str.url + ")"
-
-  handlePaste = (e) ->
-    e.preventDefault()
-    my_event = e.originalEvent
-
-    if my_event.clipboardData and my_event.clipboardData.items
-      processItem(my_event)
-
-  processItem = (e) ->
-    image = isImage(e)
-    if image
-      filename = getFilename(e) or "image.png"
-      text = "{{" + filename + "}}"
-      pasteText(text)
-      uploadFile image.getAsFile(), filename
-
-    else
-      text = e.clipboardData.getData("text/plain")
-      pasteText(text)
-
-  isImage = (data) ->
-    i = 0
-    while i < data.clipboardData.items.length
-      item = data.clipboardData.items[i]
-      if item.type.indexOf("image") isnt -1
-        return item
-      i++
-    return false
-
-  pasteText = (text) ->
-    caretStart = $(child)[0].selectionStart
-    caretEnd = $(child)[0].selectionEnd
-    textEnd = $(child).val().length
-
-    beforeSelection = $(child).val().substring 0, caretStart
-    afterSelection = $(child).val().substring caretEnd, textEnd
-    $(child).val beforeSelection + text + afterSelection
-    $(".markdown-area").trigger "input"
-
-  getFilename = (e) ->
-    if window.clipboardData and window.clipboardData.getData
-      value = window.clipboardData.getData("Text")
-    else if e.clipboardData and e.clipboardData.getData
-      value = e.clipboardData.getData("text/plain")
-
-    value = value.split("\r")
-    value.first()
-
-  uploadFile = (item, filename) ->
-    formData = new FormData()
-    formData.append "markdown_img", item, filename
-    $.ajax
-      url: project_image_path_upload
-      type: "POST"
-      data: formData
-      dataType: "json"
-      processData: false
-      contentType: false
-      headers:
-        "X-CSRF-Token": $("meta[name=\"csrf-token\"]").attr("content")
-
-      beforeSend: ->
-        showSpinner()
-        closeAlertMessage()
-
-      success: (e, textStatus, response) ->
-        insertToTextArea(filename, formatLink(response.responseJSON.link))
-
-      error: (response) ->
-        showError(response.responseJSON.message)
-
-      complete: ->
-        closeSpinner()
-
-  insertToTextArea = (filename, url) ->
-    $(child).val (index, val) ->
-      val.replace("{{" + filename + "}}", url + "\n")
-
-  appendToTextArea = (url) ->
-    $(child).val (index, val) ->
-      val + url + "\n"
-
-  showSpinner = (e) ->
-    $(".div-dropzone-spinner").css
-      "opacity": 0.7
-      "display": "inherit"
-
-  closeSpinner = ->
-    $(".div-dropzone-spinner").css
-      "opacity": 0
-      "display": "none"
-
-  showError = (message) ->
-    checkIfMsgExists = $(".error-alert").children().length
-    if checkIfMsgExists is 0
-      $(".error-alert").append divAlert
-      $(".div-dropzone-alert").append btnAlert + message
-
-  closeAlertMessage = ->
-    $(".div-dropzone-alert").alert "close"
-
-  $(".markdown-selector").click (e) ->
-    e.preventDefault()
-    $(@).closest('.gfm-form').find('.div-dropzone').click()
-    return
-
-  return

app/assets/javascripts/notes.js.coffee

@@ -114,10 +114,6 @@ class @Notes
     if @isNewNote(note)
       @note_ids.push(note.id)
       $('ul.main-notes-list').append(note.html)
-      code = "#note_" + note.id + " .highlight pre code"
-      $(code).each (i, e) ->
-        hljs.highlightBlock(e)
-
 
   ###
   Check if note does not exists on page
@@ -219,6 +215,7 @@ class @Notes
   setupNoteForm: (form) ->
     disableButtonIfEmptyField form.find(".js-note-text"), form.find(".js-comment-button")
     form.removeClass "js-new-note-form"
+    form.find('.div-dropzone').remove()
 
     # setup preview buttons
     form.find(".js-md-write-button, .js-md-preview-button").tooltip placement: "left"
@@ -233,6 +230,7 @@ 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()
 
 
@@ -259,11 +257,10 @@ class @Notes
   Updates the current note field.
   ###
   updateNote: (xhr, note, status) =>
-    note_li = $("#note_" + note.id)
+    note_li = $(".note-row-" + note.id)
     note_li.replaceWith(note.html)
-    code = "#note_" + note.id + " .highlight pre code"
-    $(code).each (i, e) ->
-      hljs.highlightBlock(e)
+    note_li.find('.note-edit-form').hide()
+    note_li.find('.note-text').show()
 
   ###
   Called in response to clicking the edit note link
@@ -276,11 +273,19 @@ class @Notes
     e.preventDefault()
     note = $(this).closest(".note")
     note.find(".note-text").hide()
+    note.find(".note-header").hide()
+    base_form = note.find(".note-edit-form")
+    form = base_form.clone().insertAfter(base_form)
+    form.addClass('current-note-edit-form')
+    form.find('.div-dropzone').remove()
 
     # Show the attachment delete link
     note.find(".js-note-attachment-delete").show()
+
+    # Setup markdown form
     GitLab.GfmAutoComplete.setup()
-    form = note.find(".note-edit-form")
+    new DropzoneInput(form)
+
     form.show()
     textarea = form.find("textarea")
     textarea.focus()
@@ -295,8 +300,8 @@ class @Notes
     e.preventDefault()
     note = $(this).closest(".note")
     note.find(".note-text").show()
-    note.find(".js-note-attachment-delete").hide()
-    note.find(".note-edit-form").hide()
+    note.find(".note-header").show()
+    note.find(".current-note-edit-form").remove()
 
   ###
   Called in response to deleting a note of any kind.

app/assets/javascripts/password_strength.js.coffee

-#= require pwstrength-bootstrap-1.2.2
-overwritten_messages =
-  wordSimilarToUsername: "Your password should not contain your username"
-
-overwritten_rules =
-  wordSequences: false
-
-options =
-  showProgressBar: false
-  showVerdicts: false
-  showPopover: true
-  showErrors: true
-  showStatus: true
-  errorMessages: overwritten_messages
-  
-$(document).ready ->
-  profileOptions = {}
-  profileOptions.ui = options
-  profileOptions.rules =
-    activated: overwritten_rules
-
-  deviseOptions = {}
-  deviseOptions.common =
-    usernameField: "#user_username"
-  deviseOptions.ui = options
-  deviseOptions.rules =
-    activated: overwritten_rules
-
-  $("#user_password_profile").pwstrength profileOptions
-  $("#user_password_sign_up").pwstrength deviseOptions
-  $("#user_password_recover").pwstrength deviseOptions

app/assets/javascripts/zen_mode.js.coffee

@@ -10,7 +10,15 @@ class @ZenMode
       if not @active_checkbox
         @scroll_position = window.pageYOffset
 
-    $('body').on 'change', '.zennable input[type=checkbox]', (e) =>
+    $('body').on 'click', '.zen-enter-link', (e) =>
+      e.preventDefault()
+      $(e.currentTarget).closest('.zennable').find('.zen-toggle-comment').prop('checked', true)
+
+    $('body').on 'click', '.zen-leave-link', (e) =>
+      e.preventDefault()
+      $(e.currentTarget).closest('.zennable').find('.zen-toggle-comment').prop('checked', false)
+
+    $('body').on 'change', '.zen-toggle-comment', (e) =>
       checkbox = e.currentTarget
       if checkbox.checked
         # Disable other keyboard shortcuts in ZEN mode
@@ -32,8 +40,6 @@ class @ZenMode
     @active_zen_area = @active_checkbox.parent().find('textarea')
     @active_zen_area.focus()
     window.location.hash = ZenMode.fullscreen_prefix + @active_checkbox.prop('id')
-    # Disable dropzone in ZEN mode
-    Dropzone.forElement('.div-dropzone').disable()
 
   exitZenMode: =>
     if @active_zen_area isnt null

app/assets/stylesheets/application.scss

@@ -6,7 +6,6 @@
  *= require jquery.ui.autocomplete
  *= require jquery.atwho
  *= require select2
- *= require highlightjs.min
  *= require_self
  *= require dropzone/basic
 */

app/assets/stylesheets/generic/common.scss

@@ -54,6 +54,11 @@ pre {
   text-shadow: none;
 }
 
+.dropdown-menu-align-right {
+  left: auto;
+  right: 0px;
+}
+
 .dropdown-menu > li > a:hover,
 .dropdown-menu > li > a:focus {
   background: $bg_primary;
@@ -273,10 +278,6 @@ img.emoji {
   height: 220px;
 }
 
-.navless-container {
-  margin-top: 68px;
-}
-
 .description-block {
   @extend .light-well;
   @extend .light;

app/assets/stylesheets/generic/forms.scss

@@ -97,136 +97,3 @@ label {
 .wiki-content {
   margin-top: 35px;
 }
-
-.zennable {
-  position: relative;
-
-  input {
-    display: none;
-  }
-
-  .collapse {
-    display: none;
-    opacity: 0.5;
-
-    &:before {
-      content: '\f066';
-      font-family: FontAwesome;
-      color: #000;
-      font-size: 28px;
-      position: relative;
-      padding: 30px 40px 0 0;
-    }
-
-    &:hover {
-      opacity: 0.8;
-    }
-  }
-
-  .expand {
-    opacity: 0.5;
-
-    &:before {
-      content: '\f065';
-      font-family: FontAwesome;
-      color: #000;
-      font-size: 14px;
-      line-height: 14px;
-      padding-right: 20px;
-      position: relative;
-      vertical-align: middle;
-    }
-
-    &:hover {
-      opacity: 0.8;
-    }
-  }
-
-  input:checked ~ .zen-backdrop .expand {
-    display: none;
-  }
-
-  input:checked ~ .zen-backdrop .collapse {
-    display: block;
-    position: absolute;
-    top: 0;
-  }
-
-  label {
-    position: absolute;
-    top: -26px;
-    right: 0;
-    font-variant: small-caps;
-    text-transform: uppercase;
-    font-size: 10px;
-    padding: 4px;
-    font-weight: 500;
-    letter-spacing: 1px;
-
-    &:before {
-      display: inline-block;
-      width: 10px;
-      height: 14px;
-    }
-  }
-
-  input:checked ~ .zen-backdrop {
-    background-color: white;
-    position: fixed;
-    top: 0;
-    bottom: 0;
-    left: 0;
-    right: 0;
-    z-index: 1031;
-
-    textarea {
-      border: none;
-      box-shadow: none;
-      border-radius: 0;
-      color: #000;
-      font-size: 20px;
-      line-height: 26px;
-      padding: 30px;
-      display: block;
-      outline: none;
-      resize: none;
-      height: 100vh;
-      max-width: 900px;
-      margin: 0 auto;
-    }
-  }
-
-  .zen-backdrop textarea::-webkit-input-placeholder {
-    color: white;
-  }
-
-  .zen-backdrop textarea:-moz-placeholder {
-    color: white;
-  }
-
-  .zen-backdrop textarea::-moz-placeholder {
-    color: white;
-  }
-
-  .zen-backdrop textarea:-ms-input-placeholder {
-    color: white;
-  }
-
-  input:checked ~ .zen-backdrop textarea::-webkit-input-placeholder {
-    color: #999;
-  }
-
-  input:checked ~ .zen-backdrop textarea:-moz-placeholder {
-    color: #999;
-    opacity: 1;
-  }
-
-  input:checked ~ .zen-backdrop textarea::-moz-placeholder {
-    color: #999;
-    opacity: 1;
-  }
-
-  input:checked ~ .zen-backdrop textarea:-ms-input-placeholder {
-    color: #999;
-  }
-}

app/assets/stylesheets/generic/gfm.scss

@@ -4,6 +4,7 @@
 .issue-form, .merge-request-form, .wiki-form {
   .description {
     height: 20em;
+    border-top-left-radius: 0;
   }
 }
 

app/assets/stylesheets/generic/highlight.scss

-.highlighted-data {
+.file-content.code {
   border: none;
   box-shadow: none;
   margin: 0px;
@@ -13,8 +13,13 @@
     font-size: 12px !important;
     line-height: 16px !important;
     margin: 0;
+    overflow: auto;
+    overflow-y: hidden;
+    white-space: pre;
+    word-wrap: normal;
 
     code {
+      font-family: $monospace_font;
       white-space: pre;
       word-wrap: normal;
       padding: 0;
@@ -25,10 +30,6 @@
     }
   }
 
-  .hljs {
-    padding: 0;
-  }
-
   .line-numbers {
     padding: 10px;
     text-align: right;
@@ -51,18 +52,18 @@
       }
     }
   }
+}
 
-  .highlight {
-    overflow: auto;
-    overflow-y: hidden;
-
-    pre {
-      white-space: pre;
-      word-wrap: normal;
+.note-text .code {
+  border: none;
+  box-shadow: none;
+  background: $box_bg;
+  padding: 1em;
 
   code {
     font-family: $monospace_font;
-      }
-    }
+    white-space: pre;
+    word-wrap: normal;
+    padding: 0;
   }
 }

app/assets/stylesheets/generic/lists.scss

@@ -69,12 +69,11 @@
     }
 
     .well-title {
-      font-size: 14px;
+      font-size: $list-font-size;
       line-height: 18px;
     }
 
     .row_title {
-      font-weight: 500;
       color: #444;
       &:hover {
         color: #444;

app/assets/stylesheets/generic/mobile.scss

-/** Common mobile (screen XS) styles **/
+/** Common mobile (screen XS, SM) styles **/
 @media (max-width: $screen-xs-max) {
   .container .content {
     margin-top: 20px;
@@ -13,5 +13,41 @@
       display: none;
     }
   }
+
+  .issues-filters,
+  .dash-projects-filters,
+  .check-all-holder {
+    display: none;
+  }
+
+  .rss-btn {
+    display: none !important;
+  }
+
+  .project-home-panel {
+    .star-fork-buttons {
+      padding-top: 10px;
+      padding-right: 15px;
+    }
+  }
+
+  .project-home-links {
+    display: none;
+  }
 }
 
+@media (max-width: $screen-sm-max) {
+  .issues-filters {
+    .milestone-filter, .labels-filter {
+      display: none;
+    }
+  }
+
+  .page-title .new-issue-link {
+    display: none;
+  }
+
+  .issue_edited_ago, .note_edited_ago {
+    display: none;
+  }
+}

app/assets/stylesheets/generic/zen.scss

+.zennable {
+  position: relative;
+
+  input {
+    display: none;
+  }
+
+  .zen-enter-link {
+    color: #888;
+    position: absolute;
+    top: -26px;
+    right: 4px;
+  }
+
+  .zen-leave-link {
+    display: none;
+    color: #888;
+    position: absolute;
+    top: 10px;
+    right: 10px;
+    padding: 5px;
+    font-size: 36px;
+
+    &:hover {
+      color: #111;
+    }
+  }
+
+  input:checked ~ .zen-backdrop .zen-enter-link {
+    display: none;
+  }
+
+  input:checked ~ .zen-backdrop .zen-leave-link {
+    display: block;
+    position: absolute;
+    top: 0;
+  }
+
+  input:checked ~ .zen-backdrop {
+    background-color: white;
+    position: fixed;
+    top: 0;
+    bottom: 0;
+    left: 0;
+    right: 0;
+    z-index: 1031;
+
+    textarea {
+      border: none;
+      box-shadow: none;
+      border-radius: 0;
+      color: #000;
+      font-size: 20px;
+      line-height: 26px;
+      padding: 30px;
+      display: block;
+      outline: none;
+      resize: none;
+      height: 100vh;
+      max-width: 900px;
+      margin: 0 auto;
+    }
+  }
+
+  .zen-backdrop textarea::-webkit-input-placeholder {
+    color: white;
+  }
+
+  .zen-backdrop textarea:-moz-placeholder {
+    color: white;
+  }
+
+  .zen-backdrop textarea::-moz-placeholder {
+    color: white;
+  }
+
+  .zen-backdrop textarea:-ms-input-placeholder {
+    color: white;
+  }
+
+  input:checked ~ .zen-backdrop textarea::-webkit-input-placeholder {
+    color: #999;
+  }
+
+  input:checked ~ .zen-backdrop textarea:-moz-placeholder {
+    color: #999;
+    opacity: 1;
+  }
+
+  input:checked ~ .zen-backdrop textarea::-moz-placeholder {
+    color: #999;
+    opacity: 1;
+  }
+
+  input:checked ~ .zen-backdrop textarea:-ms-input-placeholder {
+    color: #999;
+  }
+}

app/assets/stylesheets/highlight/dark.scss

-.dark {
-  background-color: #232323;
-
-  .line.hll {
-    background: #558;
-  }
-
-  .highlight{
-    border-left: 1px solid #444;
-  }
-
-  .no-highlight {
-    color: #DDD;
-  }
+/* https://github.com/MozMorris/tomorrow-pygments */
+.code.dark {
 
+  pre.code,
+  .line-numbers,
   .line-numbers a {
-    color: #666;
-  }
-
-  pre {
-    background-color: #232323;
-  }
-
-  .hljs {
-    display: block;
-    background: #232323;
-    color: #E6E1DC;
-  }
-
-  .hljs-comment,
-  .hljs-template_comment,
-  .hljs-javadoc,
-  .hljs-shebang {
-    color: #BC9458;
-    font-style: italic;
-  }
-
-  .hljs-keyword,
-  .ruby .hljs-function .hljs-keyword,
-  .hljs-request,
-  .hljs-status,
-  .nginx .hljs-title,
-  .method,
-  .hljs-list .hljs-title {
-    color: #C26230;
-  }
-
-  .hljs-string,
-  .hljs-number,
-  .hljs-regexp,
-  .hljs-tag .hljs-value,
-  .hljs-cdata,
-  .hljs-filter .hljs-argument,
-  .hljs-attr_selector,
-  .apache .hljs-cbracket,
-  .hljs-date,
-  .tex .hljs-command,
-  .markdown .hljs-link_label {
-    color: #A5C261;
-  }
-
-  .hljs-subst {
-    color: #519F50;
-  }
-
-  .hljs-tag,
-  .hljs-tag .hljs-keyword,
-  .hljs-tag .hljs-title,
-  .hljs-doctype,
-  .hljs-sub .hljs-identifier,
-  .hljs-pi,
-  .input_number {
-    color: #E8BF6A;
-  }
-
-  .hljs-identifier {
-    color: #D0D0FF;
-  }
-
-  .hljs-class .hljs-title,
-  .haskell .hljs-type,
-  .smalltalk .hljs-class,
-  .hljs-javadoctag,
-  .hljs-yardoctag,
-  .hljs-phpdoc {
-    text-decoration: none;
-  }
-
-  .hljs-constant {
-    color: #DA4939;
-  }
-
-
-  .hljs-symbol,
-  .hljs-built_in,
-  .ruby .hljs-symbol .hljs-string,
-  .ruby .hljs-symbol .hljs-identifier,
-  .markdown .hljs-link_url,
-  .hljs-attribute {
-    color: #6D9CBE;
-  }
-
-  .markdown .hljs-link_url {
-    text-decoration: underline;
-  }
-
-
-
-  .hljs-params,
-  .hljs-variable,
-  .clojure .hljs-attribute {
-    color: #D0D0FF;
-  }
-
-  .css .hljs-tag,
-  .hljs-rules .hljs-property,
-  .hljs-pseudo,
-  .tex .hljs-special {
-    color: #CDA869;
-  }
-
-  .css .hljs-class {
-    color: #9B703F;
-  }
-
-  .hljs-rules .hljs-keyword {
-    color: #C5AF75;
-  }
-
-  .hljs-rules .hljs-value {
-    color: #CF6A4C;
-  }
-
-  .css .hljs-id {
-    color: #8B98AB;
-  }
-
-  .hljs-annotation,
-  .apache .hljs-sqbracket,
-  .nginx .hljs-built_in {
-    color: #9B859D;
-  }
-
-  .hljs-preprocessor,
-  .hljs-preprocessor *,
-  .hljs-pragma {
-    color: #8996A8 !important;
-  }
-
-  .hljs-hexcolor,
-  .css .hljs-value .hljs-number {
-    color: #A5C261;
-  }
-
-  .hljs-title,
-  .hljs-decorator,
-  .css .hljs-function {
-    color: #FFC66D;
-  }
-
-  .diff .hljs-header,
-  .hljs-chunk {
-    background-color: #2F33AB;
-    color: #E6E1DC;
-    display: inline-block;
-    width: 100%;
-  }
-
-  .diff .hljs-change {
-    background-color: #4A410D;
-    color: #F8F8F8;
-    display: inline-block;
-    width: 100%;
-  }
-
-  .hljs-addition {
-    background-color: #144212;
-    color: #E6E1DC;
-    display: inline-block;
-    width: 100%;
-  }
-
-  .hljs-deletion {
-    background-color: #600;
-    color: #E6E1DC;
-    display: inline-block;
-    width: 100%;
-  }
-
-  .coffeescript .javascript,
-  .javascript .xml,
-  .tex .hljs-formula,
-  .xml .javascript,
-  .xml .vbscript,
-  .xml .css,
-  .xml .hljs-cdata {
-    opacity: 0.7;
-  }
+    background-color: #1d1f21 !important;
+    color: #c5c8c6 !important;
+  }
+
+  pre.code {
+    border-left: 1px solid #666;
+  }
+
+  pre.hll {
+    background-color: #fff !important;
+  }
+
+  .hll { background-color: #373b41 }
+  .c { color: #969896 } /* Comment */
+  .err { color: #cc6666 } /* Error */
+  .k { color: #b294bb } /* Keyword */
+  .l { color: #de935f } /* Literal */
+  .n { color: #c5c8c6 } /* Name */
+  .o { color: #8abeb7 } /* Operator */
+  .p { color: #c5c8c6 } /* Punctuation */
+  .cm { color: #969896 } /* Comment.Multiline */
+  .cp { color: #969896 } /* Comment.Preproc */
+  .c1 { color: #969896 } /* Comment.Single */
+  .cs { color: #969896 } /* Comment.Special */
+  .gd { color: #cc6666 } /* Generic.Deleted */
+  .ge { font-style: italic } /* Generic.Emph */
+  .gh { color: #c5c8c6; font-weight: bold } /* Generic.Heading */
+  .gi { color: #b5bd68 } /* Generic.Inserted */
+  .gp { color: #969896; font-weight: bold } /* Generic.Prompt */
+  .gs { font-weight: bold } /* Generic.Strong */
+  .gu { color: #8abeb7; font-weight: bold } /* Generic.Subheading */
+  .kc { color: #b294bb } /* Keyword.Constant */
+  .kd { color: #b294bb } /* Keyword.Declaration */
+  .kn { color: #8abeb7 } /* Keyword.Namespace */
+  .kp { color: #b294bb } /* Keyword.Pseudo */
+  .kr { color: #b294bb } /* Keyword.Reserved */
+  .kt { color: #f0c674 } /* Keyword.Type */
+  .ld { color: #b5bd68 } /* Literal.Date */
+  .m { color: #de935f } /* Literal.Number */
+  .s { color: #b5bd68 } /* Literal.String */
+  .na { color: #81a2be } /* Name.Attribute */
+  .nb { color: #c5c8c6 } /* Name.Builtin */
+  .nc { color: #f0c674 } /* Name.Class */
+  .no { color: #cc6666 } /* Name.Constant */
+  .nd { color: #8abeb7 } /* Name.Decorator */
+  .ni { color: #c5c8c6 } /* Name.Entity */
+  .ne { color: #cc6666 } /* Name.Exception */
+  .nf { color: #81a2be } /* Name.Function */
+  .nl { color: #c5c8c6 } /* Name.Label */
+  .nn { color: #f0c674 } /* Name.Namespace */
+  .nx { color: #81a2be } /* Name.Other */
+  .py { color: #c5c8c6 } /* Name.Property */
+  .nt { color: #8abeb7 } /* Name.Tag */
+  .nv { color: #cc6666 } /* Name.Variable */
+  .ow { color: #8abeb7 } /* Operator.Word */
+  .w { color: #c5c8c6 } /* Text.Whitespace */
+  .mf { color: #de935f } /* Literal.Number.Float */
+  .mh { color: #de935f } /* Literal.Number.Hex */
+  .mi { color: #de935f } /* Literal.Number.Integer */
+  .mo { color: #de935f } /* Literal.Number.Oct */
+  .sb { color: #b5bd68 } /* Literal.String.Backtick */
+  .sc { color: #c5c8c6 } /* Literal.String.Char */
+  .sd { color: #969896 } /* Literal.String.Doc */
+  .s2 { color: #b5bd68 } /* Literal.String.Double */
+  .se { color: #de935f } /* Literal.String.Escape */
+  .sh { color: #b5bd68 } /* Literal.String.Heredoc */
+  .si { color: #de935f } /* Literal.String.Interpol */
+  .sx { color: #b5bd68 } /* Literal.String.Other */
+  .sr { color: #b5bd68 } /* Literal.String.Regex */
+  .s1 { color: #b5bd68 } /* Literal.String.Single */
+  .ss { color: #b5bd68 } /* Literal.String.Symbol */
+  .bp { color: #c5c8c6 } /* Name.Builtin.Pseudo */
+  .vc { color: #cc6666 } /* Name.Variable.Class */
+  .vg { color: #cc6666 } /* Name.Variable.Global */
+  .vi { color: #cc6666 } /* Name.Variable.Instance */
+  .il { color: #de935f } /* Literal.Number.Integer.Long */
 }

app/assets/stylesheets/highlight/monokai.scss

-.monokai {
-  background-color: #272822;
-
-  .highlight{
-    border-left: 1px solid #444;
-  }
-
-  .line.hll {
-    background: #558;
-  }
-
-  .no-highlight {
-    color: #DDD;
-  }
+/* https://github.com/richleland/pygments-css/blob/master/monokai.css */
+.code.monokai {
 
+  pre.highlight,
+  .line-numbers,
   .line-numbers a {
-    color: #666;
-  }
-
-  pre {
-    background-color: #272822;
-    color: #f8f8f2;
-  }
-
-  .hljs {
-    display: block;
-    background: #272822;
-  }
-
-  .hljs-tag,
-  .hljs-tag .hljs-title,
-  .hljs-strong,
-  .hljs-change,
-  .hljs-winutils,
-  .hljs-flow,
-  .lisp .hljs-title,
-  .clojure .hljs-built_in,
-  .hljs-keyword,
-  .nginx .hljs-title,
-  .tex .hljs-special {
-    color: #F92672;
-  }
-
-  .hljs {
-    color: #F8F8F2;
-  }
-
-  .asciidoc .hljs-code,
-  .markdown .hljs-code,
-  .hljs-literal,
-  .hljs-function .hljs-keyword {
-    color: #66D9EF;
-  }
-
-
-  .hljs-code,
-  .hljs-class .hljs-title,
-  .hljs-header {
-    color: white;
-  }
-
-  .hljs-link_label,
-  .hljs-attribute,
-  .hljs-symbol,
-  .hljs-symbol .hljs-string,
-  .hljs-value,
-  .hljs-constant,
-  .hljs-number,
-  .hljs-regexp {
-    color: #AE81FF;
-  }
-
-  .hljs-string {
-    color: #E6DB74;
-  }
-
-  .hljs-params {
-    color: #fd971f;
-  }
-
-  .hljs-link_url,
-  .hljs-tag .hljs-value,
-  .hljs-bullet,
-  .hljs-subst,
-  .hljs-title,
-  .hljs-emphasis,
-  .hljs-type,
-  .hljs-preprocessor,
-  .hljs-pragma,
-  .ruby .hljs-class .hljs-parent,
-  .hljs-built_in,
-  .sql .hljs-aggregate,
-  .django .hljs-template_tag,
-  .django .hljs-variable,
-  .smalltalk .hljs-class,
-  .hljs-javadoc,
-  .django .hljs-filter .hljs-argument,
-  .smalltalk .hljs-localvars,
-  .smalltalk .hljs-array,
-  .hljs-attr_selector,
-  .hljs-pseudo,
-  .hljs-addition,
-  .hljs-stream,
-  .hljs-envvar,
-  .apache .hljs-tag,
-  .apache .hljs-cbracket,
-  .tex .hljs-command,
-  .hljs-prompt {
-    color: #A6E22E;
-  }
-
-  .hljs-comment,
-  .hljs-annotation,
-  .smartquote,
-  .hljs-blockquote,
-  .hljs-horizontal_rule,
-  .hljs-template_comment,
-  .hljs-decorator,
-  .hljs-pi,
-  .hljs-doctype,
-  .hljs-deletion,
-  .hljs-shebang,
-  .apache .hljs-sqbracket,
-  .tex .hljs-formula {
-    color: #75715E;
-  }
-
-  .hljs-keyword,
-  .hljs-literal,
-  .css .hljs-id,
-  .hljs-phpdoc,
-  .hljs-title,
-  .hljs-header,
-  .haskell .hljs-type,
-  .vbscript .hljs-built_in,
-  .sql .hljs-aggregate,
-  .rsl .hljs-built_in,
-  .smalltalk .hljs-class,
-  .diff .hljs-header,
-  .hljs-chunk,
-  .hljs-winutils,
-  .bash .hljs-variable,
-  .apache .hljs-tag,
-  .tex .hljs-special,
-  .hljs-request,
-  .hljs-status {
-    font-weight: bold;
-  }
-
-  .coffeescript .javascript,
-  .javascript .xml,
-  .tex .hljs-formula,
-  .xml .javascript,
-  .xml .vbscript,
-  .xml .css,
-  .xml .hljs-cdata {
-    opacity: 0.5;
-  }
+    background:#272822 !important;
+    color:#f8f8f2 !important;
+  }
+
+  pre.code {
+    border-left: 1px solid #555;
+  }
+
+  .hll { background-color: #49483e }
+  .c { color: #75715e } /* Comment */
+  .err { color: #960050; background-color: #1e0010 } /* Error */
+  .k { color: #66d9ef } /* Keyword */
+  .l { color: #ae81ff } /* Literal */
+  .n { color: #f8f8f2 } /* Name */
+  .o { color: #f92672 } /* Operator */
+  .p { color: #f8f8f2 } /* Punctuation */
+  .cm { color: #75715e } /* Comment.Multiline */
+  .cp { color: #75715e } /* Comment.Preproc */
+  .c1 { color: #75715e } /* Comment.Single */
+  .cs { color: #75715e } /* Comment.Special */
+  .ge { font-style: italic } /* Generic.Emph */
+  .gs { font-weight: bold } /* Generic.Strong */
+  .kc { color: #66d9ef } /* Keyword.Constant */
+  .kd { color: #66d9ef } /* Keyword.Declaration */
+  .kn { color: #f92672 } /* Keyword.Namespace */
+  .kp { color: #66d9ef } /* Keyword.Pseudo */
+  .kr { color: #66d9ef } /* Keyword.Reserved */
+  .kt { color: #66d9ef } /* Keyword.Type */
+  .ld { color: #e6db74 } /* Literal.Date */
+  .m { color: #ae81ff } /* Literal.Number */
+  .s { color: #e6db74 } /* Literal.String */
+  .na { color: #a6e22e } /* Name.Attribute */
+  .nb { color: #f8f8f2 } /* Name.Builtin */
+  .nc { color: #a6e22e } /* Name.Class */
+  .no { color: #66d9ef } /* Name.Constant */
+  .nd { color: #a6e22e } /* Name.Decorator */
+  .ni { color: #f8f8f2 } /* Name.Entity */
+  .ne { color: #a6e22e } /* Name.Exception */
+  .nf { color: #a6e22e } /* Name.Function */
+  .nl { color: #f8f8f2 } /* Name.Label */
+  .nn { color: #f8f8f2 } /* Name.Namespace */
+  .nx { color: #a6e22e } /* Name.Other */
+  .py { color: #f8f8f2 } /* Name.Property */
+  .nt { color: #f92672 } /* Name.Tag */
+  .nv { color: #f8f8f2 } /* Name.Variable */
+  .ow { color: #f92672 } /* Operator.Word */
+  .w { color: #f8f8f2 } /* Text.Whitespace */
+  .mf { color: #ae81ff } /* Literal.Number.Float */
+  .mh { color: #ae81ff } /* Literal.Number.Hex */
+  .mi { color: #ae81ff } /* Literal.Number.Integer */
+  .mo { color: #ae81ff } /* Literal.Number.Oct */
+  .sb { color: #e6db74 } /* Literal.String.Backtick */
+  .sc { color: #e6db74 } /* Literal.String.Char */
+  .sd { color: #e6db74 } /* Literal.String.Doc */
+  .s2 { color: #e6db74 } /* Literal.String.Double */
+  .se { color: #ae81ff } /* Literal.String.Escape */
+  .sh { color: #e6db74 } /* Literal.String.Heredoc */
+  .si { color: #e6db74 } /* Literal.String.Interpol */
+  .sx { color: #e6db74 } /* Literal.String.Other */
+  .sr { color: #e6db74 } /* Literal.String.Regex */
+  .s1 { color: #e6db74 } /* Literal.String.Single */
+  .ss { color: #e6db74 } /* Literal.String.Symbol */
+  .bp { color: #f8f8f2 } /* Name.Builtin.Pseudo */
+  .vc { color: #f8f8f2 } /* Name.Variable.Class */
+  .vg { color: #f8f8f2 } /* Name.Variable.Global */
+  .vi { color: #f8f8f2 } /* Name.Variable.Instance */
+  .il { color: #ae81ff } /* Literal.Number.Integer.Long */
+
+  .gh { } /* Generic Heading & Diff Header */
+  .gu { color: #75715e; } /* Generic.Subheading & Diff Unified/Comment? */
+  .gd { color: #f92672; } /* Generic.Deleted & Diff Deleted */
+  .gi { color: #a6e22e; } /* Generic.Inserted & Diff Inserted */
 }

app/assets/stylesheets/highlight/solarized_dark.scss

-.solarized-dark {
-  background-color: #002B36;
-
-  .highlight{
-    border-left: 1px solid #113b46;
-  }
-
-  .line.hll {
-    background: #000;
-  }
-
-  .no-highlight {
-    color: #DDD;
-  }
-
-  pre {
-    background-color: #002B36;
-    color: #eee;
-  }
+/* https://gist.github.com/qguv/7936275 */
+.code.solarized-dark {
 
+  pre.code,
+  .line-numbers,
   .line-numbers a {
-    color: #666;
+    background-color: #002b36 !important;
+    color: #93a1a1 !important;
   }
 
-  .hljs {
-    display: block;
-    background: #002b36;
-    color: #839496;
-  }
-
-  .hljs-comment,
-  .hljs-template_comment,
-  .diff .hljs-header,
-  .hljs-doctype,
-  .hljs-pi,
-  .lisp .hljs-string,
-  .hljs-javadoc {
-    color: #586e75;
-  }
-
-  /* Solarized Green */
-  .hljs-keyword,
-  .hljs-winutils,
-  .method,
-  .hljs-addition,
-  .css .hljs-tag,
-  .hljs-request,
-  .hljs-status,
-  .nginx .hljs-title {
-    color: #859900;
+  pre.code {
+    border-left: 1px solid #113b46;
   }
 
-  /* Solarized Cyan */
-  .hljs-number,
-  .hljs-command,
-  .hljs-string,
-  .hljs-tag .hljs-value,
-  .hljs-rules .hljs-value,
-  .hljs-phpdoc,
-  .tex .hljs-formula,
-  .hljs-regexp,
-  .hljs-hexcolor,
-  .hljs-link_url {
-    color: #2aa198;
-  }
+  /* Solarized Dark
 
-  /* Solarized Blue */
-  .hljs-title,
-  .hljs-localvars,
-  .hljs-chunk,
-  .hljs-decorator,
-  .hljs-built_in,
-  .hljs-identifier,
-  .vhdl .hljs-literal,
-  .hljs-id,
-  .css .hljs-function {
-    color: #268bd2;
-  }
+  For use with Jekyll and Pygments
 
-  /* Solarized Yellow */
-  .hljs-attribute,
-  .hljs-variable,
-  .lisp .hljs-body,
-  .smalltalk .hljs-number,
-  .hljs-constant,
-  .hljs-class .hljs-title,
-  .hljs-parent,
-  .haskell .hljs-type,
-  .hljs-link_reference {
-    color: #b58900;
-  }
+  http://ethanschoonover.com/solarized
 
-  /* Solarized Orange */
-  .hljs-preprocessor,
-  .hljs-preprocessor .hljs-keyword,
-  .hljs-pragma,
-  .hljs-shebang,
-  .hljs-symbol,
-  .hljs-symbol .hljs-string,
-  .diff .hljs-change,
-  .hljs-special,
-  .hljs-attr_selector,
-  .hljs-subst,
-  .hljs-cdata,
-  .clojure .hljs-title,
-  .css .hljs-pseudo,
-  .hljs-header {
-    color: #cb4b16;
-  }
+  SOLARIZED HEX      ROLE
+  --------- -------- ------------------------------------------
+  base03    #002b36  background
+  base01    #586e75  comments / secondary content
+  base1     #93a1a1  body text / default code / primary content
+  orange    #cb4b16  constants
+  red       #dc322f  regex, special keywords
+  blue      #268bd2  reserved keywords
+  cyan      #2aa198  strings, numbers
+  green     #859900  operators, other keywords
+  */
 
-  /* Solarized Red */
-  .hljs-deletion,
-  .hljs-important {
-    color: #dc322f;
-  }
-
-  /* Solarized Violet */
-  .hljs-link_label {
-    color: #6c71c4;
-  }
-
-  .tex .hljs-formula {
-    background: #073642;
-  }
+  .c { color: #586e75 } /* Comment */
+  .err { color: #93a1a1 } /* Error */
+  .g { color: #93a1a1 } /* Generic */
+  .k { color: #859900 } /* Keyword */
+  .l { color: #93a1a1 } /* Literal */
+  .n { color: #93a1a1 } /* Name */
+  .o { color: #859900 } /* Operator */
+  .x { color: #cb4b16 } /* Other */
+  .p { color: #93a1a1 } /* Punctuation */
+  .cm { color: #586e75 } /* Comment.Multiline */
+  .cp { color: #859900 } /* Comment.Preproc */
+  .c1 { color: #586e75 } /* Comment.Single */
+  .cs { color: #859900 } /* Comment.Special */
+  .gd { color: #2aa198 } /* Generic.Deleted */
+  .ge { color: #93a1a1; font-style: italic } /* Generic.Emph */
+  .gr { color: #dc322f } /* Generic.Error */
+  .gh { color: #cb4b16 } /* Generic.Heading */
+  .gi { color: #859900 } /* Generic.Inserted */
+  .go { color: #93a1a1 } /* Generic.Output */
+  .gp { color: #93a1a1 } /* Generic.Prompt */
+  .gs { color: #93a1a1; font-weight: bold } /* Generic.Strong */
+  .gu { color: #cb4b16 } /* Generic.Subheading */
+  .gt { color: #93a1a1 } /* Generic.Traceback */
+  .kc { color: #cb4b16 } /* Keyword.Constant */
+  .kd { color: #268bd2 } /* Keyword.Declaration */
+  .kn { color: #859900 } /* Keyword.Namespace */
+  .kp { color: #859900 } /* Keyword.Pseudo */
+  .kr { color: #268bd2 } /* Keyword.Reserved */
+  .kt { color: #dc322f } /* Keyword.Type */
+  .ld { color: #93a1a1 } /* Literal.Date */
+  .m { color: #2aa198 } /* Literal.Number */
+  .s { color: #2aa198 } /* Literal.String */
+  .na { color: #93a1a1 } /* Name.Attribute */
+  .nb { color: #B58900 } /* Name.Builtin */
+  .nc { color: #268bd2 } /* Name.Class */
+  .no { color: #cb4b16 } /* Name.Constant */
+  .nd { color: #268bd2 } /* Name.Decorator */
+  .ni { color: #cb4b16 } /* Name.Entity */
+  .ne { color: #cb4b16 } /* Name.Exception */
+  .nf { color: #268bd2 } /* Name.Function */
+  .nl { color: #93a1a1 } /* Name.Label */
+  .nn { color: #93a1a1 } /* Name.Namespace */
+  .nx { color: #93a1a1 } /* Name.Other */
+  .py { color: #93a1a1 } /* Name.Property */
+  .nt { color: #268bd2 } /* Name.Tag */
+  .nv { color: #268bd2 } /* Name.Variable */
+  .ow { color: #859900 } /* Operator.Word */
+  .w { color: #93a1a1 } /* Text.Whitespace */
+  .mf { color: #2aa198 } /* Literal.Number.Float */
+  .mh { color: #2aa198 } /* Literal.Number.Hex */
+  .mi { color: #2aa198 } /* Literal.Number.Integer */
+  .mo { color: #2aa198 } /* Literal.Number.Oct */
+  .sb { color: #586e75 } /* Literal.String.Backtick */
+  .sc { color: #2aa198 } /* Literal.String.Char */
+  .sd { color: #93a1a1 } /* Literal.String.Doc */
+  .s2 { color: #2aa198 } /* Literal.String.Double */
+  .se { color: #cb4b16 } /* Literal.String.Escape */
+  .sh { color: #93a1a1 } /* Literal.String.Heredoc */
+  .si { color: #2aa198 } /* Literal.String.Interpol */
+  .sx { color: #2aa198 } /* Literal.String.Other */
+  .sr { color: #dc322f } /* Literal.String.Regex */
+  .s1 { color: #2aa198 } /* Literal.String.Single */
+  .ss { color: #2aa198 } /* Literal.String.Symbol */
+  .bp { color: #268bd2 } /* Name.Builtin.Pseudo */
+  .vc { color: #268bd2 } /* Name.Variable.Class */
+  .vg { color: #268bd2 } /* Name.Variable.Global */
+  .vi { color: #268bd2 } /* Name.Variable.Instance */
+  .il { color: #2aa198 } /* Literal.Number.Integer.Long */
 }

app/assets/stylesheets/highlight/solarized_light.scss

+/* https://gist.github.com/qguv/7936275 */
+.code.solarized-light {
+
+  pre.code,
+  .line-numbers,
+  .line-numbers a {
+    background-color: #fdf6e3 !important;
+    color: #586e75 !important;
+  }
+
+  pre.code {
+    border-left: 1px solid #c5d0d4;
+  }
+
+  /* Solarized Light
+
+  For use with Jekyll and Pygments
+
+  http://ethanschoonover.com/solarized
+
+  SOLARIZED HEX      ROLE
+  --------- -------- ------------------------------------------
+  base01    #586e75  body text / default code / primary content
+  base1     #93a1a1  comments / secondary content
+  base3     #fdf6e3  background
+  orange    #cb4b16  constants
+  red       #dc322f  regex, special keywords
+  blue      #268bd2  reserved keywords
+  cyan      #2aa198  strings, numbers
+  green     #859900  operators, other keywords
+  */
+
+  .c { color: #93a1a1 } /* Comment */
+  .err { color: #586e75 } /* Error */
+  .g { color: #586e75 } /* Generic */
+  .k { color: #859900 } /* Keyword */
+  .l { color: #586e75 } /* Literal */
+  .n { color: #586e75 } /* Name */
+  .o { color: #859900 } /* Operator */
+  .x { color: #cb4b16 } /* Other */
+  .p { color: #586e75 } /* Punctuation */
+  .cm { color: #93a1a1 } /* Comment.Multiline */
+  .cp { color: #859900 } /* Comment.Preproc */
+  .c1 { color: #93a1a1 } /* Comment.Single */
+  .cs { color: #859900 } /* Comment.Special */
+  .gd { color: #2aa198 } /* Generic.Deleted */
+  .ge { color: #586e75; font-style: italic } /* Generic.Emph */
+  .gr { color: #dc322f } /* Generic.Error */
+  .gh { color: #cb4b16 } /* Generic.Heading */
+  .gi { color: #859900 } /* Generic.Inserted */
+  .go { color: #586e75 } /* Generic.Output */
+  .gp { color: #586e75 } /* Generic.Prompt */
+  .gs { color: #586e75; font-weight: bold } /* Generic.Strong */
+  .gu { color: #cb4b16 } /* Generic.Subheading */
+  .gt { color: #586e75 } /* Generic.Traceback */
+  .kc { color: #cb4b16 } /* Keyword.Constant */
+  .kd { color: #268bd2 } /* Keyword.Declaration */
+  .kn { color: #859900 } /* Keyword.Namespace */
+  .kp { color: #859900 } /* Keyword.Pseudo */
+  .kr { color: #268bd2 } /* Keyword.Reserved */
+  .kt { color: #dc322f } /* Keyword.Type */
+  .ld { color: #586e75 } /* Literal.Date */
+  .m { color: #2aa198 } /* Literal.Number */
+  .s { color: #2aa198 } /* Literal.String */
+  .na { color: #586e75 } /* Name.Attribute */
+  .nb { color: #B58900 } /* Name.Builtin */
+  .nc { color: #268bd2 } /* Name.Class */
+  .no { color: #cb4b16 } /* Name.Constant */
+  .nd { color: #268bd2 } /* Name.Decorator */
+  .ni { color: #cb4b16 } /* Name.Entity */
+  .ne { color: #cb4b16 } /* Name.Exception */
+  .nf { color: #268bd2 } /* Name.Function */
+  .nl { color: #586e75 } /* Name.Label */
+  .nn { color: #586e75 } /* Name.Namespace */
+  .nx { color: #586e75 } /* Name.Other */
+  .py { color: #586e75 } /* Name.Property */
+  .nt { color: #268bd2 } /* Name.Tag */
+  .nv { color: #268bd2 } /* Name.Variable */
+  .ow { color: #859900 } /* Operator.Word */
+  .w { color: #586e75 } /* Text.Whitespace */
+  .mf { color: #2aa198 } /* Literal.Number.Float */
+  .mh { color: #2aa198 } /* Literal.Number.Hex */
+  .mi { color: #2aa198 } /* Literal.Number.Integer */
+  .mo { color: #2aa198 } /* Literal.Number.Oct */
+  .sb { color: #93a1a1 } /* Literal.String.Backtick */
+  .sc { color: #2aa198 } /* Literal.String.Char */
+  .sd { color: #586e75 } /* Literal.String.Doc */
+  .s2 { color: #2aa198 } /* Literal.String.Double */
+  .se { color: #cb4b16 } /* Literal.String.Escape */
+  .sh { color: #586e75 } /* Literal.String.Heredoc */
+  .si { color: #2aa198 } /* Literal.String.Interpol */
+  .sx { color: #2aa198 } /* Literal.String.Other */
+  .sr { color: #dc322f } /* Literal.String.Regex */
+  .s1 { color: #2aa198 } /* Literal.String.Single */
+  .ss { color: #2aa198 } /* Literal.String.Symbol */
+  .bp { color: #268bd2 } /* Name.Builtin.Pseudo */
+  .vc { color: #268bd2 } /* Name.Variable.Class */
+  .vg { color: #268bd2 } /* Name.Variable.Global */
+  .vi { color: #268bd2 } /* Name.Variable.Instance */
+  .il { color: #2aa198 } /* Literal.Number.Integer.Long */
+}

app/assets/stylesheets/highlight/white.scss

-.white {
-  .line.hll {
-    background: #FFA;
-  }
-
-  pre {
-    background-color: #fff;
-    color: #333;
-  }
-
-  .hljs {
-    background: #FFF;
-  }
+/* https://github.com/aahan/pygments-github-style */
+.code.white {
 
+  pre.highlight,
+  .line-numbers,
   .line-numbers a {
-    color: #999;
-  }
-
-  .hljs {
-    display: block;
-    background: #fff; color: black;
-  }
-
-  .hljs-comment,
-  .hljs-template_comment,
-  .hljs-javadoc,
-  .hljs-comment * {
-    color: #006a00;
-  }
-
-  .hljs-keyword,
-  .hljs-literal,
-  .nginx .hljs-title {
-    color: #aa0d91;
-  }
-  .method,
-  .hljs-list .hljs-title,
-  .hljs-tag .hljs-title,
-  .setting .hljs-value,
-  .hljs-winutils,
-  .tex .hljs-command,
-  .http .hljs-title,
-  .hljs-request,
-  .hljs-status {
-    color: #008;
-  }
-
-  .hljs-envvar,
-  .tex .hljs-special {
-    color: #660;
-  }
-
-  .hljs-string {
-    color: #c41a16;
-  }
-  .hljs-tag .hljs-value,
-  .hljs-cdata,
-  .hljs-filter .hljs-argument,
-  .hljs-attr_selector,
-  .apache .hljs-cbracket,
-  .hljs-date,
-  .hljs-regexp {
-    color: #080;
-  }
-
-  .hljs-sub .hljs-identifier,
-  .hljs-pi,
-  .hljs-tag,
-  .hljs-tag .hljs-keyword,
-  .hljs-decorator,
-  .ini .hljs-title,
-  .hljs-shebang,
-  .hljs-prompt,
-  .hljs-hexcolor,
-  .hljs-rules .hljs-value,
-  .hljs-symbol,
-  .hljs-symbol .hljs-string,
-  .hljs-number,
-  .css .hljs-function,
-  .clojure .hljs-title,
-  .clojure .hljs-built_in,
-  .hljs-function .hljs-title,
-  .coffeescript .hljs-attribute {
-    color: #1c00cf;
-  }
-
-  .hljs-class .hljs-title,
-  .haskell .hljs-type,
-  .smalltalk .hljs-class,
-  .hljs-javadoctag,
-  .hljs-yardoctag,
-  .hljs-phpdoc,
-  .hljs-typename,
-  .hljs-tag .hljs-attribute,
-  .hljs-doctype,
-  .hljs-class .hljs-id,
-  .hljs-built_in,
-  .setting,
-  .hljs-params,
-  .clojure .hljs-attribute {
-    color: #5c2699;
-  }
-
-  .hljs-variable {
-   color: #3f6e74;
-  }
-  .css .hljs-tag,
-  .hljs-rules .hljs-property,
-  .hljs-pseudo,
-  .hljs-subst {
-    color: #000;
-  }
-
-  .css .hljs-class,
-  .css .hljs-id {
-    color: #9B703F;
-  }
-
-  .hljs-value .hljs-important {
-    color: #ff7700;
-    font-weight: bold;
-  }
-
-  .hljs-rules .hljs-keyword {
-    color: #C5AF75;
-  }
-
-  .hljs-annotation,
-  .apache .hljs-sqbracket,
-  .nginx .hljs-built_in {
-    color: #9B859D;
-  }
-
-  .hljs-preprocessor,
-  .hljs-preprocessor *,
-  .hljs-pragma {
-    color: #643820;
-  }
-
-  .tex .hljs-formula {
-    background-color: #EEE;
-    font-style: italic;
-  }
-
-  .diff .hljs-header,
-  .hljs-chunk {
-    color: #808080;
-    font-weight: bold;
-  }
-
-  .diff .hljs-change {
-    background-color: #BCCFF9;
-  }
-
-  .hljs-addition {
-    background-color: #BAEEBA;
-  }
-
-  .hljs-deletion {
-    background-color: #FFC8BD;
-  }
-
-  .hljs-comment .hljs-yardoctag {
-    font-weight: bold;
-  }
-
-  .method .hljs-id {
-    color: #000;
-  }
-}
-
-.shadow {
-  @include box-shadow(0 5px 15px #000);
-}
-
-.file-content {
-  &.code .white {
-    .highlight {
-      border-left: 1px solid #eee;
-    }
-  }
-
-  &.wiki .white {
-    .highlight, pre, .hljs {
-      background: #F9F9F9;
-    }
-  }
-}
-
-.readme-holder .wiki, .note-body, .wiki-holder {
-  .white {
-    .highlight, pre, .hljs {
-      background: #F9F9F9;
-    }
-  }
+    background-color: #fff !important;
+    color: #333 !important;
+  }
+
+  pre.code {
+    border-left: 1px solid #bbb;
+  }
+
+  .hll { background-color: #f8f8f8 }
+  .c { color: #999988; font-style: italic; }
+  .err { color: #a61717; background-color: #e3d2d2; }
+  .k { font-weight: bold; }
+  .o { font-weight: bold; }
+  .cm { color: #999988; font-style: italic; }
+  .cp { color: #999999; font-weight: bold; }
+  .c1 { color: #999988; font-style: italic; }
+  .cs { color: #999999; font-weight: bold; font-style: italic; }
+  .gd { color: #000000; background-color: #ffdddd; }
+  .gd .x { color: #000000; background-color: #ffaaaa; }
+  .ge { font-style: italic; }
+  .gr { color: #aa0000; }
+  .gh { color: #999999; }
+  .gi { color: #000000; background-color: #ddffdd; }
+  .gi .x { color: #000000; background-color: #aaffaa; }
+  .go { color: #888888; }
+  .gp { color: #555555; }
+  .gs { font-weight: bold; }
+  .gu { color: #800080; font-weight: bold; }
+  .gt { color: #aa0000; }
+  .kc { font-weight: bold; }
+  .kd { font-weight: bold; }
+  .kn { font-weight: bold; }
+  .kp { font-weight: bold; }
+  .kr { font-weight: bold; }
+  .kt { color: #445588; font-weight: bold; }
+  .m { color: #009999; }
+  .s { color: #dd1144; }
+  .n { color: #333333; }
+  .na { color: teal; }
+  .nb { color: #0086b3; }
+  .nc { color: #445588; font-weight: bold; }
+  .no { color: teal; }
+  .ni { color: purple; }
+  .ne { color: #990000; font-weight: bold; }
+  .nf { color: #990000; font-weight: bold; }
+  .nn { color: #555555; }
+  .nt { color: navy; }
+  .nv { color: teal; }
+  .ow { font-weight: bold; }
+  .w { color: #bbbbbb; }
+  .mf { color: #009999; }
+  .mh { color: #009999; }
+  .mi { color: #009999; }
+  .mo { color: #009999; }
+  .sb { color: #dd1144; }
+  .sc { color: #dd1144; }
+  .sd { color: #dd1144; }
+  .s2 { color: #dd1144; }
+  .se { color: #dd1144; }
+  .sh { color: #dd1144; }
+  .si { color: #dd1144; }
+  .sx { color: #dd1144; }
+  .sr { color: #009926; }
+  .s1 { color: #dd1144; }
+  .ss { color: #990073; }
+  .bp { color: #999999; }
+  .vc { color: teal; }
+  .vg { color: teal; }
+  .vi { color: teal; }
+  .il { color: #009999; }
+  .gc { color: #999; background-color: #EAF2F5; }
 }

app/assets/stylesheets/main/layout.scss

@@ -2,6 +2,10 @@ html {
   overflow-y: scroll;
 
   &.touch .tooltip { display: none !important; }
+
+  body {
+    padding-top: 47px;
+  }
 }
 
 .container {
@@ -13,3 +17,6 @@ html {
   margin: 0 0;
 }
 
+.navless-container {
+  margin-top: 30px;
+}

app/assets/stylesheets/main/mixins.scss

@@ -69,7 +69,12 @@
     margin-top: 0;
   }
 
-  code { padding: 0 4px; }
+  code {
+    font-family: $monospace_font;
+    white-space: pre;
+    word-wrap: normal;
+    padding: 0;
+  }
 
   h1 {
     margin-top: 45px;

app/assets/stylesheets/main/variables.scss

@@ -47,3 +47,13 @@ $deleted: #f77;
  * NProgress customize
  */
 $nprogress-color: #c0392b;
+
+/**
+ * Font sizes
+ */
+$list-font-size: 15px;
+
+/**
+ * Sidebar navigation width
+ */
+$sidebar_width: 230px;

app/assets/stylesheets/sections/commits.scss

@@ -139,7 +139,7 @@
  */
 li.commit {
   .commit-row-title {
-    font-size: 14px;
+    font-size: $list-font-size;
     margin-bottom: 2px;
 
     .notes_count {
@@ -158,7 +158,6 @@ li.commit {
 
     .commit-row-message {
       color: #333;
-      font-weight: 500;
       &:hover {
         color: #444;
         text-decoration: underline;

app/assets/stylesheets/sections/events.scss

@@ -55,11 +55,12 @@
   }
   .event-body {
     margin-left: 35px;
-    margin-right: 100px;
+    margin-right: 80px;
     color: #777;
 
     .event-note {
       margin-top: 5px;
+      word-wrap: break-word;
 
       .md {
         font-size: 13px;
@@ -71,6 +72,7 @@
         border-radius: 0;
         color: #777;
         margin: 0 20px;
+        overflow: hidden;
       }
 
       .note-image-attach {

app/assets/stylesheets/sections/header.scss

@@ -8,8 +8,6 @@ header {
     margin-bottom: 0;
     min-height: 40px;
     border: none;
-    position: fixed;
-    top: 0;
     width: 100%;
 
     .navbar-inner {

app/assets/stylesheets/sections/issues.scss

@@ -5,7 +5,7 @@
 
     .issue-title {
       margin-bottom: 5px;
-      font-size: 14px;
+      font-size: $list-font-size;
     }
 
     .issue-info {
@@ -166,3 +166,7 @@ form.edit-issue {
 .issue-title {
   margin-top: 0;
 }
+
+.context .select2-container {
+  width: 100% !important;
+}

app/assets/stylesheets/sections/markdown_area.scss

+.markdown-area {
+  background: #FFF;
+  border: 1px solid #ddd;
+  min-height: 100px;
+  padding: 5px;
+  font-size: 14px;
+  box-shadow: none;
+  width: 100%;
+}

app/assets/stylesheets/sections/merge_requests.scss

@@ -88,7 +88,7 @@
 
     .merge-request-title {
       margin-bottom: 5px;
-      font-size: 14px;
+      font-size: $list-font-size;
     }
 
     .merge-request-info {

app/assets/stylesheets/sections/sidebar.scss → app/assets/stylesheets/sections/nav_sidebar.scss

+
+
 .page-with-sidebar {
   background: #F5F5F5;
+
+  .sidebar-wrapper {
+    position: fixed;
+    top: 0;
+    left: 0;
+    height: 100%;
+    border-right: 1px solid #EAEAEA;
+  }
 }
 
 .sidebar-wrapper {
@@ -12,7 +22,6 @@
   width: 100%;
   padding: 15px;
   background: #FFF;
-  margin-top: 48px;
 }
 
 .nav-sidebar {
@@ -93,22 +102,17 @@
 
 @mixin expanded-sidebar {
   .page-with-sidebar {
-    padding-left: 250px;
+    padding-left: $sidebar_width;
   }
 
   .sidebar-wrapper {
-    width: 250px;
-    position: fixed;
-    left: 250px;
-    height: 100%;
-    margin-left: -250px;
-    border-right: 1px solid #EAEAEA;
+    width: $sidebar_width;
 
     .nav-sidebar {
       margin-top: 20px;
       position: fixed;
       top: 45px;
-      width: 250px;
+      width: $sidebar_width;
     }
   }
 
@@ -124,11 +128,6 @@
 
   .sidebar-wrapper {
     width: 52px;
-    position: fixed;
-    top: 0;
-    left: 0;
-    height: 100%;
-    border-right: 1px solid #EAEAEA;
     overflow-x: hidden;
 
     .nav-sidebar {
@@ -151,11 +150,10 @@
   }
 }
 
-@media (max-width: $screen-sm-max) {
+@media (max-width: $screen-md-max) {
   @include folded-sidebar;
 }
 
-@media(min-width: $screen-sm-max) {
+@media(min-width: $screen-md-max) {
   @include expanded-sidebar;
 }
-

app/assets/stylesheets/sections/note_form.scss

+/**
+ * Note Form
+ */
+
+.comment-btn {
+  @extend .btn-create;
+}
+.reply-btn {
+  @extend .btn-primary;
+}
+.diff-file .diff-content {
+  tr.line_holder:hover {
+    &> td.line_content {
+      background: $hover !important;
+      border-color: darken($hover, 10%) !important;
+    }
+    &> td.new_line,
+    &> td.old_line {
+      background: darken($hover, 4%) !important;
+      border-color: darken($hover, 10%) !important;
+    }
+  }
+
+  tr.line_holder:hover > td .line_note_link {
+    opacity: 1.0;
+    filter: alpha(opacity=100);
+  }
+}
+.diff-file,
+.discussion {
+  .new_note {
+    margin: 0;
+    border: none;
+  }
+}
+.new_note {
+  display: none;
+}
+
+.new_note, .edit_note {
+  .buttons {
+    float: left;
+    margin-top: 8px;
+  }
+  .clearfix {
+    margin-bottom: 0;
+  }
+
+  .note-preview-holder {
+    > p {
+      overflow-x: auto;
+    }
+  }
+
+  .note_text {
+    width: 100%;
+  }
+}
+
+/* loading indicator */
+.notes-busy {
+  margin: 18px;
+}
+
+.note-image-attach {
+  @extend .col-md-4;
+  @extend .thumbnail;
+  margin-left: 45px;
+  float: none;
+}
+
+.common-note-form {
+  margin: 0;
+  background: #F9F9F9;
+  padding: 5px;
+  border: 1px solid #DDD;
+}
+
+.note-form-actions {
+  background: #F9F9F9;
+  height: 45px;
+
+  .note-form-option {
+    margin-top: 8px;
+    margin-left: 30px;
+    @extend .pull-left;
+  }
+
+  .js-notify-commit-author {
+    float: left;
+  }
+
+  .write-preview-btn {
+    // makes the "absolute" position for links relative to this
+    position: relative;
+
+    // preview/edit buttons
+    > a {
+      position: absolute;
+      right: 5px;
+      top: 8px;
+    }
+  }
+}
+
+.note-edit-form {
+  display: none;
+  font-size: 13px;
+
+  .form-actions {
+    padding-left: 20px;
+
+    .btn-save {
+      float: left;
+    }
+
+    .note-form-option {
+      float: left;
+      padding: 2px 0 0 25px;
+    }
+  }
+}
+
+.js-note-attachment-delete {
+  display: none;
+}
+
+.parallel-comment {
+  padding: 6px;
+}
+
+.error-alert > .alert {
+  margin-top: 5px;
+  margin-bottom: 5px;
+}
+
+.discussion-body,
+.diff-file {
+  .notes .note {
+    border-color: #ddd;
+    padding: 10px 15px;
+  }
+
+  .discussion-reply-holder {
+    background: #f9f9f9;
+    padding: 10px 15px;
+    border-top: 1px solid #DDD;
+  }
+}
+
+.discussion-notes-count {
+  font-size: 16px;
+}
+
+.edit_note {
+  .markdown-area {
+    min-height: 140px;
+  }
+  .note-form-actions {
+    background: transparent;
+  }
+}
+
+.comment-hints {
+  color: #999;
+  background: #FFF;
+  padding: 5px;
+  margin-top: -7px;
+  border: 1px solid #DDD;
+  font-size: 13px;
+}

app/assets/stylesheets/sections/notes.scss

@@ -61,8 +61,12 @@ ul.notes {
       font-size: 14px;
     }
     .note-body {
-      @include md-typography;
       overflow: auto;
+      .note-text {
+        overflow: auto;
+        word-wrap: break-word;
+        @include md-typography;
+      }
     }
     .note-header {
       padding-bottom: 3px;
@@ -190,169 +194,3 @@ ul.notes {
   }
 }
 
-/**
- * Note Form
- */
-
-.comment-btn {
-  @extend .btn-create;
-}
-.reply-btn {
-  @extend .btn-primary;
-}
-.diff-file .diff-content {
-  tr.line_holder:hover {
-    &> td.line_content {
-      background: $hover !important;
-      border-color: darken($hover, 10%) !important;
-    }
-    &> td.new_line,
-    &> td.old_line {
-      background: darken($hover, 4%) !important;
-      border-color: darken($hover, 10%) !important;
-    }
-  }
-
-  tr.line_holder:hover > td .line_note_link {
-    opacity: 1.0;
-    filter: alpha(opacity=100);
-  }
-}
-.diff-file,
-.discussion {
-  .new_note {
-    margin: 0;
-    border: none;
-  }
-}
-.new_note {
-  display: none;
-  .buttons {
-    float: left;
-    margin-top: 8px;
-  }
-  .clearfix {
-    margin-bottom: 0;
-  }
-
-  .note_text {
-    background: #FFF;
-    border: 1px solid #ddd;
-    min-height: 100px;
-    padding: 5px;
-    font-size: 14px;
-    box-shadow: none;
-  }
-
-  .note-preview-holder {
-    > p {
-      overflow-x: auto;
-    }
-  }
-
-  .note_text {
-    width: 100%;
-  }
-}
-
-/* loading indicator */
-.notes-busy {
-  margin: 18px;
-}
-
-.note-image-attach {
-  @extend .col-md-4;
-  @extend .thumbnail;
-  margin-left: 45px;
-  float: none;
-}
-
-.common-note-form {
-  margin: 0;
-  background: #F9F9F9;
-  padding: 5px;
-  border: 1px solid #DDD;
-}
-
-.note-form-actions {
-  background: #F9F9F9;
-  height: 45px;
-
-  .note-form-option {
-    margin-top: 8px;
-    margin-left: 30px;
-    @extend .pull-left;
-  }
-
-  .js-notify-commit-author {
-    float: left;
-  }
-
-  .write-preview-btn {
-    // makes the "absolute" position for links relative to this
-    position: relative;
-
-    // preview/edit buttons
-    > a {
-      position: absolute;
-      right: 5px;
-      top: 8px;
-    }
-  }
-}
-
-.note-edit-form {
-  display: none;
-
-  .note_text {
-    border: 1px solid #DDD;
-    box-shadow: none;
-    font-size: 14px;
-    height: 80px;
-    width: 100%;
-  }
-
-  .form-actions {
-    padding-left: 20px;
-
-    .btn-save {
-      float: left;
-    }
-
-    .note-form-option {
-      float: left;
-      padding: 2px 0 0 25px;
-    }
-  }
-}
-
-.js-note-attachment-delete {
-  display: none;
-}
-
-.parallel-comment {
-  padding: 6px;
-}
-
-.error-alert > .alert {
-  margin-top: 5px;
-  margin-bottom: 5px;
-}
-
-.discussion-body,
-.diff-file {
-  .notes .note {
-    border-color: #ddd;
-    padding: 10px 15px;
-  }
-
-  .discussion-reply-holder {
-    background: #f9f9f9;
-    padding: 10px 15px;
-    border-top: 1px solid #DDD;
-  }
-}
-
-.discussion-notes-count {
-  font-size: 16px;
-}

app/assets/stylesheets/sections/profile.scss

@@ -111,20 +111,3 @@
     height: 50px;
   }
 }
-
-//CSS for password-strength indicator
-#password-strength {
-  margin-bottom: 0;
-}
-
-.has-success input {
-  background-color: #D6F1D7 !important;
-}
-
-.has-error input {
-  background-color: #F3CECE !important;
-}
-
-.has-warning input {
-  background-color: #FFE9A4 !important;
-}

app/assets/stylesheets/sections/projects.scss

@@ -296,20 +296,6 @@ ul.nav.nav-projects-tabs {
   }
 }
 
-@media (max-width: $screen-xs-max) {
-  .project-home-panel {
-    .star-fork-buttons {
-      padding-top: 10px;
-      padding-right: 15px;
-    }
-  }
-
-  .project-home-links {
-    display: none;
-  }
-}
-
-
 table.table.protected-branches-list tr.no-border {
   th, td {
     border: 0;

app/assets/stylesheets/sections/tree.scss

@@ -98,6 +98,11 @@
       background: #f1f1f1;
       border-left: 1px solid #DDD;
     }
+    td.lines {
+      code {
+        font-family: $monospace_font;
+      }
+    }
   }
 }
 

app/controllers/admin/application_settings_controller.rb

@@ -26,6 +26,7 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController
       :signin_enabled,
       :gravatar_enabled,
       :sign_in_text,
+      :home_page_url
     )
   end
 end

app/controllers/admin/applications_controller.rb

+class Admin::ApplicationsController < Admin::ApplicationController
+  before_action :set_application, only: [:show, :edit, :update, :destroy]
+
+  def index
+    @applications = Doorkeeper::Application.where("owner_id IS NULL")
+  end
+
+  def show
+  end
+
+  def new
+    @application = Doorkeeper::Application.new
+  end
+
+  def edit
+  end
+
+  def create
+    @application = Doorkeeper::Application.new(application_params)
+
+    if @application.save
+      flash[:notice] = I18n.t(:notice, scope: [:doorkeeper, :flash, :applications, :create])
+      redirect_to admin_application_url(@application)
+    else
+      render :new
+    end
+  end
+
+  def update
+    if @application.update(application_params)
+      redirect_to admin_application_path(@application), notice: 'Application was successfully updated.'
+    else
+      render :edit
+    end
+  end
+
+  def destroy
+    @application.destroy
+    redirect_to admin_applications_url, notice: 'Application was successfully destroyed.'
+  end
+
+  private
+
+  def set_application
+    @application = Doorkeeper::Application.where("owner_id IS NULL").find(params[:id])
+  end
+
+  # Only allow a trusted parameter "white list" through.
+  def application_params
+    params[:doorkeeper_application].permit(:name, :redirect_uri)
+  end
+end

app/controllers/application_controller.rb

@@ -48,6 +48,17 @@ class ApplicationController < ActionController::Base
     end
   end
 
+  def authenticate_user!(*args)
+    # If user is not signe-in and tries to access root_path - redirect him to landing page
+    if current_application_settings.home_page_url.present?
+      if current_user.nil? && controller_name == 'dashboard' && action_name == 'show'
+        redirect_to current_application_settings.home_page_url and return
+      end
+    end
+
+    super(*args)
+  end
+
   def log_exception(exception)
     application_trace = ActionDispatch::ExceptionWrapper.new(env, exception).application_trace
     application_trace.map!{ |t| "  #{t}\n" }

app/controllers/github_imports_controller.rb

@@ -22,6 +22,11 @@ class GithubImportsController < ApplicationController
     @repos.reject!{|repo| already_added_projects_names.include? repo.full_name}
   end
 
+  def jobs
+    jobs = current_user.created_projects.where(import_type: "github").to_json(:only => [:id, :import_status])
+    render json: jobs
+  end
+
   def create
     @repo_id = params[:repo_id].to_i
     repo = octo_client.repo(@repo_id)
@@ -42,7 +47,7 @@ class GithubImportsController < ApplicationController
       namespace.add_owner(current_user)
     end
 
-    Gitlab::Github::ProjectCreator.new(repo, namespace, current_user).execute
+    @project = Gitlab::Github::ProjectCreator.new(repo, namespace, current_user).execute
   end
 
   private

app/controllers/oauth/applications_controller.rb

@@ -9,9 +9,7 @@ class Oauth::ApplicationsController < Doorkeeper::ApplicationsController
   def create
     @application = Doorkeeper::Application.new(application_params)
 
-    if Doorkeeper.configuration.confirm_application_owner?
     @application.owner = current_user
-    end
     
     if @application.save
       flash[:notice] = I18n.t(:notice, scope: [:doorkeeper, :flash, :applications, :create])

app/controllers/projects/commit_controller.rb

@@ -12,6 +12,7 @@ class Projects::CommitController < Projects::ApplicationController
 
     @line_notes = @project.notes.for_commit_id(commit.id).inline
     @branches = @project.repository.branch_names_contains(commit.id)
+    @tags = @project.repository.tag_names_contains(commit.id)
     @diffs = @commit.diffs
     @note = @project.build_commit_note(commit)
     @notes_count = @project.notes.for_commit_id(commit.id).count

app/controllers/projects/merge_requests_controller.rb

@@ -233,13 +233,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController
   end
 
   def allowed_to_push_code?(project, branch)
-    action = if project.protected_branch?(branch)
-               :push_code_to_protected_branches
-             else
-               :push_code
-             end
-
-    can?(current_user, action, project)
+    ::Gitlab::GitAccess.can_push_to_branch?(current_user, project, branch)
   end
 
   def merge_request_params

app/controllers/registrations_controller.rb

@@ -15,11 +15,11 @@ class RegistrationsController < Devise::RegistrationsController
     super
   end
 
-  def after_sign_up_path_for(resource)
+  def after_sign_up_path_for(_resource)
     new_user_session_path
   end
 
-  def after_inactive_sign_up_path_for(resource)
+  def after_inactive_sign_up_path_for(_resource)
     new_user_session_path
   end
 

app/helpers/application_helper.rb

@@ -5,8 +5,9 @@ module ApplicationHelper
   COLOR_SCHEMES = {
     1 => 'white',
     2 => 'dark',
-    3 => 'solarized-dark',
-    4 => 'monokai',
+    3 => 'solarized-light',
+    4 => 'solarized-dark',
+    5 => 'monokai',
   }
   COLOR_SCHEMES.default = 'white'
 
@@ -189,20 +190,6 @@ module ApplicationHelper
     BroadcastMessage.current
   end
 
-  def highlight_js(&block)
-    string = capture(&block)
-
-    content_tag :div, class: "highlighted-data #{user_color_scheme_class}" do
-      content_tag :div, class: 'highlight' do
-        content_tag :pre do
-          content_tag :code do
-            string.html_safe
-          end
-        end
-      end
-    end
-  end
-
   def time_ago_with_tooltip(date, placement = 'top', html_class = 'time_ago')
     capture_haml do
       haml_tag :time, date.to_s,
@@ -305,9 +292,4 @@ module ApplicationHelper
       profile_key_path(key)
     end
   end
-
-  def redirect_from_root?
-    request.env['rack.session']['user_return_to'] ==
-      '/'
-  end
 end

app/helpers/blob_helper.rb

 module BlobHelper
-  def highlightjs_class(blob_name)
-    if no_highlight_files.include?(blob_name.downcase)
-      'no-highlight'
-    else
-      blob_name.downcase
+  def highlight(blob_name, blob_content, nowrap = false)
+    formatter = Rugments::Formatters::HTML.new(
+      nowrap: nowrap,
+      cssclass: 'code highlight',
+      lineanchors: true,
+      lineanchorsid: 'LC'
+    )
+
+    begin
+      lexer = Rugments::Lexer.guess(filename: blob_name, source: blob_content)
+    rescue Rugments::Lexer::AmbiguousGuess
+      lexer = Rugments::Lexers::PlainText
     end
+
+    formatter.format(lexer.lex(blob_content)).html_safe
   end
 
   def no_highlight_files

app/helpers/branches_helper.rb

@@ -11,13 +11,8 @@ module BranchesHelper
 
   def can_push_branch?(project, branch_name)
     return false unless project.repository.branch_names.include?(branch_name)
-    action = if project.protected_branch?(branch_name)
-               :push_code_to_protected_branches
-             else
-               :push_code
-             end
     
-    current_user.can?(action, project)
+    ::Gitlab::GitAccess.can_push_to_branch?(current_user, project, branch_name)
   end
 
   def can_rebase?(project, branch_name)

app/helpers/commits_helper.rb

@@ -65,6 +65,12 @@ module CommitsHelper
     branches.sort.map { |branch| link_to(branch, project_tree_path(project, branch)) }.join(", ").html_safe
   end
 
+  # Returns the sorted links to tags, separated by a comma
+  def commit_tags_links(project, tags)
+    sorted = VersionSorter.rsort(tags)
+    sorted.map { |tag| link_to(tag, project_commits_path(project, project.repository.find_tag(tag).name)) }.join(", ").html_safe
+  end
+
   def link_to_browse_code(project, commit)
     if current_controller?(:projects, :commits)
       if @repo.blob_at(commit.id, @path)

app/helpers/diff_helper.rb

@@ -135,4 +135,19 @@ module DiffHelper
       'Side-by-side'
     end
   end
+
+  def submodule_link(blob, ref)
+    tree, commit = submodule_links(blob, ref)
+    commit_id = if commit.nil?
+                  blob.id[0..10]
+                else
+                  link_to "#{blob.id[0..10]}", commit
+                end
+
+    [
+      content_tag(:span, link_to(truncate(blob.name, length: 40), tree)),
+      '@',
+      content_tag(:span, commit_id, class: 'monospace'),
+    ].join(' ').html_safe
+  end
 end

app/helpers/emails_helper.rb

@@ -29,4 +29,14 @@ module EmailsHelper
       end
     end
   end
+
+  def add_email_highlight_css
+    Rugments::Themes::Github.render(:scope => '.highlight')
+  end
+
+  def color_email_diff(diffcontent)
+    formatter = Rugments::Formatters::HTML.new(cssclass: 'highlight')
+    lexer = Rugments::Lexers::Diff.new
+    raw formatter.format(lexer.lex(diffcontent))
+  end
 end

app/helpers/issues_helper.rb

@@ -67,8 +67,10 @@ module IssuesHelper
     ts = "#{time_ago_with_tooltip(issue.created_at, 'bottom', 'note_created_ago')}"
     if issue.updated_at != issue.created_at
       ts << capture_haml do
-        haml_tag :small do
-          haml_concat " (Edited #{time_ago_with_tooltip(issue.updated_at, 'bottom', 'issue_edited_ago')})"
+        haml_tag :span do
+          haml_concat '&middot;'
+          haml_concat '<i class="fa fa-edit" title="edited"></i> '
+          haml_concat time_ago_with_tooltip(issue.updated_at, 'bottom', 'issue_edited_ago')
         end
       end
     end

app/helpers/notes_helper.rb

@@ -20,8 +20,10 @@ module NotesHelper
     ts = "#{time_ago_with_tooltip(note.created_at, 'bottom', 'note_created_ago')}"
     if note.updated_at != note.created_at
       ts << capture_haml do
-        haml_tag :small do
-          haml_concat " (Edited #{time_ago_with_tooltip(note.updated_at, 'bottom', 'note_edited_ago')})"
+        haml_tag :span do
+          haml_concat '&middot;'
+          haml_concat '<i class="fa fa-edit" title="edited"></i> '
+          haml_concat time_ago_with_tooltip(note.updated_at, 'bottom', 'note_edited_ago')
         end
       end
     end

app/helpers/projects_helper.rb

@@ -234,8 +234,10 @@ module ProjectsHelper
 
   def hidden_pass_url(original_url)
     result = URI(original_url)
-    result.password = '*****' if result.password.present?
+    result.password = '*****' unless result.password.nil?
     result
+  rescue
+    original_url
   end
 
   def project_wiki_path_with_version(proj, page, version, is_newest)

app/helpers/submodule_helper.rb

@@ -2,8 +2,8 @@ module SubmoduleHelper
   include Gitlab::ShellAdapter
 
   # links to files listing for submodule if submodule is a project on this server
-  def submodule_links(submodule_item)
-    url = @repository.submodule_url_for(@ref, submodule_item.path)
+  def submodule_links(submodule_item, ref = nil)
+    url = @repository.submodule_url_for(ref, submodule_item.path)
 
     return url, nil unless url =~ /([^\/:]+\/[^\/]+\.git)\Z/
 

app/helpers/tree_helper.rb

@@ -58,11 +58,7 @@ module TreeHelper
     ref ||= @ref
     return false unless project.repository.branch_names.include?(ref)
 
-    if project.protected_branch? ref
-      can?(current_user, :push_code_to_protected_branches, project)
-    else
-      can?(current_user, :push_code, project)
-    end
+    ::Gitlab::GitAccess.can_push_to_branch?(current_user, project, ref)
   end
 
   def edit_blob_link(project, ref, path, options = {})
@@ -108,7 +104,7 @@ module TreeHelper
     end
   end
 
-  def up_dir_path(tree)
+  def up_dir_path
     file = File.join(@path, "..")
     tree_join(@ref, file)
   end

app/models/application_setting.rb

 class ApplicationSetting < ActiveRecord::Base
+  validates :home_page_url, allow_blank: true,
+    format: { with: URI::regexp(%w(http https)), message: "should be a valid url" },
+    if: :home_page_url_column_exist
+
   def self.current
     ApplicationSetting.last
   end
@@ -12,4 +16,8 @@ class ApplicationSetting < ActiveRecord::Base
       sign_in_text: Settings.extra['sign_in_text'],
     )
   end
+
+  def home_page_url_column_exist
+    ActiveRecord::Base.connection.column_exists?(:application_settings, :home_page_url)
+  end
 end

app/models/commit.rb

@@ -75,11 +75,11 @@ class Commit
 
     return no_commit_message if title.blank?
 
-    title_end = title.index(/\n/)
+    title_end = title.index("\n")
     if (!title_end && title.length > 100) || (title_end && title_end > 100)
       title[0..79] << "&hellip;".html_safe
     else
-      title.split(/\n/, 2).first
+      title.split("\n", 2).first
     end
   end
 
@@ -87,11 +87,11 @@ class Commit
   #
   # cut off, ellipses (`&hellp;`) are prepended to the commit message.
   def description
-    title_end = safe_message.index(/\n/)
+    title_end = safe_message.index("\n")
     @description ||= if (!title_end && safe_message.length > 100) || (title_end && title_end > 100)
                     "&hellip;".html_safe << safe_message[80..-1]
                   else
-                    safe_message.split(/\n/, 2)[1].try(:chomp)
+                    safe_message.split("\n", 2)[1].try(:chomp)
                   end
   end
 

app/models/key.rb

@@ -91,7 +91,7 @@ class Key < ActiveRecord::Base
     end
 
     if cmd_status.zero?
-      cmd_output.gsub /([\d\h]{2}:)+[\d\h]{2}/ do |match|
+      cmd_output.gsub /(\h{2}:)+\h{2}/ do |match|
         self.fingerprint = match
       end
     end

app/models/project.rb

@@ -190,7 +190,12 @@ class Project < ActiveRecord::Base
     end
 
     def search(query)
-      joins(:namespace).where("projects.archived = ?", false).where("projects.name LIKE :query OR projects.path LIKE :query OR namespaces.name LIKE :query OR projects.description LIKE :query", query: "%#{query}%")
+      joins(:namespace).where("projects.archived = ?", false).
+        where("LOWER(projects.name) LIKE :query OR
+              LOWER(projects.path) LIKE :query OR
+              LOWER(namespaces.name) LIKE :query OR
+              LOWER(projects.description) LIKE :query",
+              query: "%#{query.try(:downcase)}%")
     end
 
     def search_by_title(query)

app/models/project_services/campfire_service.rb

@@ -60,9 +60,9 @@ class CampfireService < Service
     message << "[#{project.name_with_namespace}] "
     message << "#{push[:user_name]} "
 
-    if before =~ /000000/
+    if before.include?('000000')
       message << "pushed new branch #{ref} \n"
-    elsif after =~ /000000/
+    elsif after.include?('000000')
       message << "removed branch #{ref} \n"
     else
       message << "pushed #{push[:total_commits_count]} commits to #{ref}. "

app/models/project_services/hipchat_service.rb

@@ -32,8 +32,8 @@ class HipchatService < Service
 
   def fields
     [
-      { type: 'text', name: 'token',     placeholder: '' },
-      { type: 'text', name: 'room',      placeholder: '' },
+      { type: 'text', name: 'token',     placeholder: 'Room token' },
+      { type: 'text', name: 'room',      placeholder: 'Room name or ID' },
       { type: 'text', name: 'server',
         placeholder: 'Leave blank for default. https://hipchat.example.com' }
     ]
@@ -58,12 +58,12 @@ class HipchatService < Service
 
     message = ""
     message << "#{push[:user_name]} "
-    if before =~ /000000/
+    if before.include?('000000')
       message << "pushed new branch <a href=\""\
                  "#{project.web_url}/commits/#{URI.escape(ref)}\">#{ref}</a>"\
                  " to <a href=\"#{project.web_url}\">"\
                  "#{project.name_with_namespace.gsub!(/\s/, "")}</a>\n"
-    elsif after =~ /000000/
+    elsif after.include?('000000')
       message << "removed branch #{ref} from <a href=\"#{project.web_url}\">#{project.name_with_namespace.gsub!(/\s/,'')}</a> \n"
     else
       message << "pushed to branch <a href=\""\

app/models/project_services/pushover_service.rb

@@ -80,9 +80,9 @@ class PushoverService < Service
     before = push_data[:before]
     after = push_data[:after]
 
-    if before =~ /000000/
+    if before.include?('000000')
       message = "#{push_data[:user_name]} pushed new branch \"#{ref}\"."
-    elsif after =~ /000000/
+    elsif after.include?('000000')
       message = "#{push_data[:user_name]} deleted branch \"#{ref}\"."
     else
       message = "#{push_data[:user_name]} push to branch \"#{ref}\"."

app/models/project_services/slack_message.rb

@@ -77,11 +77,11 @@ class SlackMessage
   end
 
   def new_branch?
-    before =~ /000000/
+    before.include?('000000')
   end
 
   def removed_branch?
-    after =~ /000000/
+    after.include?('000000')
   end
 
   def branch_url

app/models/repository.rb

@@ -312,4 +312,21 @@ class Repository
       []
     end
   end
+
+  def tag_names_contains(sha)
+    args = %W(git tag --contains #{sha})
+    names = Gitlab::Popen.popen(args, path_to_repo).first
+
+    if names.respond_to?(:split)
+      names = names.split("\n").map(&:strip)
+
+      names.each do |name|
+        name.slice! '* '
+      end
+
+      names
+    else
+      []
+    end
+  end
 end

app/models/user.rb

@@ -495,7 +495,7 @@ class User < ActiveRecord::Base
   end
 
   def temp_oauth_email?
-    email =~ /\Atemp-email-for-oauth/
+    email.start_with?('temp-email-for-oauth')
   end
 
   def public_profile?
@@ -504,7 +504,7 @@ class User < ActiveRecord::Base
 
   def avatar_url(size = nil)
     if avatar.present?
-      [gitlab_config.url, avatar.url].join("/")
+      [gitlab_config.url, avatar.url].join
     else
       GravatarService.new.execute(email, size)
     end

app/services/files/create_service.rb

@@ -3,11 +3,7 @@ require_relative "base_service"
 module Files
   class CreateService < BaseService
     def execute
-      allowed = if project.protected_branch?(ref)
-                  can?(current_user, :push_code_to_protected_branches, project)
-                else
-                  can?(current_user, :push_code, project)
-                end
+      allowed = Gitlab::GitAccess.can_push_to_branch?(current_user, project, ref)
 
       unless allowed
         return error("You are not allowed to create file in this branch")

app/services/files/delete_service.rb

@@ -3,11 +3,7 @@ require_relative "base_service"
 module Files
   class DeleteService < BaseService
     def execute
-      allowed = if project.protected_branch?(ref)
-                  can?(current_user, :push_code_to_protected_branches, project)
-                else
-                  can?(current_user, :push_code, project)
-                end
+      allowed = ::Gitlab::GitAccess.can_push_to_branch?(current_user, project, ref)
 
       unless allowed
         return error("You are not allowed to push into this branch")

app/services/files/update_service.rb

@@ -3,11 +3,7 @@ require_relative "base_service"
 module Files
   class UpdateService < BaseService
     def execute
-      allowed = if project.protected_branch?(ref)
-                  can?(current_user, :push_code_to_protected_branches, project)
-                else
-                  can?(current_user, :push_code, project)
-                end
+      allowed = ::Gitlab::GitAccess.can_push_to_branch?(current_user, project, ref)
 
       unless allowed
         return error("You are not allowed to push into this branch")

app/services/git_push_service.rb

@@ -115,23 +115,23 @@ class GitPushService
     ref_parts = ref.split('/')
 
     # Return if this is not a push to a branch (e.g. new commits)
-    ref_parts[1] =~ /heads/ && oldrev != Gitlab::Git::BLANK_SHA
+    ref_parts[1].include?('heads') && oldrev != Gitlab::Git::BLANK_SHA
   end
 
   def push_to_new_branch?(ref, oldrev)
     ref_parts = ref.split('/')
 
-    ref_parts[1] =~ /heads/ && oldrev == Gitlab::Git::BLANK_SHA
+    ref_parts[1].include?('heads') && oldrev == Gitlab::Git::BLANK_SHA
   end
 
   def push_remove_branch?(ref, newrev)
     ref_parts = ref.split('/')
 
-    ref_parts[1] =~ /heads/ && newrev == Gitlab::Git::BLANK_SHA
+    ref_parts[1].include?('heads') && newrev == Gitlab::Git::BLANK_SHA
   end
 
   def push_to_branch?(ref)
-    ref =~ /refs\/heads/
+    ref.include?('refs/heads')
   end
 
   def is_default_branch?(ref)

app/services/merge_requests/base_service.rb

@@ -5,9 +5,12 @@ module MergeRequests
       Note.create_status_change_note(merge_request, merge_request.target_project, current_user, merge_request.state, nil)
     end
 
-    def execute_hooks(merge_request)
+    def execute_hooks(merge_request, action = 'open')
       if merge_request.project
         hook_data = merge_request.to_hook_data(current_user)
+        merge_request_url = Gitlab::UrlBuilder.new(:merge_request).build(merge_request.id)
+        hook_data[:object_attributes][:url] = merge_request_url
+        hook_data[:object_attributes][:action] = action
         merge_request.project.execute_hooks(hook_data, :merge_request_hooks)
       end
     end

app/services/merge_requests/close_service.rb

@@ -9,7 +9,7 @@ module MergeRequests
         event_service.close_mr(merge_request, current_user)
         notification_service.close_mr(merge_request, current_user)
         create_note(merge_request)
-        execute_hooks(merge_request)
+        execute_hooks(merge_request, 'close')
       end
 
       merge_request

app/services/merge_requests/merge_service.rb

@@ -12,7 +12,7 @@ module MergeRequests
       notification_service.merge_mr(merge_request, current_user)
       create_merge_event(merge_request, current_user)
       create_note(merge_request)
-      execute_hooks(merge_request)
+      execute_hooks(merge_request, 'merge')
 
       true
     rescue

app/services/merge_requests/reopen_service.rb

@@ -5,7 +5,7 @@ module MergeRequests
         event_service.reopen_mr(merge_request, current_user)
         notification_service.reopen_mr(merge_request, current_user)
         create_note(merge_request)
-        execute_hooks(merge_request)
+        execute_hooks(merge_request, 'reopen')
         merge_request.reload_code
         merge_request.mark_as_unchecked
       end

app/services/merge_requests/update_service.rb

@@ -38,7 +38,7 @@ module MergeRequests
         end
 
         merge_request.notice_added_references(merge_request.project, current_user)
-        execute_hooks(merge_request)
+        execute_hooks(merge_request, 'update')
       end
 
       merge_request

app/services/notification_service.rb

@@ -118,7 +118,7 @@ class NotificationService
     return true unless note.noteable_type.present?
 
     # ignore gitlab service messages
-    return true if note.note =~ /\A_Status changed to closed_/
+    return true if note.note.start_with?('_Status changed to closed_')
     return true if note.cross_reference? && note.system == true
 
     opts = { noteable_type: note.noteable_type, project_id: note.project_id }

app/views/admin/application_settings/_form.html.haml

@@ -25,6 +25,11 @@
       = f.label :default_projects_limit, class: 'control-label'
       .col-sm-10
         = f.number_field :default_projects_limit, class: 'form-control'
+    .form-group
+      = f.label :home_page_url, class: 'control-label'
+      .col-sm-10
+        = f.text_field :home_page_url, class: 'form-control', placeholder: 'http://company.example.com'
+        %span.help-block We will redirect non-logged in users to this page
     .form-group
       = f.label :sign_in_text, class: 'control-label'
       .col-sm-10

app/views/admin/applications/_delete_form.html.haml

+- submit_btn_css ||= 'btn btn-link btn-remove btn-small'
+= form_tag admin_application_path(application) do
+  %input{:name => "_method", :type => "hidden", :value => "delete"}/
+  = submit_tag 'Destroy', onclick: "return confirm('Are you sure?')", class: submit_btn_css
\ No newline at end of file

app/views/admin/applications/_form.html.haml

+= form_for [:admin, @application], url: @url, html: {class: 'form-horizontal', role: 'form'} do |f|
+  - if application.errors.any?
+    .alert.alert-danger{"data-alert" => ""}
+      %p Whoops! Check your form for possible errors
+  = content_tag :div, class: "form-group#{' has-error' if application.errors[:name].present?}" do
+    = f.label :name, class: 'col-sm-2 control-label'
+    .col-sm-10
+      = f.text_field :name, class: 'form-control'
+      = doorkeeper_errors_for application, :name
+  = content_tag :div, class: "form-group#{' has-error' if application.errors[:redirect_uri].present?}" do
+    = f.label :redirect_uri, class: 'col-sm-2 control-label'
+    .col-sm-10
+      = f.text_area :redirect_uri, class: 'form-control'
+      = doorkeeper_errors_for application, :redirect_uri
+      %span.help-block
+        Use one line per URI
+      - if Doorkeeper.configuration.native_redirect_uri
+        %span.help-block
+          Use
+          %code= Doorkeeper.configuration.native_redirect_uri
+          for local tests
+  .form-actions
+    = f.submit 'Submit', class: "btn btn-primary wide"
+    = link_to "Cancel", admin_applications_path, class: "btn btn-default"

app/views/admin/applications/edit.html.haml

+%h3.page-title Edit application
+- @url = admin_application_path(@application)
+= render 'form', application: @application
\ No newline at end of file

app/views/admin/applications/index.html.haml

+%h3.page-title
+  System OAuth applications
+%p.light
+  System OAuth application does not belong to certain user and can be managed only by admins
+%hr
+%p= link_to 'New Application', new_admin_application_path, class: 'btn btn-success'
+%table.table.table-striped
+  %thead
+    %tr
+      %th Name
+      %th Callback URL
+      %th Clients
+      %th
+      %th
+  %tbody.oauth-applications
+    - @applications.each do |application|
+      %tr{:id => "application_#{application.id}"}
+        %td= link_to application.name, admin_application_path(application)
+        %td= application.redirect_uri
+        %td= application.access_tokens.count
+        %td= link_to 'Edit', edit_admin_application_path(application), class: 'btn btn-link'
+        %td= render 'delete_form', application: application

app/views/admin/applications/new.html.haml

+%h3.page-title New application
+- @url = admin_applications_path
+= render 'form', application: @application
\ No newline at end of file

app/views/admin/applications/show.html.haml

+%h3.page-title
+  Application: #{@application.name}
+
+
+%table.table
+  %tr
+    %td
+      Application Id
+    %td
+      %code#application_id= @application.uid
+  %tr
+    %td
+      Secret:
+    %td
+      %code#secret= @application.secret
+
+  %tr
+    %td
+      Callback url
+    %td
+      - @application.redirect_uri.split.each do |uri|
+        %div
+          %span.monospace= uri
+.form-actions
+  = link_to 'Edit', edit_admin_application_path(@application), class: 'btn btn-primary wide pull-left'
+  = render 'delete_form', application: @application, submit_btn_css: 'btn btn-danger prepend-left-10'

app/views/admin/dashboard/index.html.haml

-%h3.page-title
-  Admin area
-%p.light
-  You can manage projects, users and other GitLab data from here.
-%hr
 .admin-dashboard
-  .row
-    .col-sm-4
-      .light-well
-        %h4 Projects
-        .data
-          = link_to admin_projects_path do
-            %h1= Project.count
-          %hr
-          = link_to 'New Project', new_project_path, class: "btn btn-new"
-    .col-sm-4
-      .light-well
-        %h4 Users
-        .data
-          = link_to admin_users_path do
-            %h1= User.count
-          %hr
-          = link_to 'New User', new_admin_user_path, class: "btn btn-new"
-    .col-sm-4
-      .light-well
-        %h4 Groups
-        .data
-          = link_to admin_groups_path do
-            %h1= Group.count
-          %hr
-          = link_to 'New Group', new_admin_group_path, class: "btn btn-new"
-
-  .row.prepend-top-10
-    .col-md-4
-      %h4 Latest projects
-      %hr
-      - @projects.each do |project|
-        %p
-          = link_to project.name_with_namespace, [:admin, project], class: 'str-truncated'
-          %span.light.pull-right
-            #{time_ago_with_tooltip(project.created_at)}
-
-    .col-md-4
-      %h4 Latest users
-      %hr
-      - @users.each do |user|
-        %p
-          = link_to [:admin, user], class: 'str-truncated' do
-            = user.name
-          %span.light.pull-right
-            #{time_ago_with_tooltip(user.created_at)}
-
-    .col-md-4
-      %h4 Latest groups
-      %hr
-      - @groups.each do |group|
-        %p
-          = link_to [:admin, group], class: 'str-truncated' do
-            = group.name
-          %span.light.pull-right
-            #{time_ago_with_tooltip(group.created_at)}
-
-  %br
   .row
     .col-md-4
-      %h4 Stats
+      %h4 Statistics
       %hr
       %p
         Forks
@@ -141,3 +79,59 @@
         Rails
         %span.pull-right
           #{Rails::VERSION::STRING}
+  %hr
+  .row
+    .col-sm-4
+      .light-well
+        %h4 Projects
+        .data
+          = link_to admin_projects_path do
+            %h1= Project.count
+          %hr
+          = link_to 'New Project', new_project_path, class: "btn btn-new"
+    .col-sm-4
+      .light-well
+        %h4 Users
+        .data
+          = link_to admin_users_path do
+            %h1= User.count
+          %hr
+          = link_to 'New User', new_admin_user_path, class: "btn btn-new"
+    .col-sm-4
+      .light-well
+        %h4 Groups
+        .data
+          = link_to admin_groups_path do
+            %h1= Group.count
+          %hr
+          = link_to 'New Group', new_admin_group_path, class: "btn btn-new"
+
+  .row.prepend-top-10
+    .col-md-4
+      %h4 Latest projects
+      %hr
+      - @projects.each do |project|
+        %p
+          = link_to project.name_with_namespace, [:admin, project], class: 'str-truncated'
+          %span.light.pull-right
+            #{time_ago_with_tooltip(project.created_at)}
+
+    .col-md-4
+      %h4 Latest users
+      %hr
+      - @users.each do |user|
+        %p
+          = link_to [:admin, user], class: 'str-truncated' do
+            = user.name
+          %span.light.pull-right
+            #{time_ago_with_tooltip(user.created_at)}
+
+    .col-md-4
+      %h4 Latest groups
+      %hr
+      - @groups.each do |group|
+        %p
+          = link_to [:admin, group], class: 'str-truncated' do
+            = group.name
+          %span.light.pull-right
+            #{time_ago_with_tooltip(group.created_at)}

app/views/devise/passwords/edit.html.haml

@@ -6,8 +6,8 @@
       .devise-errors
         = devise_error_messages!
       = f.hidden_field :reset_password_token
-      .form-group#password-strength
-        = f.password_field :password, class: "form-control top", id: "user_password_recover", placeholder: "New password", required: true
+      %div
+        = f.password_field :password, class: "form-control top", placeholder: "New password", required: true
       %div
         = f.password_field :password_confirmation, class: "form-control bottom", placeholder: "Confirm new password", required: true
       .clearfix.append-bottom-10

app/views/devise/registrations/new.html.haml

@@ -11,8 +11,8 @@
         = f.text_field :username, class: "form-control middle", placeholder: "Username", required: true
       %div
         = f.email_field :email, class: "form-control middle", placeholder: "Email", required: true
-      .form-group#password-strength
-        = f.password_field :password, class: "form-control middle", id: "user_password_sign_up", placeholder: "Password", required: true
+      %div
+        = f.password_field :password, class: "form-control middle", placeholder: "Password", required: true
       %div
         = f.password_field :password_confirmation, class: "form-control bottom", placeholder: "Confirm password", required: true
       %div

app/views/github_imports/create.js.haml

@@ -12,5 +12,7 @@
     target_field.find('input').prop("value", origin_namespace)
 - else
   :plain
-    $("table.import-jobs tbody").prepend($("tr#repo_#{@repo_id}"))
-    $("tr#repo_#{@repo_id}").addClass("active").find(".import-actions").html("<i class='fa fa-spinner fa-spin'></i> started")
+    job = $("tr#repo_#{@repo_id}")
+    job.attr("id", "project_#{@project.id}")
+    $("table.import-jobs tbody").prepend(job)
+    job.addClass("active").find(".import-actions").html("<i class='fa fa-spinner fa-spin'></i> started")

app/views/github_imports/status.html.haml

@@ -4,8 +4,6 @@
 
 %p.light
   Select projects you want to import.  
-  %span.pull-right
-    Reload to see the progress.
 
 %hr
 %table.table.import-jobs
@@ -16,11 +14,11 @@
       %th Status
   %tbody
     - @already_added_projects.each do |project|
-      %tr{id: "repo_#{project.id}", class: "#{project_status_css_class(project.import_status)}"}
+      %tr{id: "project_#{project.id}", class: "#{project_status_css_class(project.import_status)}"}
         %td= project.import_source
         %td
           %strong= link_to project.name_with_namespace, project
-        %td
+        %td.job-status
           - if project.import_status == 'finished'
             %span.cgreen
               %i.fa.fa-check
@@ -33,7 +31,7 @@
         %td= repo.full_name
         %td.import-target
           = repo.full_name
-        %td.import-actions
+        %td.import-actions.job-status
           = button_tag "Add", class: "btn btn-add-to-import"
 
 
@@ -46,3 +44,20 @@
       new_namespace = tr.find(".import-target input").prop("value")
       tr.find(".import-target").empty().append(new_namespace + "/" + tr.find(".import-target").data("project_name"))
     $.post "#{github_import_url}", {repo_id: id, new_namespace: new_namespace}, dataType: 'script'
+  
+
+  setInterval (->
+    $.get "#{jobs_github_import_path}", (data)->
+      $.each data, (i, job) ->
+        job_item = $("#project_" + job.id)
+        status_field = job_item.find(".job-status")
+        
+        if job.import_status == 'finished'
+          job_item.removeClass("active").addClass("success")
+          status_field.html('<span class="cgreen"><i class="fa fa-check"></i> done</span>')
+        else if job.import_status == 'started'
+          status_field.html("<i class='fa fa-spinner fa-spin'></i> started")
+        else
+          status_field.html(job.import_status)
+        
+  ), 4000

app/views/help/show.html.haml

 .documentation.wiki
-  = markdown File.read(Rails.root.join('doc', @category, @file + '.md'))
+  = markdown File.read(Rails.root.join('doc', @category, @file + '.md')).gsub("$your_email", current_user.email)

app/views/layouts/_broadcast.html.haml

@@ -2,7 +2,3 @@
   .broadcast-message{ style: broadcast_styling(broadcast_message) }
     %i.fa.fa-bullhorn
     = broadcast_message.message
-  :css
-    .sidebar-wrapper .nav-sidebar {
-      margin-top: 58px;
-    }

app/views/layouts/_head.html.haml

@@ -19,6 +19,7 @@
   = csrf_meta_tags
   = include_gon
   %meta{name: 'viewport', content: 'width=device-width, initial-scale=1.0'}
+  %meta{name: 'theme-color', content: '#474D57'}
 
   = render 'layouts/google_analytics' if extra_config.has_key?('google_analytics_id')
   = render 'layouts/piwik' if extra_config.has_key?('piwik_url') && extra_config.has_key?('piwik_site_id')