Merge branch 'ee-7-4' into 'master'

Recent 7.4 code from CE into EE

Fixes #187

See merge request !190

CHANGELOG

+v 7.4.0
+  - Refactored membership logic
+  - Improve error reporting on users API (Julien Bianchi)
+  - Refactor test coverage tools usage. Use SIMPLECOV=true to generate it locally
+  - Default branch is protected by default
+  - Increase unicorn timeout to 60 seconds
+  - Sort search autocomplete projects by stars count so most popular go first
+  - Add README to tab on project show page
+  - Do not delete tmp/repositories itself during clean-up, only its contents
+  - Support for backup uploads to remote storage
+  - Prevent notes polling when there are not notes
+  - API: Add support for forking a project via the API (Bernhard Kaindl)
+  - API: filter project issues by milestone (Julien Bianchi)
+  - Fail harder in the backup script
+
+v 7.3.2
+  - Fix creating new file via web editor
+  - Use gitlab-shell v2.0.1
+
+v 7.3.1
+  - Fix ref parsing in Gitlab::GitAccess
+  - Fix error 500 when viewing diff on a file with changed permissions
+  - Fix adding comments to MR when source branch is master
+  - Fix error 500 when searching description contains relative link
+
 v 7.3.0
   - Always set the 'origin' remote in satellite actions
   - Write authorized_keys in tmp/ during tests

CONTRIBUTING.md

