Merge branch 'upstream' into feature/update_to_6.9

* upstream: (92 commits)
  Change gravatar tests to identicon
  Enable identicon for gravatar by default
  Replace ok with circle for boolean icon
  Update gitlab_meta gem
  Dont install production gems for travis
  Small UI fix
  Use same size headers. Add PullReview. Mention shell guide as created by us.
  Show/hide issue assignee avatar depends on drag-n-drop column in milestone view
  Clean up the readme.
  Provide better email subject lines from email on push service
  Postgres requires not-null value for boolean field
  move all sidebars to one side for improved UX; add button in head of projects/issues and milestones instead of tab on side of screen to prevent overlapping of content
  Update gitlab-grit to newer version with normal diff collection. Show if file mode was changed
  Change mode for view files
  Fix dashboard "show more project" link padding
  Fix blob breadcrumb
  Fix help css
  Darker color for page title
  Remove failing test on travis+pg
  Improve network UI
  ...

Conflicts:
	Gemfile
	app/assets/javascripts/application.js.coffee
	app/assets/stylesheets/sections/commits.scss
	app/controllers/application_controller.rb
	app/controllers/projects/walls_controller.rb
	app/helpers/issues_helper.rb
	app/mailers/emails/groups.rb
	app/mailers/emails/issues.rb
	app/mailers/emails/merge_requests.rb
	app/mailers/emails/notes.rb
	app/mailers/emails/projects.rb
	app/mailers/notify.rb
	app/models/event.rb
	app/models/project.rb
	app/observers/base_observer.rb
	app/services/merge_requests/update_service.rb
	app/services/notification_service.rb
	app/services/projects/create_service.rb
	app/views/events/_commit.html.haml
	app/views/groups/show.html.haml
	app/views/projects/blob/_actions.html.haml
	app/views/projects/commits/_commits.html.haml
	app/views/snippets/_form.html.haml
	config/application.rb
	config/routes.rb
	db/schema.rb
	lib/api/helpers.rb
	lib/api/projects.rb
	lib/api/users.rb
	lib/gitlab/markdown.rb
	spec/helpers/application_helper_spec.rb
	spec/mailers/notify_spec.rb
	spec/requests/api/users_spec.rb
	spec/services/issues/close_service_spec.rb
	spec/services/issues/update_service_spec.rb
	spec/services/merge_requests/close_service_spec.rb
	spec/services/merge_requests/update_service_spec.rb

.pkgr.yml

@@ -17,3 +17,10 @@ targets:
       - libicu52
       - libpcre3
       - git
+  centos-6:
+    build_dependencies:
+      - libicu-devel
+    dependencies:
+      - libicu
+      - pcre
+      - git

.travis.yml

@@ -13,6 +13,8 @@ env:
     - TASK=jasmine:ci DB=postgresql
 before_install:
   - sudo apt-get install libicu-dev -y
+install: 
+  - "bundle install --deployment --without production"
 branches:
   only:
     - 'master'

CHANGELOG

@@ -26,6 +26,19 @@ v 7.0.0
   - UI improvements for mobile devices
   - Improve diff rendering performance
   - Drag-n-drop for issues and merge requests between states at milestone page 
+  - Fix '0 commits' message for huge repositories on project home page
+  - Prevent 500 error page when visit commit page from large repo
+  - Add notice about huge push over http to unicorn config
+  - File action in satellites uses default 30 seconds timeout instead of old 10 seconds one
+  - Overall performance improvements
+  - Skip init script check on omnibus-gitlab
+  - Be more selective when killing stray Sidekiqs
+  - Check LDAP user filter during sign-in
+  - Remove wall feature (no data loss - you can take it from database)
+  - Dont expose user emails via API unless you are admin 
+  - Detect issues closed by Merge Request description
+  - Better email subject lines from email on push service (Alex Elman)
+  - Enable identicon for gravatar be default
 
 v 6.9.2
   - Revert the commit that broke the LDAP user filter
@@ -790,4 +803,4 @@ v 0.8.0
   - stability
   - security fixes
   - increased test coverage
-  - email notification
+  - email notification

CONTRIBUTING.md