@@ -61,7 +61,7 @@ If you can, please submit a merge request with the fix or improvements including
 1. Fork the project on GitLab Cloud
 1. Create a feature branch
 1. Write [tests](README.md#run-the-tests) and code
-1. Add your changes to the [CHANGELOG](CHANGELOG)
+1. Add your changes to the [CHANGELOG](CHANGELOG) insert your line at a [random point](doc/workflow/gitlab_flow.md#do-not-order-commits-with-rebase) in the current version
 1. If you are changing the README, some documentation or other things which have no effect on the tests, add `[ci skip]` somewhere in the commit message
 1. If you have multiple commits please combine them into one commit by [squashing them](http://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
 1. Push the commit to your fork

GITLAB_SHELL_VERSION

-2.0.0
+2.0.1

Gemfile

@@ -31,7 +31,7 @@ gem 'omniauth-shibboleth'
 # Extracting information from a git repository
 # Provide access to Gitlab::Git library
-gem "gitlab_git", '~> 6.0'
+gem "gitlab_git", '7.0.0.rc8'
 # Ruby/Rack Git Smart-HTTP Server Handler
 gem 'gitlab-grack', '~> 2.0.0.pre', require: 'grack'
@@ -71,8 +71,8 @@ gem "carrierwave"
 gem 'dropzonejs-rails'
 # for aws storage
-gem "fog", "~> 1.14", group: :aws
-gem "unf", group: :aws
+gem "fog", "~> 1.14"
+gem "unf"
 # Authorization
 gem "six"
@@ -80,6 +80,9 @@ gem "six"
 # Seed data
 gem "seed-fu"
+# Markup pipeline for GitLab
+gem 'html-pipeline-gitlab', '~> 0.1.0'
+
 # Markdown to HTML
 gem "github-markup"
@@ -158,7 +161,7 @@ gem "rack-attack"
 # Ace editor
 gem 'ace-rails-ap'
-# Keyboard shortcuts 
+# Keyboard shortcuts
 gem 'mousetrap-rails'
 # Semantic UI Sass for Sidebar

Gemfile.lock

@@ -106,7 +106,7 @@ GEM
       devise (~> 3.2)
     diff-lcs (1.2.5)
     diffy (3.0.3)
-    docile (1.1.1)
+    docile (1.1.5)
     dotenv (0.9.0)
     dropzonejs-rails (0.4.14)
       rails (> 3.1)
@@ -179,10 +179,9 @@ GEM
       mime-types (~> 1.19)
     gitlab_emoji (0.0.1.1)
       emoji (~> 1.0.1)
-    gitlab_git (6.2.1)
+    gitlab_git (7.0.0.rc8)
       activesupport (~> 4.0)
       charlock_holmes (~> 0.6)
-      gitlab-grit (~> 2.6)
       gitlab-linguist (~> 3.0)
       rugged (~> 0.21.0)
     gitlab_meta (7.0)
@@ -239,6 +238,12 @@ GEM
     hipchat (0.14.0)
       httparty
       httparty
+    html-pipeline (1.11.0)
+      activesupport (>= 2)
+      nokogiri (~> 1.4)
+    html-pipeline-gitlab (0.1.0)
+      gitlab_emoji (~> 0.0.1.1)
+      html-pipeline (~> 1.11.0)
     http_parser.rb (0.5.3)
     httparty (0.13.0)
       json (~> 1.8)
@@ -471,7 +476,7 @@ GEM
       redis (>= 3.0.4)
       redis-namespace (>= 1.3.1)
     simple_oauth (0.1.9)
-    simplecov (0.8.2)
+    simplecov (0.9.0)
       docile (~> 1.1.0)
       multi_json
       simplecov-html (~> 0.8.0)
@@ -617,7 +622,7 @@ DEPENDENCIES
   gitlab-grack (~> 2.0.0.pre)
   gitlab-linguist (~> 3.0.0)
   gitlab_emoji (~> 0.0.1.1)
-  gitlab_git (~> 6.0)
+  gitlab_git (= 7.0.0.rc8)
   gitlab_meta (= 7.0)
   gitlab_omniauth-ldap (= 1.1.0)
   gollum-lib (~> 3.0.0)
@@ -629,6 +634,7 @@ DEPENDENCIES
   guard-spinach
   haml-rails
   hipchat (~> 0.14.0)
+  html-pipeline-gitlab (~> 0.1.0)
   httparty
   jasmine (= 2.0.2)
   jquery-atwho-rails (~> 0.3.3)

README.md

@@ -23,7 +23,7 @@
 - [![Code Climate](https://codeclimate.com/github/gitlabhq/gitlabhq.svg)](https://codeclimate.com/github/gitlabhq/gitlabhq)
-- [![Coverage Status](https://coveralls.io/repos/gitlabhq/gitlabhq/badge.png?branch=master)](https://coveralls.io/r/gitlabhq/gitlabhq)
+- [![Coverage Status](https://coveralls.io/repos/gitlabhq/gitlabhq/badge.png?branch=master)](https://coveralls.io/r/gitlabhq/gitlabhq?branch=master)
 - [![PullReview stats](https://www.pullreview.com/gitlab/gitlab-org/gitlab-ce/badges/master.svg?)](https://www.pullreview.com/gitlab.gitlab.com/gitlab-org/gitlab-ce/reviews/master)
@@ -38,17 +38,6 @@ On [about.gitlab.com](https://about.gitlab.com/) you can find more information a
 - [GitLab Enterprise Edition](https://about.gitlab.com/gitlab-ee/) with additional features aimed at larger organizations.
 - [GitLab CI](https://about.gitlab.com/gitlab-ci/) a continuous integration (CI) server that is easy to integrate with GitLab.
-## Third-party applications
-
-Access GitLab from multiple platforms with applications below.
-These applications are maintained by contributors, GitLab B.V. does not offer support for them.
-
-- [iPhone app](http://gitlabcontrol.com/)
-- [Android app](https://play.google.com/store/apps/details?id=com.bd.gitlab&hl=en)
-- [Chrome app](https://chrome.google.com/webstore/detail/chrome-gitlab-notifier/eageapgbnjicdjjihgclpclilenjbobi)
-- [Command line client](https://github.com/drewblessing/gitlab-cli)
-- [Ruby API wrapper](https://github.com/NARKOZ/gitlab)
-
 ## Requirements
 - Ubuntu/Debian/CentOS/RHEL**
@@ -61,7 +50,19 @@ These applications are maintained by contributors, GitLab B.V. does not offer su
 ## Installation
-Please see [the installation page on the GitLab website](https://about.gitlab.com/installation/).
+Please see [the installation page on the GitLab website](https://about.gitlab.com/installation/) for the various options.
+Since a manual installation is a lot of work and error prone we strongly recommend fast and reliable Omnibus package installation (deb/rpm) on that page.
+
+## Third-party applications
+
+Access GitLab from multiple platforms with applications below.
+These applications are maintained by contributors, GitLab B.V. does not offer support for them.
+
+- [iPhone app](http://gitlabcontrol.com/)
+- [Android app](https://play.google.com/store/apps/details?id=com.bd.gitlab&hl=en)
+- [Chrome app](https://chrome.google.com/webstore/detail/chrome-gitlab-notifier/eageapgbnjicdjjihgclpclilenjbobi)
+- [Command line client](https://github.com/drewblessing/gitlab-cli)
+- [Ruby API wrapper](https://github.com/NARKOZ/gitlab)
 ### New versions

app/assets/javascripts/admin.js.coffee

@@ -46,10 +46,10 @@ class Admin
       modal.hide()
       $('.change-owner-link').show()
-    $('li.users_project').bind 'ajax:success', ->
+    $('li.project_member').bind 'ajax:success', ->
       Turbolinks.visit(location.href)
-    $('li.users_group').bind 'ajax:success', ->
+    $('li.group_member').bind 'ajax:success', ->
       Turbolinks.visit(location.href)
 @Admin = Admin

app/assets/javascripts/application.js.coffee

@@ -15,13 +15,14 @@
 #= require jquery.atwho
 #= require jquery.scrollTo
 #= require jquery.blockUI
-#= require turbolinks
 #= require jquery.turbolinks
+#= require turbolinks
 #= require bootstrap
 #= 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
@@ -149,7 +150,6 @@ $ ->
   if (flash = $(".flash-container")).length > 0
     flash.click -> $(@).fadeOut()
     flash.show()
-    setTimeout (-> flash.fadeOut()), 5000
   # Disable form buttons while a form is submitting
   $('body').on 'ajax:complete, ajax:beforeSend, submit', 'form', (e) ->

app/assets/javascripts/branch-graph.js.coffee

@@ -90,11 +90,15 @@ class @BranchGraph
   renderPartialGraph: ->
     start = Math.floor((@element.scrollTop() - @offsetY) / @unitTime) - 10
-    start = 0 if start < 0
+    if start < 0
+      isGraphEdge = true
+      start = 0
     end = start + 40
-    end = @commits.length if @commits.length < end
-    if @prev_start == -1 or Math.abs(@prev_start - start) > 10
+    if @commits.length < end
+      isGraphEdge = true
+      end = @commits.length
+    if @prev_start == -1 or Math.abs(@prev_start - start) > 10 or isGraphEdge
       i = start
       @prev_start = start

app/assets/javascripts/chart.js.coffee

-@Chart =
-  labels: []
-  values: []
-
-  init: (labels, values, title) ->
-    r = Raphael('activity-chart')
-
-    fin = ->
-      @flag = r.popup(@bar.x, @bar.y, @bar.value or "0").insertBefore(this)
-
-    fout = ->
-      @flag.animate
-        opacity: 0, 300, -> @remove()
-
-    r.text(160, 10, title).attr font: "13px sans-serif"
-    r.barchart(
-      10, 20, 560, 200,
-      [values],
-      {colors:["#456"]}
-    ).label(labels, true)
-      .hover(fin, fout)

app/assets/javascripts/flash.js.coffee

@@ -10,6 +10,5 @@ class Flash
     flash.click -> $(@).fadeOut()
     flash.show()
-    setTimeout (-> flash.fadeOut()), 5000
 @Flash = Flash

app/assets/javascripts/groups.js.coffee

 class GroupMembers
   constructor: ->
-    $('li.users_group').bind 'ajax:success', ->
+    $('li.group_member').bind 'ajax:success', ->
       $(this).fadeOut()
 @GroupMembers = GroupMembers

app/assets/javascripts/markdown_area.js.coffee

@@ -12,13 +12,13 @@ $(document).ready ->
   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>"  
-  
+  $("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").append divSpinner
   $(".div-dropzone-spinner").append iconSpinner
   $(".div-dropzone-spinner").css
     "opacity": 0
@@ -27,12 +27,12 @@ $(document).ready ->
   dropzone = $(".div-dropzone").dropzone(
     url: project_image_path_upload
     dictDefaultMessage: ""
-    clickable: false
+    clickable: true
     paramName: "markdown_img"
     maxFilesize: 10
     uploadMultiple: false
     acceptedFiles: "image/jpg,image/jpeg,image/gif,image/png"
-    headers: 
+    headers:
       "X-CSRF-Token": $("meta[name=\"csrf-token\"]").attr("content")
     previewContainer: false
@@ -91,7 +91,7 @@ $(document).ready ->
   handlePaste = (e) ->
     e.preventDefault()
     my_event = e.originalEvent
-    
+
     if my_event.clipboardData and my_event.clipboardData.items
       processItem(my_event)
@@ -115,7 +115,7 @@ $(document).ready ->
         return item
       i++
     return false
-  
+
   pasteText = (text) ->
     caretStart = $(child)[0].selectionStart
     caretEnd = $(child)[0].selectionEnd
@@ -126,12 +126,12 @@ $(document).ready ->
     $(child).val beforeSelection + text + afterSelection
     $(".markdown-area").trigger "input"
-  getFilename = (e) -> 
+  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()
@@ -154,7 +154,7 @@ $(document).ready ->
       success: (e, textStatus, response) ->
         insertToTextArea(filename, formatLink(response.responseJSON.link))
-      
+
       error: (response) ->
         showError(response.responseJSON.message)
@@ -190,7 +190,7 @@ $(document).ready ->
   $(".markdown-selector").click (e) ->
     e.preventDefault()
-    $(@).closest(".div-dropzone-wrapper").find(".div-dropzone").click()
+    $(@).closest('.gfm-form').find('.div-dropzone').click()
     return
   return

app/assets/javascripts/notes.js.coffee

@@ -6,6 +6,7 @@ class Notes
     @notes_url = gon.relative_url_root + @notes_url if gon.relative_url_root?
     @note_ids = note_ids
     @last_fetched_at = last_fetched_at
+    @noteable_url = document.URL
     @initRefresh()
     @setupMainTargetNoteForm()
     @cleanBinding()
@@ -95,7 +96,8 @@ class Notes
     , 15000
   refresh: ->
-    @getContent() unless document.hidden
+    unless document.hidden or (@noteable_url != document.URL)
+      @getContent()
   getContent: ->
     $.ajax

app/assets/javascripts/project.js.coffee

@@ -59,3 +59,12 @@ $ ->
     $(@).toggleClass('on').find('.count').html(data.star_count)
   .on 'ajax:error', (e, xhr, status, error) ->
     new Flash('Star toggle failed. Try again later.', 'alert')
+
+  $("a[data-toggle='tab']").on "shown.bs.tab", (e) ->
+      $.cookie "default_view", $(e.target).attr("href")
+
+    defaultView = $.cookie("default_view")
+    if defaultView
+      $("a[href=" + defaultView + "]").tab "show"
+    else
+      $("a[data-toggle='tab']:first").tab "show"

app/assets/javascripts/stat_graph_contributors.js.coffee

@@ -24,22 +24,7 @@ class window.ContributorsStatGraph
       class: 'graph-author-commits-count'
     })
     commits.text(author.commits + " commits")
-
-    additions = $('<span/>', {
-      class: 'graph-additions'
-    })
-    additions.text(author.additions + " ++")
-
-    deletions = $('<span/>', {
-      class: 'graph-deletions'
-    })
-    deletions.text(author.deletions + " --")
-
     $('<span/>').append(commits)
-      .append(" / ")
-      .append(additions)
-      .append(" / ")
-      .append(deletions)
   create_author_header: (author) ->
     list_item = $('<li/>', {

app/assets/javascripts/stat_graph_contributors_util.js.coffee

@@ -90,4 +90,4 @@ window.ContributorsStatGraphUtil =
       true
     else
       false
-  
+

app/assets/javascripts/zen_mode.js.coffee

@@ -32,6 +32,8 @@ 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
@@ -41,6 +43,8 @@ class @ZenMode
       @active_checkbox = null
       window.location.hash = ''
       window.scrollTo(window.pageXOffset, @scroll_position)
+      # Enable dropzone when leaving ZEN mode
+      Dropzone.forElement('.div-dropzone').enable()
   checkboxFromLocationHash: (e) ->
     id = $.trim(window.location.hash.replace('#' + ZenMode.fullscreen_prefix, ''))

app/assets/stylesheets/generic/files.scss

@@ -60,7 +60,6 @@
       .highlight {
         margin-bottom: 9px;
-        @include border-radius(4px);
         > pre {
           margin: 0;

app/assets/stylesheets/generic/flash.scss

 .flash-container {
-  display: none;
   cursor: pointer;
   margin: 0;
-  text-align: center;
-  color: #fff;
   font-size: 14px;
-  position: fixed;
-  bottom: 0;
   width: 100%;
-  opacity: 0.8;
   z-index: 100;
   .flash-notice {
-    background: #49C;
-    padding: 10px;
-    text-shadow: 0 1px 1px #178;
+    @extend .alert;
+    @extend .alert-info;
   }
   .flash-alert {
-    background: #C67;
-    text-shadow: 0 1px 1px #945;
-    padding: 10px;
+    @extend .alert;
+    @extend .alert-danger;
   }
 }