@@ -102,11 +102,15 @@ For examples of feedback on merge requests please look at already [closed merge
 
 ## Style guides
 
-1. [Ruby](https://github.com/bbatsov/ruby-style-guide)
-1. [Rails](https://github.com/bbatsov/rails-style-guide)
-1. [Formatting](https://github.com/thoughtbot/guides/tree/master/style#formatting)
-1. [Naming](https://github.com/thoughtbot/guides/tree/master/style#naming) 
-1. [Testing](https://github.com/thoughtbot/guides/tree/master/style#testing)
-1. [CoffeeScript](https://github.com/thoughtbot/guides/tree/master/style#coffeescript)
-1. [Shell commands](doc/development/shell_commands.md)
-1. [Markdown](http://www.cirosantilli.com/markdown-styleguide)
+1.  [Ruby](https://github.com/bbatsov/ruby-style-guide).
+    Important sections include [Source Code Layout](https://github.com/bbatsov/ruby-style-guide#source-code-layout)
+    and [Naming](https://github.com/bbatsov/ruby-style-guide#naming). Use:
+    - multi-line method chaining style **Option B**: dot `.` on previous line
+    - string literal quoting style **Option A**: single quoted by default
+1.  [Rails](https://github.com/bbatsov/rails-style-guide)
+1.  [Testing](https://github.com/thoughtbot/guides/tree/master/style#testing)
+1.  [CoffeeScript](https://github.com/thoughtbot/guides/tree/master/style#coffeescript)
+1.  [Shell commands](doc/development/shell_commands.md) created by GitLab contributors to enhance security
+1.  [Markdown](http://www.cirosantilli.com/markdown-styleguide)
+
+This is also the style used by linting tools such as [Rubocop](https://github.com/bbatsov/rubocop), PullReview[https://www.pullreview.com/] and [Hound CI](https://houndci.com).

Gemfile

@@ -14,6 +14,9 @@ gem "rails", "~> 4.1.0"
 gem "protected_attributes"
 gem 'rails-observers'
 
+# Make links from text
+gem 'rails_autolink', '~> 1.1'
+
 # Default values for AR models
 gem "default_value_for", "~> 3.0.0"
 
@@ -35,7 +38,7 @@ gem 'elasticsearch-git', github: 'zzet/elasticsearch-git', ref: 'fe04c5dc36cd725
 
 # Extracting information from a git repository
 # Provide access to Gitlab::Git library
-gem "gitlab_git", '~> 5.8'
+gem "gitlab_git", '~> 6.0'
 gem 'rugged', git: 'git://github.com/libgit2/rugged.git', branch: 'development', submodules: true
 
 # Ruby/Rack Git Smart-HTTP Server Handler
@@ -56,9 +59,6 @@ gem "grape", "~> 0.6.1"
 gem "grape-entity", "~> 0.4.2"
 gem 'rack-cors', require: 'rack/cors'
 
-# Email validation
-gem "email_validator", "~> 1.4.0", :require => 'email_validator/strict'
-
 # Format dates and times
 # based on human-friendly examples
 gem "stamp"
@@ -173,6 +173,9 @@ gem "rack-attack"
 # Ace editor
 gem 'ace-rails-ap'
 
+# Semantic UI Sass for Sidebar
+gem 'semantic-ui-sass', '~> 0.16.1.0'
+
 gem "sass-rails", '~> 4.0.2'
 gem "coffee-rails"
 gem "uglifier"
@@ -286,5 +289,5 @@ group :test do
 end
 
 group :production do
-  gem "gitlab_meta", '6.0'
+  gem "gitlab_meta", '7.0'
 end

Gemfile.lock

@@ -196,8 +196,6 @@ GEM
     email_spec (1.5.0)
       launchy (~> 2.1)
       mail (~> 2.2)
-    email_validator (1.4.0)
-      activemodel
     emoji (1.0.1)
       json
     enumerize (0.7.0)
@@ -263,7 +261,7 @@ GEM
       multi_json
     gitlab-grack (2.0.0.pre)
       rack (~> 1.5.1)
-    gitlab-grit (2.6.7)
+    gitlab-grit (2.6.9)
       charlock_holmes (~> 0.6)
       diff-lcs (~> 1.1)
       mime-types (~> 1.15)
@@ -274,13 +272,13 @@ GEM
       mime-types (~> 1.19)
     gitlab_emoji (0.0.1.1)
       emoji (~> 1.0.1)
-    gitlab_git (5.8.0)
+    gitlab_git (6.0.0)
       activesupport (~> 4.0)
       charlock_holmes (~> 0.6)
       gitlab-grit (~> 2.6)
       gitlab-linguist (~> 3.0)
       rugged (~> 0.19.0)
-    gitlab_meta (6.0)
+    gitlab_meta (7.0)
     gitlab_omniauth-ldap (1.0.4)
       net-ldap (~> 0.3.1)
       omniauth (~> 1.0)
@@ -482,6 +480,8 @@ GEM
       sprockets-rails (~> 2.0)
     rails-observers (0.1.2)
       activemodel (~> 4.0)
+    rails_autolink (1.1.6)
+      rails (> 3.1)
     rails_best_practices (1.14.4)
       activesupport
       awesome_print
@@ -570,6 +570,8 @@ GEM
       activesupport (>= 3.1, < 4.2)
     select2-rails (3.5.2)
       thor (~> 0.14)
+    semantic-ui-sass (0.16.1.0)
+      sass (~> 3.2)
     settingslogic (2.0.9)
     sexp_processor (4.4.0)
     shoulda-matchers (2.1.0)
@@ -727,7 +729,6 @@ DEPENDENCIES
   elasticsearch-model!
   elasticsearch-rails!
   email_spec
-  email_validator (~> 1.4.0)
   enumerize
   factory_girl_rails
   ffaker
@@ -740,8 +741,8 @@ DEPENDENCIES
   gitlab-grack (~> 2.0.0.pre)
   gitlab-linguist (~> 3.0.0)
   gitlab_emoji (~> 0.0.1.1)
-  gitlab_git (~> 5.8)
-  gitlab_meta (= 6.0)
+  gitlab_git (~> 6.0)
+  gitlab_meta (= 7.0)
   gitlab_omniauth-ldap (= 1.0.4)
   gollum-lib (~> 3.0.0)
   gon (~> 5.0.0)
@@ -785,6 +786,7 @@ DEPENDENCIES
   rack-mini-profiler
   rails (~> 4.1.0)
   rails-observers
+  rails_autolink (~> 1.1)
   rails_best_practices
   raphael-rails (~> 2.1.2)
   rb-fsevent
@@ -800,6 +802,7 @@ DEPENDENCIES
   sdoc
   seed-fu
   select2-rails
+  semantic-ui-sass (~> 0.16.1.0)
   settingslogic
   shoulda-matchers (~> 2.1.0)
   sidekiq (~> 3.0.1)

README.md

@@ -1,6 +1,6 @@
 # GitLab
 
-## Self hosted Git management software
+## Open source software to collaborate on code
 
 ![logo](https://gitlab.com/gitlab-org/gitlab-ce/raw/master/public/gitlab_logo.png)
 
@@ -10,8 +10,6 @@
 
 ![animated-screenshots](https://gist.github.com/fnkr/2f9badd56bfe0ed04ee7/raw/4f48806fbae97f556c2f78d8c2d299c04500cb0d/compiled.gif)
 
-## Open source software to collaborate on code
-
 - Manage Git repositories with fine grained access controls that keep your code secure
 - Perform code reviews and enhance collaboration with merge requests
 - Each project can also have an issue tracker and a wiki
@@ -33,15 +31,27 @@
 
 - [![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)
 
-### Resources
+## Website
+
+On [www.gitlab.com](https://www.gitlab.com/) you can find more information about:
 
-- [www.gitlab.com](https://www.gitlab.com/) includes information about [subscriptions](https://www.gitlab.com/subscription/), [consultancy](https://www.gitlab.com/consultancy/), the [community](https://www.gitlab.com/community/) and the [hosted GitLab.com](https://www.gitlab.com/gitlab-com/).
+- [Subscriptions](https://www.gitlab.com/subscription/)
+- [Consultancy](https://www.gitlab.com/consultancy/)
+- [Community](https://www.gitlab.com/community/)
+- [Hosted GitLab.com](https://www.gitlab.com/gitlab-com/) use GitLab as a free service
+- [GitLab Enterprise Edition](https://www.gitlab.com/gitlab-ee/) with additional features aimed at larger organizations.
+- [GitLab CI](https://www.gitlab.com/gitlab-ci/) a continuous integration (CI) server that is easy to integrate with GitLab.
 
-- [GitLab Enterprise Edition](https://www.gitlab.com/gitlab-ee/) offers additional features aimed at larger organizations.
+## Third-party applications
 
-- [GitLab CI](https://www.gitlab.com/gitlab-ci/) is a continuous integration (CI) server that is easy to integrate with GitLab.
+Access GitLab from multiple platforms with applications below.
+These applications are maintained by contributors, GitLab B.V. does not offer support for them.
 
-- Unofficial third-party [iPhone app](http://gitlabcontrol.com/), [Android app](https://play.google.com/store/apps/details?id=com.bd.gitlab&hl=en), [command line client](https://github.com/drewblessing/gitlab-cli), [Ruby API wrapper](https://github.com/NARKOZ/gitlab) and [Chrome app](https://chrome.google.com/webstore/detail/chrome-gitlab-notifier/eageapgbnjicdjjihgclpclilenjbobi) for GitLab.
+- [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
 
@@ -77,13 +87,13 @@ or by directly calling the script:
 
 Please login with `root` / `5iveL!fe`.
 
-### Install a development environment
+## Install a development environment
 
 We recommend setting up your development environment with [the cookbook](https://gitlab.com/gitlab-org/cookbook-gitlab/blob/master/README.md#installation). If you do not use the cookbook you might need to copy the example development unicorn configuration file
 
     cp config/unicorn.rb.example.development config/unicorn.rb
 
-### Run in development mode
+## Run in development mode
 
 Start it with [Foreman](https://github.com/ddollar/foreman)
 

app/assets/javascripts/application.js.coffee

@@ -35,6 +35,7 @@
 #= require nprogress-turbolinks
 #= require dropzone
 #= require private_pub
+#= require semantic-ui/sidebar
 #= require_directory ./api
 #= require_tree .
 

app/assets/javascripts/dispatcher.js.coffee

@@ -58,8 +58,6 @@ class Dispatcher
         new Events('Team')
       when 'projects:new', 'projects:edit'
         new Project()
-      when 'projects:walls:show'
-        new Wall(project_id)
       when 'projects:teams:members:index'
         new TeamMembers()
       when 'projects:team_members:index'

app/assets/javascripts/issues.js.coffee

@@ -38,7 +38,7 @@
 
   initChecks: ->
     $(".check_all_issues").click ->
-      $(".selected_issue").attr "checked", @checked
+      $(".selected_issue").prop("checked", @checked)
       Issues.checkChanged()
 
     $(".selected_issue").bind "change", Issues.checkChanged

app/assets/javascripts/milestone.js.coffee

@@ -6,11 +6,42 @@ class Milestone
       data: data
       success: (data) ->
         if data.saved == true
+          if data.assignee_avatar_url
+            img_tag = $('<img/>')
+            img_tag.attr('src', data.assignee_avatar_url)
+            img_tag.addClass('avatar s16')
+            $(li).find('.assignee-icon').html(img_tag)
+          else
+            $(li).find('.assignee-icon').html('')
           $(li).effect 'highlight'
         else
           new Flash("Issue update failed", 'alert')
       dataType: "json"
 
+  @sortIssues: (data) ->
+    sort_issues_url = location.href + "/sort_issues"
+
+    $.ajax
+      type: "PUT"
+      url: sort_issues_url
+      data: data
+      success: (data) ->
+        if data.saved != true
+          new Flash("Issues update failed", 'alert')
+      dataType: "json"
+
+  @sortMergeRequests: (data) ->
+    sort_mr_url = location.href + "/sort_merge_requests"
+
+    $.ajax
+      type: "PUT"
+      url: sort_mr_url
+      data: data
+      success: (data) ->
+        if data.saved != true
+          new Flash("MR update failed", 'alert')
+      dataType: "json"
+
   @updateMergeRequest: (li, merge_request_url, data) ->
     $.ajax
       type: "PUT"
@@ -31,6 +62,11 @@ class Milestone
     $("#issues-list-unassigned, #issues-list-ongoing, #issues-list-closed").sortable(
       connectWith: ".issues-sortable-list",
       dropOnEmpty: true,
+      items: "li:not(.ui-sort-disabled)",
+      update: (event, ui) ->
+        data = $(this).sortable("serialize")
+        Milestone.sortIssues(data)
+
       receive: (event, ui) ->
         new_state = $(this).data('state')
         issue_id = ui.item.data('iid')
@@ -55,6 +91,11 @@ class Milestone
     $("#merge_requests-list-unassigned, #merge_requests-list-ongoing, #merge_requests-list-closed").sortable(
       connectWith: ".merge_requests-sortable-list",
       dropOnEmpty: true,
+      items: "li:not(.ui-sort-disabled)",
+      update: (event, ui) ->
+        data = $(this).sortable("serialize")
+        Milestone.sortMergeRequests(data)
+
       receive: (event, ui) ->
         new_state = $(this).data('state')
         merge_request_id = ui.item.data('iid')

app/assets/javascripts/project_users_select.js.coffee

@@ -37,13 +37,9 @@
 
   projectUserFormatResult: (user) ->
     if user.avatar_url
-      avatar = gon.relative_url_root + user.avatar_url
-    else if gon.gravatar_enabled
-      avatar = gon.gravatar_url
-      avatar = avatar.replace('%{hash}', md5(user.email))
-      avatar = avatar.replace('%{size}', '24')
+      avatar = user.avatar_url
     else
-      avatar = gon.relative_url_root + "/assets/no_avatar.png"
+      avatar = gon.default_avatar_url
 
     if user.id == ''
       avatarMarkup = ''