From 35b93f9d223e132a66501920ba84d5ece1013aab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20Trzci=C5=84ski?= <ayufan@ayufan.eu>
Date: Mon, 2 Nov 2015 15:14:34 +0000
Subject: [PATCH 001/134] Add notice about offline migrations

---
 doc/development/migration_style_guide.md | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/doc/development/migration_style_guide.md b/doc/development/migration_style_guide.md
index 4fa1961fde9..4e108c17871 100644
--- a/doc/development/migration_style_guide.md
+++ b/doc/development/migration_style_guide.md
@@ -8,6 +8,8 @@ In addition, having to take a server offline for a an upgrade small or big is
 a big burden for most organizations. For this reason it is important that your
 migrations are written carefully, can be applied online and adhere to the style guide below.
 
+It's advised to have offline migrations only in major GitLab releases.
+
 When writing your migrations, also consider that databases might have stale data
 or inconsistencies and guard for that. Try to make as little assumptions as possible
 about the state of the database.
@@ -33,6 +35,8 @@ It is always preferable to have a migration run online. If you expect the migrat
 to take particularly long (for instance, if it loops through all notes),
 this is valuable information to add.
 
+If you don't provide the information it means that a migration is safe to run online.
+
 ### Reversibility
 
 Your migration should be reversible. This is very important, as it should
@@ -85,4 +89,4 @@ select_all("SELECT name, COUNT(id) as cnt FROM tags GROUP BY name HAVING COUNT(i
   execute("UPDATE taggings SET tag_id = #{origin_tag_id} WHERE tag_id IN(#{duplicate_ids.join(",")})")
   execute("DELETE FROM tags WHERE id IN(#{duplicate_ids.join(",")})")
 end
-```
+```
\ No newline at end of file

From 055afab5c7d33d061d339c270bd258ed847450f3 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Mon, 1 Feb 2016 23:58:04 +0100
Subject: [PATCH 002/134] Make the CI permission model simpler

This MR simplifies CI permission model:
- read_build: allows to read a list of builds, artifacts and trace
- update_build: allows to cancel and retry builds
- create_build: allows to create builds from gitlab-ci.yml (not yet implemented)
- admin_build: allows to manage triggers, runners and variables
- read_commit_status: allows to read a list of commit statuses (including the overall of builds)
- create_commit_status: allows to create a new commit status using API

Remove all extra methods to manage permission.
Made all controllers to use explicitly the new permissions.
---
 app/controllers/ci/application_controller.rb  |  2 +-
 .../projects/artifacts_controller.rb          | 12 +------
 app/controllers/projects/builds_controller.rb |  9 ++---
 app/controllers/projects/commit_controller.rb | 12 ++-----
 .../projects/runner_projects_controller.rb    |  2 +-
 .../projects/runners_controller.rb            |  2 +-
 .../projects/triggers_controller.rb           |  2 +-
 .../projects/variables_controller.rb          |  2 +-
 app/helpers/projects_helper.rb                |  2 +-
 app/models/ability.rb                         | 34 ++++++++++++++-----
 app/views/admin/builds/_build.html.haml       |  6 ++--
 app/views/projects/builds/index.html.haml     |  2 +-
 app/views/projects/builds/show.html.haml      |  5 ++-
 app/views/projects/commit/_builds.html.haml   |  2 +-
 .../commit_statuses/_commit_status.html.haml  |  6 ++--
 lib/api/builds.rb                             | 29 +++++++++++-----
 lib/api/commit_statuses.rb                    |  2 +-
 lib/api/triggers.rb                           |  8 ++---
 lib/api/variables.rb                          |  2 +-
 spec/requests/api/builds_spec.rb              |  8 ++---
 20 files changed, 78 insertions(+), 71 deletions(-)

diff --git a/app/controllers/ci/application_controller.rb b/app/controllers/ci/application_controller.rb
index c420b59c3a2..59c77653509 100644
--- a/app/controllers/ci/application_controller.rb
+++ b/app/controllers/ci/application_controller.rb
@@ -13,7 +13,7 @@ module Ci
     end
 
     def authorize_manage_builds!
-      unless can?(current_user, :manage_builds, project)
+      unless can?(current_user, :update_build, project)
         return page_404
       end
     end
diff --git a/app/controllers/projects/artifacts_controller.rb b/app/controllers/projects/artifacts_controller.rb
index f159a6d6dc6..cfea1266516 100644
--- a/app/controllers/projects/artifacts_controller.rb
+++ b/app/controllers/projects/artifacts_controller.rb
@@ -1,6 +1,6 @@
 class Projects::ArtifactsController < Projects::ApplicationController
   layout 'project'
-  before_action :authorize_read_build_artifacts!
+  before_action :authorize_read_build!
 
   def download
     unless artifacts_file.file_storage?
@@ -43,14 +43,4 @@ class Projects::ArtifactsController < Projects::ApplicationController
   def artifacts_file
     @artifacts_file ||= build.artifacts_file
   end
-
-  def authorize_read_build_artifacts!
-    unless can?(current_user, :read_build_artifacts, @project)
-      if current_user.nil?
-        return authenticate_user!
-      else
-        return render_404
-      end
-    end
-  end
 end
diff --git a/app/controllers/projects/builds_controller.rb b/app/controllers/projects/builds_controller.rb
index 92d9699fe84..9e89296e71d 100644
--- a/app/controllers/projects/builds_controller.rb
+++ b/app/controllers/projects/builds_controller.rb
@@ -1,7 +1,8 @@
 class Projects::BuildsController < Projects::ApplicationController
   before_action :build, except: [:index, :cancel_all]
 
-  before_action :authorize_manage_builds!, except: [:index, :show, :status]
+  before_action :authorize_read_build!, except: [:cancel, :cancel_all, :retry]
+  before_action :authorize_update_build!, except: [:index, :show, :status]
 
   layout "project"
 
@@ -69,10 +70,4 @@ class Projects::BuildsController < Projects::ApplicationController
   def build_path(build)
     namespace_project_build_path(build.project.namespace, build.project, build)
   end
-
-  def authorize_manage_builds!
-    unless can?(current_user, :manage_builds, project)
-      return render_404
-    end
-  end
 end
diff --git a/app/controllers/projects/commit_controller.rb b/app/controllers/projects/commit_controller.rb
index f5a169e5aa9..2bf367d2a25 100644
--- a/app/controllers/projects/commit_controller.rb
+++ b/app/controllers/projects/commit_controller.rb
@@ -4,10 +4,10 @@
 class Projects::CommitController < Projects::ApplicationController
   # Authorize
   before_action :require_non_empty_project
-  before_action :authorize_download_code!, except: [:cancel_builds]
-  before_action :authorize_manage_builds!, only: [:cancel_builds]
+  before_action :authorize_download_code!, except: [:cancel_builds, :retry_builds]
+  before_action :authorize_update_build!, only: [:cancel_builds, :retry_builds]
+  before_action :authorize_read_commit_status!, only: [:builds]
   before_action :commit
-  before_action :authorize_manage_builds!, only: [:cancel_builds, :retry_builds]
   before_action :define_show_vars, only: [:show, :builds]
 
   def show
@@ -77,10 +77,4 @@ class Projects::CommitController < Projects::ApplicationController
 
     @statuses = ci_commit.statuses if ci_commit
   end
-
-  def authorize_manage_builds!
-    unless can?(current_user, :manage_builds, project)
-      return render_404
-    end
-  end
 end
diff --git a/app/controllers/projects/runner_projects_controller.rb b/app/controllers/projects/runner_projects_controller.rb
index e2785caa2fb..bedeb4a295c 100644
--- a/app/controllers/projects/runner_projects_controller.rb
+++ b/app/controllers/projects/runner_projects_controller.rb
@@ -1,5 +1,5 @@
 class Projects::RunnerProjectsController < Projects::ApplicationController
-  before_action :authorize_admin_project!
+  before_action :authorize_admin_build!
 
   layout 'project_settings'
 
diff --git a/app/controllers/projects/runners_controller.rb b/app/controllers/projects/runners_controller.rb
index 4993b2648a5..0dd2d6a99be 100644
--- a/app/controllers/projects/runners_controller.rb
+++ b/app/controllers/projects/runners_controller.rb
@@ -1,6 +1,6 @@
 class Projects::RunnersController < Projects::ApplicationController
+  before_action :authorize_admin_build!
   before_action :set_runner, only: [:edit, :update, :destroy, :pause, :resume, :show]
-  before_action :authorize_admin_project!
 
   layout 'project_settings'
 
diff --git a/app/controllers/projects/triggers_controller.rb b/app/controllers/projects/triggers_controller.rb
index 30adfad1daa..92359745cec 100644
--- a/app/controllers/projects/triggers_controller.rb
+++ b/app/controllers/projects/triggers_controller.rb
@@ -1,5 +1,5 @@
 class Projects::TriggersController < Projects::ApplicationController
-  before_action :authorize_admin_project!
+  before_action :authorize_admin_build!
 
   layout 'project_settings'
 
diff --git a/app/controllers/projects/variables_controller.rb b/app/controllers/projects/variables_controller.rb
index 10efafea9db..00234654578 100644
--- a/app/controllers/projects/variables_controller.rb
+++ b/app/controllers/projects/variables_controller.rb
@@ -1,5 +1,5 @@
 class Projects::VariablesController < Projects::ApplicationController
-  before_action :authorize_admin_project!
+  before_action :authorize_admin_build!
 
   layout 'project_settings'
 
diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb
index 8c8b355028c..4543eff0d63 100644
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -126,7 +126,7 @@ module ProjectsHelper
       nav_tabs << :merge_requests
     end
 
-    if project.builds_enabled? && can?(current_user, :read_build, project)
+    if can?(current_user, :read_build, project)
       nav_tabs << :builds
     end
 
diff --git a/app/models/ability.rb b/app/models/ability.rb
index ab59a3506a2..e58e7a40273 100644
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -52,10 +52,15 @@ class Ability
           :read_project_member,
           :read_merge_request,
           :read_note,
+          :read_commit_status,
           :read_build,
           :download_code
         ]
 
+        if project.restrict_builds?
+          rules -= :read_build
+        end
+
         rules - project_disabled_features_rules(project)
       else
         []
@@ -113,6 +118,10 @@ class Ability
 
         if project.public? || project.internal?
           rules.push(*public_project_rules)
+
+          if team.guest?(user) && project.restrict_builds?
+            rules -= named_abilities('build')
+          end
         end
 
         if project.owner == user || user.admin?
@@ -134,7 +143,9 @@ class Ability
     def public_project_rules
       @public_project_rules ||= project_guest_rules + [
         :download_code,
-        :fork_project
+        :fork_project,
+        :read_commit_status,
+        :read_build,
       ]
     end
 
@@ -149,7 +160,7 @@ class Ability
         :read_project_member,
         :read_merge_request,
         :read_note,
-        :read_build,
+        :read_commit_status,
         :create_project,
         :create_issue,
         :create_note
@@ -158,24 +169,25 @@ class Ability
 
     def project_report_rules
       @project_report_rules ||= project_guest_rules + [
-        :create_commit_status,
-        :read_commit_statuses,
-        :read_build_artifacts,
         :download_code,
         :fork_project,
         :create_project_snippet,
         :update_issue,
         :admin_issue,
-        :admin_label
+        :admin_label,
+        :read_build,
       ]
     end
 
     def project_dev_rules
       @project_dev_rules ||= project_report_rules + [
         :admin_merge_request,
+        :create_commit_status,
+        :update_commit_status,
+        :create_build,
+        :update_build,
         :create_merge_request,
         :create_wiki,
-        :manage_builds,
         :push_code
       ]
     end
@@ -201,7 +213,9 @@ class Ability
         :admin_merge_request,
         :admin_note,
         :admin_wiki,
-        :admin_project
+        :admin_project,
+        :admin_commit_status,
+        :admin_build
       ]
     end
 
@@ -240,6 +254,10 @@ class Ability
         rules += named_abilities('wiki')
       end
 
+      unless project.builds_enabled
+        rules += named_abilities('build')
+      end
+
       rules
     end
 
diff --git a/app/views/admin/builds/_build.html.haml b/app/views/admin/builds/_build.html.haml
index c395bd908c3..bd7fb0b36f4 100644
--- a/app/views/admin/builds/_build.html.haml
+++ b/app/views/admin/builds/_build.html.haml
@@ -4,7 +4,7 @@
     = ci_status_with_icon(build.status)
 
   %td.build-link
-    - if build.target_url
+    - if can?(current_user, :read_build, project) && build.target_url
       = link_to build.target_url do
         %strong Build ##{build.id}
     - else
@@ -60,10 +60,10 @@
 
   %td
     .pull-right
-      - if current_user && can?(current_user, :read_build_artifacts, project) && build.artifacts?
+      - if can?(current_user, :read_build, project) && build.artifacts?
         = link_to build.artifacts_download_url, title: 'Download artifacts' do
           %i.fa.fa-download
-      - if current_user && can?(current_user, :manage_builds, build.project)
+      - if current_user && can?(current_user, :update_build, build.project)
         - if build.active?
           - if build.cancel_url
             = link_to build.cancel_url, method: :post, title: 'Cancel' do
diff --git a/app/views/projects/builds/index.html.haml b/app/views/projects/builds/index.html.haml
index bbb6944a65a..2a2a4745bed 100644
--- a/app/views/projects/builds/index.html.haml
+++ b/app/views/projects/builds/index.html.haml
@@ -3,7 +3,7 @@
 
 .project-issuable-filter
   .controls
-    - if can?(current_user, :manage_builds, @project)
+    - if can?(current_user, :update_build, @project)
       .pull-left.hidden-xs
         - if @all_builds.running_or_pending.any?
           = link_to 'Cancel running', cancel_all_namespace_project_builds_path(@project.namespace, @project),
diff --git a/app/views/projects/builds/show.html.haml b/app/views/projects/builds/show.html.haml
index ba1fdc6f0e7..c43d6c3b427 100644
--- a/app/views/projects/builds/show.html.haml
+++ b/app/views/projects/builds/show.html.haml
@@ -89,8 +89,7 @@
             Test coverage
           %h1 #{@build.coverage}%
 
-      - if current_user && can?(current_user, :read_build_artifacts, @project) && @build.artifacts?
-
+      - if can?(current_user, :read_build, @project) && @build.artifacts?
         .build-widget.artifacts
           %h4.title Build artifacts
           .center
@@ -102,7 +101,7 @@
       .build-widget
         %h4.title
           Build ##{@build.id}
-          - if current_user && can?(current_user, :manage_builds, @project)
+          - if current_user && can?(current_user, :update_build, @project)
             .pull-right
               - if @build.cancel_url
                 = link_to "Cancel", @build.cancel_url, class: 'btn btn-sm btn-danger', method: :post
diff --git a/app/views/projects/commit/_builds.html.haml b/app/views/projects/commit/_builds.html.haml
index 329aaa0bb8b..befad27666c 100644
--- a/app/views/projects/commit/_builds.html.haml
+++ b/app/views/projects/commit/_builds.html.haml
@@ -1,6 +1,6 @@
 .gray-content-block.middle-block
   .pull-right
-    - if can?(current_user, :manage_builds, @ci_commit.project)
+    - if can?(current_user, :update_build, @ci_commit.project)
       - if @ci_commit.builds.latest.failed.any?(&:retryable?)
         = link_to "Retry failed", retry_builds_namespace_project_commit_path(@ci_commit.project.namespace, @ci_commit.project, @ci_commit.sha), class: 'btn btn-grouped btn-primary', method: :post
 
diff --git a/app/views/projects/commit_statuses/_commit_status.html.haml b/app/views/projects/commit_statuses/_commit_status.html.haml
index 2e3c956ddc4..fba4405cb7d 100644
--- a/app/views/projects/commit_statuses/_commit_status.html.haml
+++ b/app/views/projects/commit_statuses/_commit_status.html.haml
@@ -8,7 +8,7 @@
       = ci_status_with_icon(commit_status.status)
 
   %td.commit_status-link
-    - if commit_status.target_url
+    - if can?(current_user, :read_build, commit_status.project) && commit_status.target_url
       = link_to commit_status.target_url do
         %strong ##{commit_status.id}
     - else
@@ -66,10 +66,10 @@
 
   %td
     .pull-right
-      - if current_user && can?(current_user, :read_build_artifacts, commit_status.project) && commit_status.artifacts_download_url
+      - if can?(current_user, :read_build, commit_status.project) && commit_status.artifacts_download_url
         = link_to commit_status.artifacts_download_url, title: 'Download artifacts' do
           %i.fa.fa-download
-      - if current_user && can?(current_user, :manage_builds, commit_status.project)
+      - if can?(current_user, :update_build, commit_status.project)
         - if commit_status.active?
           - if commit_status.cancel_url
             = link_to commit_status.cancel_url, method: :post, title: 'Cancel' do
diff --git a/lib/api/builds.rb b/lib/api/builds.rb
index d293f988165..a8bd3842ce4 100644
--- a/lib/api/builds.rb
+++ b/lib/api/builds.rb
@@ -13,11 +13,12 @@ module API
       # Example Request:
       #   GET /projects/:id/builds
       get ':id/builds' do
+
         builds = user_project.builds.order('id DESC')
         builds = filter_builds(builds, params[:scope])
 
         present paginate(builds), with: Entities::Build,
-                                  user_can_download_artifacts: can?(current_user, :download_build_artifacts, user_project)
+                                  user_can_download_artifacts: can?(current_user, :read_build, user_project)
       end
 
       # Get builds for a specific commit of a project
@@ -30,6 +31,8 @@ module API
       # Example Request:
       #   GET /projects/:id/repository/commits/:sha/builds
       get ':id/repository/commits/:sha/builds' do
+        authorize_read_builds!
+
         commit = user_project.ci_commits.find_by_sha(params[:sha])
         return not_found! unless commit
 
@@ -37,7 +40,7 @@ module API
         builds = filter_builds(builds, params[:scope])
 
         present paginate(builds), with: Entities::Build,
-                                  user_can_download_artifacts: can?(current_user, :download_build_artifacts, user_project)
+                                  user_can_download_artifacts: can?(current_user, :read_build, user_project)
       end
 
       # Get a specific build of a project
@@ -48,11 +51,13 @@ module API
       # Example Request:
       #   GET /projects/:id/builds/:build_id
       get ':id/builds/:build_id' do
+        authorize_read_builds!
+
         build = get_build(params[:build_id])
         return not_found!(build) unless build
 
         present build, with: Entities::Build,
-                       user_can_download_artifacts: can?(current_user, :download_build_artifacts, user_project)
+                       user_can_download_artifacts: can?(current_user, :read_build, user_project)
       end
 
       # Get a trace of a specific build of a project
@@ -67,6 +72,8 @@ module API
       #       is saved in the DB instead of file). But before that, we need to consider how to replace the value of
       #       `runners_token` with some mask (like `xxxxxx`) when sending trace file directly by workhorse.
       get ':id/builds/:build_id/trace' do
+        authorize_read_builds!
+
         build = get_build(params[:build_id])
         return not_found!(build) unless build
 
@@ -86,7 +93,7 @@ module API
       # example request:
       #   post /projects/:id/build/:build_id/cancel
       post ':id/builds/:build_id/cancel' do
-        authorize_manage_builds!
+        authorize_update_builds!
 
         build = get_build(params[:build_id])
         return not_found!(build) unless build
@@ -94,7 +101,7 @@ module API
         build.cancel
 
         present build, with: Entities::Build,
-                       user_can_download_artifacts: can?(current_user, :download_build_artifacts, user_project)
+                       user_can_download_artifacts: can?(current_user, :read_build, user_project)
       end
 
       # Retry a specific build of a project
@@ -105,7 +112,7 @@ module API
       # example request:
       #   post /projects/:id/build/:build_id/retry
       post ':id/builds/:build_id/retry' do
-        authorize_manage_builds!
+        authorize_update_builds!
 
         build = get_build(params[:build_id])
         return forbidden!('Build is not retryable') unless build && build.retryable?
@@ -113,7 +120,7 @@ module API
         build = Ci::Build.retry(build)
 
         present build, with: Entities::Build,
-                       user_can_download_artifacts: can?(current_user, :download_build_artifacts, user_project)
+                       user_can_download_artifacts: can?(current_user, :read_build, user_project)
       end
     end
 
@@ -141,8 +148,12 @@ module API
         builds.where(status: available_statuses && scope)
       end
 
-      def authorize_manage_builds!
-        authorize! :manage_builds, user_project
+      def authorize_read_builds!
+        authorize! :read_build, user_project
+      end
+
+      def authorize_update_builds!
+        authorize! :update_build, user_project
       end
     end
   end
diff --git a/lib/api/commit_statuses.rb b/lib/api/commit_statuses.rb
index 1162271f5fc..9422d438d21 100644
--- a/lib/api/commit_statuses.rb
+++ b/lib/api/commit_statuses.rb
@@ -18,7 +18,7 @@ module API
       # Examples:
       #   GET /projects/:id/repository/commits/:sha/statuses
       get ':id/repository/commits/:sha/statuses' do
-        authorize! :read_commit_statuses, user_project
+        authorize! :read_commit_status, user_project
         sha = params[:sha]
         ci_commit = user_project.ci_commit(sha)
         not_found! 'Commit' unless ci_commit
diff --git a/lib/api/triggers.rb b/lib/api/triggers.rb
index 5e4964f446c..d1d07394e92 100644
--- a/lib/api/triggers.rb
+++ b/lib/api/triggers.rb
@@ -54,7 +54,7 @@ module API
       #   GET /projects/:id/triggers
       get ':id/triggers' do
         authenticate!
-        authorize_admin_project
+        authorize! :admin_build, user_project
 
         triggers = user_project.triggers.includes(:trigger_requests)
         triggers = paginate(triggers)
@@ -71,7 +71,7 @@ module API
       #   GET /projects/:id/triggers/:token
       get ':id/triggers/:token' do
         authenticate!
-        authorize_admin_project
+        authorize! :admin_build, user_project
 
         trigger = user_project.triggers.find_by(token: params[:token].to_s)
         return not_found!('Trigger') unless trigger
@@ -87,7 +87,7 @@ module API
       #   POST /projects/:id/triggers
       post ':id/triggers' do
         authenticate!
-        authorize_admin_project
+        authorize! :admin_build, user_project
 
         trigger = user_project.triggers.create
 
@@ -103,7 +103,7 @@ module API
       #   DELETE /projects/:id/triggers/:token
       delete ':id/triggers/:token' do
         authenticate!
-        authorize_admin_project
+        authorize! :admin_build, user_project
 
         trigger = user_project.triggers.find_by(token: params[:token].to_s)
         return not_found!('Trigger') unless trigger
diff --git a/lib/api/variables.rb b/lib/api/variables.rb
index d9a055f6c92..f6495071a11 100644
--- a/lib/api/variables.rb
+++ b/lib/api/variables.rb
@@ -2,7 +2,7 @@ module API
   # Projects variables API
   class Variables < Grape::API
     before { authenticate! }
-    before { authorize_admin_project }
+    before { authorize! :admin_build, user_project }
 
     resource :projects do
       # Get project variables
diff --git a/spec/requests/api/builds_spec.rb b/spec/requests/api/builds_spec.rb
index 8c9f5a382b7..6c07802db8b 100644
--- a/spec/requests/api/builds_spec.rb
+++ b/spec/requests/api/builds_spec.rb
@@ -113,7 +113,7 @@ describe API::API, api: true  do
 
   describe 'POST /projects/:id/builds/:build_id/cancel' do
     context 'authorized user' do
-      context 'user with :manage_builds persmission' do
+      context 'user with :update_build persmission' do
         it 'should cancel running or pending build' do
           post api("/projects/#{project.id}/builds/#{build.id}/cancel", user)
 
@@ -122,7 +122,7 @@ describe API::API, api: true  do
         end
       end
 
-      context 'user without :manage_builds permission' do
+      context 'user without :update_build permission' do
         it 'should not cancel build' do
           post api("/projects/#{project.id}/builds/#{build.id}/cancel", user2)
 
@@ -142,7 +142,7 @@ describe API::API, api: true  do
 
   describe 'POST /projects/:id/builds/:build_id/retry' do
     context 'authorized user' do
-      context 'user with :manage_builds persmission' do
+      context 'user with :update_build persmission' do
         it 'should retry non-running build' do
           post api("/projects/#{project.id}/builds/#{build_canceled.id}/retry", user)
 
@@ -152,7 +152,7 @@ describe API::API, api: true  do
         end
       end
 
-      context 'user without :manage_builds permission' do
+      context 'user without :update_build permission' do
         it 'should not retry build' do
           post api("/projects/#{project.id}/builds/#{build_canceled.id}/retry", user2)
 

From 627909c2a4a938c6387afa459ef4dc815fe9fb5a Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Tue, 2 Feb 2016 17:59:37 +0100
Subject: [PATCH 003/134] Add CI setting: allow_guest_to_access_builds

Add the `read_build` ability if user is anonymous or guest and allow_guest_to_access_builds is enabled.
---
 app/controllers/projects_controller.rb        |  1 +
 app/models/ability.rb                         | 14 ++++----
 app/views/projects/edit.html.haml             |  8 +++--
 ...dd_allow_guest_to_access_builds_project.rb |  5 +++
 db/schema.rb                                  | 35 ++++++++++---------
 doc/permissions/permissions.md                |  9 +++++
 6 files changed, 47 insertions(+), 25 deletions(-)
 create mode 100644 db/migrate/20160202164642_add_allow_guest_to_access_builds_project.rb

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 4df5095bd94..153e7caaae3 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -227,6 +227,7 @@ class ProjectsController < ApplicationController
       :issues_enabled, :merge_requests_enabled, :snippets_enabled, :issues_tracker_id, :default_branch,
       :wiki_enabled, :visibility_level, :import_url, :last_activity_at, :namespace_id, :avatar,
       :builds_enabled, :build_allow_git_fetch, :build_timeout_in_minutes, :build_coverage_regex,
+      :allow_guest_to_access_builds,
     )
   end
 
diff --git a/app/models/ability.rb b/app/models/ability.rb
index e58e7a40273..313c6f049b7 100644
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -53,12 +53,11 @@ class Ability
           :read_merge_request,
           :read_note,
           :read_commit_status,
-          :read_build,
           :download_code
         ]
 
-        if project.restrict_builds?
-          rules -= :read_build
+        if project.allow_guest_to_access_builds?
+          rules += :read_build
         end
 
         rules - project_disabled_features_rules(project)
@@ -114,13 +113,17 @@ class Ability
 
         elsif team.guest?(user)
           rules.push(*project_guest_rules)
+
+          if project.allow_guest_to_access_builds?
+            rules += :read_build
+          end
         end
 
         if project.public? || project.internal?
           rules.push(*public_project_rules)
 
-          if team.guest?(user) && project.restrict_builds?
-            rules -= named_abilities('build')
+          if project.allow_guest_to_access_builds?
+            rules += :read_build
           end
         end
 
@@ -145,7 +148,6 @@ class Ability
         :download_code,
         :fork_project,
         :read_commit_status,
-        :read_build,
       ]
     end
 
diff --git a/app/views/projects/edit.html.haml b/app/views/projects/edit.html.haml
index 8a99aceef7f..e3165caad05 100644
--- a/app/views/projects/edit.html.haml
+++ b/app/views/projects/edit.html.haml
@@ -157,8 +157,12 @@
                     %li
                       phpunit --coverage-text --colors=never (PHP) -
                       %code ^\s*Lines:\s*\d+.\d+\%
-
-
+              .form-group
+                .col-sm-offset-2.col-sm-10
+                  .checkbox
+                    = f.label :allow_guest_to_access_builds do
+                      = f.check_box :allow_guest_to_access_builds
+                      Allow guest to access builds (including build logs and artifacts)
           %fieldset.features
             %legend
               Advanced settings
diff --git a/db/migrate/20160202164642_add_allow_guest_to_access_builds_project.rb b/db/migrate/20160202164642_add_allow_guest_to_access_builds_project.rb
new file mode 100644
index 00000000000..69ce8d08bba
--- /dev/null
+++ b/db/migrate/20160202164642_add_allow_guest_to_access_builds_project.rb
@@ -0,0 +1,5 @@
+class AddAllowGuestToAccessBuildsProject < ActiveRecord::Migration
+  def change
+    add_column :projects, :allow_guest_to_access_builds, :boolean, default: true, null: false
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 2ad2c23fba5..a04e812ae22 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20160128233227) do
+ActiveRecord::Schema.define(version: 20160202164642) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -650,34 +650,35 @@ ActiveRecord::Schema.define(version: 20160128233227) do
     t.datetime "created_at"
     t.datetime "updated_at"
     t.integer  "creator_id"
-    t.boolean  "issues_enabled",         default: true,     null: false
-    t.boolean  "wall_enabled",           default: true,     null: false
-    t.boolean  "merge_requests_enabled", default: true,     null: false
-    t.boolean  "wiki_enabled",           default: true,     null: false
+    t.boolean  "issues_enabled",               default: true,     null: false
+    t.boolean  "wall_enabled",                 default: true,     null: false
+    t.boolean  "merge_requests_enabled",       default: true,     null: false
+    t.boolean  "wiki_enabled",                 default: true,     null: false
     t.integer  "namespace_id"
-    t.string   "issues_tracker",         default: "gitlab", null: false
+    t.string   "issues_tracker",               default: "gitlab", null: false
     t.string   "issues_tracker_id"
-    t.boolean  "snippets_enabled",       default: true,     null: false
+    t.boolean  "snippets_enabled",             default: true,     null: false
     t.datetime "last_activity_at"
     t.string   "import_url"
-    t.integer  "visibility_level",       default: 0,        null: false
-    t.boolean  "archived",               default: false,    null: false
+    t.integer  "visibility_level",             default: 0,        null: false
+    t.boolean  "archived",                     default: false,    null: false
     t.string   "avatar"
     t.string   "import_status"
-    t.float    "repository_size",        default: 0.0
-    t.integer  "star_count",             default: 0,        null: false
+    t.float    "repository_size",              default: 0.0
+    t.integer  "star_count",                   default: 0,        null: false
     t.string   "import_type"
     t.string   "import_source"
-    t.integer  "commit_count",           default: 0
+    t.integer  "commit_count",                 default: 0
     t.text     "import_error"
     t.integer  "ci_id"
-    t.boolean  "builds_enabled",         default: true,     null: false
-    t.boolean  "shared_runners_enabled", default: true,     null: false
+    t.boolean  "builds_enabled",               default: true,     null: false
+    t.boolean  "shared_runners_enabled",       default: true,     null: false
     t.string   "runners_token"
     t.string   "build_coverage_regex"
-    t.boolean  "build_allow_git_fetch",  default: true,     null: false
-    t.integer  "build_timeout",          default: 3600,     null: false
-    t.boolean  "pending_delete",         default: false
+    t.boolean  "build_allow_git_fetch",        default: true,     null: false
+    t.integer  "build_timeout",                default: 3600,     null: false
+    t.boolean  "pending_delete",               default: false
+    t.boolean  "allow_guest_to_access_builds", default: true,     null: false
   end
 
   add_index "projects", ["builds_enabled", "shared_runners_enabled"], name: "index_projects_on_builds_enabled_and_shared_runners_enabled", using: :btree
diff --git a/doc/permissions/permissions.md b/doc/permissions/permissions.md
index 1be78ac1823..168e7d143ee 100644
--- a/doc/permissions/permissions.md
+++ b/doc/permissions/permissions.md
@@ -18,6 +18,9 @@ documentation](../workflow/add-user/add-user.md).
 |---------------------------------------|---------|------------|-------------|----------|--------|
 | Create new issue                      | ✓       | ✓          | ✓           | ✓        | ✓      |
 | Leave comments                        | ✓       | ✓          | ✓           | ✓        | ✓      |
+| See a list of builds                  | ✓ [^1]  | ✓          | ✓           | ✓        | ✓      |
+| See a build log                       | ✓ [^1]  | ✓          | ✓           | ✓        | ✓      |
+| Download and browse build artifacts   | ✓ [^1]  | ✓          | ✓           | ✓        | ✓      |
 | Pull project code                     |         | ✓          | ✓           | ✓        | ✓      |
 | Download project                      |         | ✓          | ✓           | ✓        | ✓      |
 | Create code snippets                  |         | ✓          | ✓           | ✓        | ✓      |
@@ -31,6 +34,7 @@ documentation](../workflow/add-user/add-user.md).
 | Remove non-protected branches         |         |            | ✓           | ✓        | ✓      |
 | Add tags                              |         |            | ✓           | ✓        | ✓      |
 | Write a wiki                          |         |            | ✓           | ✓        | ✓      |
+| Cancel and retry builds               |         |            | ✓           | ✓        | ✓      |
 | Create new milestones                 |         |            |             | ✓        | ✓      |
 | Add new team members                  |         |            |             | ✓        | ✓      |
 | Push to protected branches            |         |            |             | ✓        | ✓      |
@@ -40,12 +44,17 @@ documentation](../workflow/add-user/add-user.md).
 | Edit project                          |         |            |             | ✓        | ✓      |
 | Add deploy keys to project            |         |            |             | ✓        | ✓      |
 | Configure project hooks               |         |            |             | ✓        | ✓      |
+| Manage runners                        |         |            |             | ✓        | ✓      |
+| Manage build triggers                 |         |            |             | ✓        | ✓      |
+| Manage variables                      |         |            |             | ✓        | ✓      |
 | Switch visibility level               |         |            |             |          | ✓      |
 | Transfer project to another namespace |         |            |             |          | ✓      |
 | Remove project                        |         |            |             |          | ✓      |
 | Force push to protected branches      |         |            |             |          |        |
 | Remove protected branches             |         |            |             |          |        |
 
+[^1]: If **Allow guest to access builds** is enabled in CI settings
+
 ## Group
 
 In order for a group to appear as public and be browsable, it must contain at

From 8670411ae7acb93b5113634a3ae5e476ef6d2aee Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Wed, 3 Feb 2016 11:24:14 +0100
Subject: [PATCH 004/134] Clean Ci::ApplicationController from unused
 permission related code

---
 app/controllers/ci/application_controller.rb | 47 --------------------
 app/controllers/ci/projects_controller.rb    |  5 +--
 2 files changed, 2 insertions(+), 50 deletions(-)

diff --git a/app/controllers/ci/application_controller.rb b/app/controllers/ci/application_controller.rb
index 59c77653509..5bb7d499cdc 100644
--- a/app/controllers/ci/application_controller.rb
+++ b/app/controllers/ci/application_controller.rb
@@ -3,52 +3,5 @@ module Ci
     def self.railtie_helpers_paths
       "app/helpers/ci"
     end
-
-    private
-
-    def authorize_access_project!
-      unless can?(current_user, :read_project, project)
-        return page_404
-      end
-    end
-
-    def authorize_manage_builds!
-      unless can?(current_user, :update_build, project)
-        return page_404
-      end
-    end
-
-    def authenticate_admin!
-      return render_404 unless current_user.is_admin?
-    end
-
-    def authorize_manage_project!
-      unless can?(current_user, :admin_project, project)
-        return page_404
-      end
-    end
-
-    def page_404
-      render file: "#{Rails.root}/public/404.html", status: 404, layout: false
-    end
-
-    def default_headers
-      headers['X-Frame-Options'] = 'DENY'
-      headers['X-XSS-Protection'] = '1; mode=block'
-    end
-
-    # JSON for infinite scroll via Pager object
-    def pager_json(partial, count)
-      html = render_to_string(
-        partial,
-        layout: false,
-        formats: [:html]
-      )
-
-      render json: {
-        html: html,
-        count: count
-      }
-    end
   end
 end
diff --git a/app/controllers/ci/projects_controller.rb b/app/controllers/ci/projects_controller.rb
index 3004c2d27f0..711c2847d5e 100644
--- a/app/controllers/ci/projects_controller.rb
+++ b/app/controllers/ci/projects_controller.rb
@@ -1,8 +1,7 @@
 module Ci
   class ProjectsController < Ci::ApplicationController
-    before_action :project, except: [:index]
-    before_action :authenticate_user!, except: [:index, :build, :badge]
-    before_action :authorize_access_project!, except: [:index, :badge]
+    before_action :project
+    before_action :authorize_read_project!, except: [:badge]
     before_action :no_cache, only: [:badge]
     protect_from_forgery
 

From e80c79e3ad0efe505541ebac0b149b750cd1cc60 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Wed, 3 Feb 2016 12:41:16 +0100
Subject: [PATCH 005/134] Fix build errors

---
 app/models/ability.rb             | 6 +++---
 app/views/projects/edit.html.haml | 6 +++++-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/models/ability.rb b/app/models/ability.rb
index 313c6f049b7..a9246dd3dd5 100644
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -57,7 +57,7 @@ class Ability
         ]
 
         if project.allow_guest_to_access_builds?
-          rules += :read_build
+          rules << :read_build
         end
 
         rules - project_disabled_features_rules(project)
@@ -115,7 +115,7 @@ class Ability
           rules.push(*project_guest_rules)
 
           if project.allow_guest_to_access_builds?
-            rules += :read_build
+            rules << :read_build
           end
         end
 
@@ -123,7 +123,7 @@ class Ability
           rules.push(*public_project_rules)
 
           if project.allow_guest_to_access_builds?
-            rules += :read_build
+            rules << :read_build
           end
         end
 
diff --git a/app/views/projects/edit.html.haml b/app/views/projects/edit.html.haml
index e3165caad05..fd61ce6a99a 100644
--- a/app/views/projects/edit.html.haml
+++ b/app/views/projects/edit.html.haml
@@ -130,6 +130,7 @@
                     %strong git fetch
                     %br
                     %span.descr Faster
+
             .form-group
               = f.label :build_timeout_in_minutes, 'Timeout', class: 'control-label'
               .col-sm-10
@@ -157,12 +158,15 @@
                     %li
                       phpunit --coverage-text --colors=never (PHP) -
                       %code ^\s*Lines:\s*\d+.\d+\%
+
               .form-group
                 .col-sm-offset-2.col-sm-10
                   .checkbox
                     = f.label :allow_guest_to_access_builds do
                       = f.check_box :allow_guest_to_access_builds
-                      Allow guest to access builds (including build logs and artifacts)
+                      %strong Guests can see builds
+                    .help-block Allow guests and anonymous users to access builds including build trace and artifacts
+
           %fieldset.features
             %legend
               Advanced settings

From c3d897a9a382b0b3354d29726add5af8c322beb4 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Wed, 3 Feb 2016 13:33:47 +0100
Subject: [PATCH 006/134] Properly handle commit status permissions (for a
 build)

---
 app/models/ability.rb                         | 22 +++++++++++++++++++
 .../commit_statuses/_commit_status.html.haml  |  8 +++----
 2 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/app/models/ability.rb b/app/models/ability.rb
index a9246dd3dd5..bf24749b173 100644
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -5,6 +5,12 @@ class Ability
       return [] unless user.is_a?(User)
       return [] if user.blocked?
 
+      if subject.is_a?(CommitStatus)
+        rules = project_abilities(user, subject)
+        rules = filter_build_abilities(rules) if subject.is_a?(Ci::Build)
+        return rules
+      end
+
       case subject.class.name
       when "Project" then project_abilities(user, subject)
       when "Issue" then issue_abilities(user, subject)
@@ -25,6 +31,10 @@ class Ability
       case true
       when subject.is_a?(PersonalSnippet)
         anonymous_personal_snippet_abilities(subject)
+      when subject.is_a?(CommitStatus)
+        rules = anonymous_project_abilities(subject)
+        rules = filter_build_abilities(rules) if subject.is_a?(Ci::Build)
+        rules
       when subject.is_a?(Project) || subject.respond_to?(:project)
         anonymous_project_abilities(subject)
       when subject.is_a?(Group) || subject.respond_to?(:group)
@@ -396,6 +406,18 @@ class Ability
       rules
     end
 
+    def filter_build_abilities(rules)
+      # If we can't read build we should also not have that
+      # ability when looking at this in context of commit_status
+      unless rules.include?(:read_build)
+        rules -= [:read_commit_status]
+      end
+      unless rules.include?(:update_build)
+        rules -= [:update_commit_status]
+      end
+      rules
+    end
+
     def abilities
       @abilities ||= begin
         abilities = Six.new
diff --git a/app/views/projects/commit_statuses/_commit_status.html.haml b/app/views/projects/commit_statuses/_commit_status.html.haml
index fba4405cb7d..c02c5983ac8 100644
--- a/app/views/projects/commit_statuses/_commit_status.html.haml
+++ b/app/views/projects/commit_statuses/_commit_status.html.haml
@@ -1,6 +1,6 @@
 %tr.commit_status
   %td.status
-    - if commit_status.target_url
+    - if can?(current_user, :read_commit_status, commit_status) && commit_status.target_url
       = link_to commit_status.target_url, class: "ci-status ci-#{commit_status.status}" do
         = ci_icon_for_status(commit_status.status)
         = commit_status.status
@@ -8,7 +8,7 @@
       = ci_status_with_icon(commit_status.status)
 
   %td.commit_status-link
-    - if can?(current_user, :read_build, commit_status.project) && commit_status.target_url
+    - if can?(current_user, :read_commit_status, commit_status) && commit_status.target_url
       = link_to commit_status.target_url do
         %strong ##{commit_status.id}
     - else
@@ -66,10 +66,10 @@
 
   %td
     .pull-right
-      - if can?(current_user, :read_build, commit_status.project) && commit_status.artifacts_download_url
+      - if can?(current_user, :read_commit_status, commit_status) && commit_status.artifacts_download_url
         = link_to commit_status.artifacts_download_url, title: 'Download artifacts' do
           %i.fa.fa-download
-      - if can?(current_user, :update_build, commit_status.project)
+      - if can?(current_user, :update_commit_status, commit_status)
         - if commit_status.active?
           - if commit_status.cancel_url
             = link_to commit_status.cancel_url, method: :post, title: 'Cancel' do

From 020623f3bbdb25c07e31985f0fe072988ba0eff2 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzegorz.bizon@ntsn.pl>
Date: Tue, 2 Feb 2016 15:51:48 +0100
Subject: [PATCH 007/134] Improve CI API specs related to operations on build

Conflicts:
	spec/factories/ci/builds.rb
---
 spec/factories/ci/builds.rb         | 15 ++++++++
 spec/requests/ci/api/builds_spec.rb | 57 ++++++++++++++++++-----------
 2 files changed, 50 insertions(+), 22 deletions(-)

diff --git a/spec/factories/ci/builds.rb b/spec/factories/ci/builds.rb
index d2db77f6286..f0ae3a18561 100644
--- a/spec/factories/ci/builds.rb
+++ b/spec/factories/ci/builds.rb
@@ -65,5 +65,20 @@ FactoryGirl.define do
         build.trace = 'BUILD TRACE'
       end
     end
+
+    trait :artifacts do
+      after(:create) do |build, _|
+        build.artifacts_file =
+          fixture_file_upload(Rails.root +
+                              'spec/fixtures/ci_build_artifacts.zip',
+                              'application/zip')
+
+        build.artifacts_metadata =
+          fixture_file_upload(Rails.root +
+                              'spec/fixtures/ci_build_artifacts_metadata.gz',
+                              'application/x-gzip')
+        build.save!
+      end
+    end
   end
 end
diff --git a/spec/requests/ci/api/builds_spec.rb b/spec/requests/ci/api/builds_spec.rb
index 244947762dd..e1b6f981538 100644
--- a/spec/requests/ci/api/builds_spec.rb
+++ b/spec/requests/ci/api/builds_spec.rb
@@ -151,8 +151,8 @@ describe Ci::API::API do
     context "Artifacts" do
       let(:file_upload) { fixture_file_upload(Rails.root + 'spec/fixtures/banana_sample.gif', 'image/gif') }
       let(:file_upload2) { fixture_file_upload(Rails.root + 'spec/fixtures/dk.png', 'image/gif') }
-      let(:commit) { FactoryGirl.create(:ci_commit, project: project) }
-      let(:build) { FactoryGirl.create(:ci_build, commit: commit, runner_id: runner.id) }
+      let(:commit) { create(:ci_commit, project: project) }
+      let(:build) { create(:ci_build, commit: commit, runner_id: runner.id) }
       let(:authorize_url) { ci_api("/builds/#{build.id}/artifacts/authorize") }
       let(:post_url) { ci_api("/builds/#{build.id}/artifacts") }
       let(:delete_url) { ci_api("/builds/#{build.id}/artifacts") }
@@ -349,33 +349,46 @@ describe Ci::API::API do
         end
       end
 
-      describe "DELETE /builds/:id/artifacts" do
-        before do
-          build.run!
-          post delete_url, token: build.token, file: file_upload
+      describe 'DELETE /builds/:id/artifacts' do
+        let(:build) { create(:ci_build, :artifacts) }
+        before { delete delete_url, token: build.token }
+
+        it 'should respond valid status' do
+          expect(response.status).to eq(200)
         end
 
-        it "should delete artifact build" do
-          build.success
-          delete delete_url, token: build.token
-          expect(response.status).to eq(200)
+        it 'should remove artifacts file' do
+          expect(build.artifacts_file.exists?).to be_falsy
+        end
+
+        it 'should remove artifacts metadata' do
+          expect(build.artifacts_metadata.exists?).to be_falsy
         end
       end
 
-      describe "GET /builds/:id/artifacts" do
-        before do
-          build.run!
+      describe 'GET /builds/:id/artifacts' do
+        before { get get_url, token: build.token }
+
+        context 'build has artifacts' do
+          let(:build) { create(:ci_build, :artifacts) }
+          let(:download_headers) do
+            { 'Content-Transfer-Encoding'=>'binary',
+              'Content-Disposition'=>'attachment; filename=ci_build_artifacts.zip' }
+          end
+
+          it 'should respond with valid status' do
+            expect(response.status).to eq(200)
+          end
+
+          it 'should download artifact' do
+            expect(response.headers).to include download_headers
+          end
         end
 
-        it "should download artifact" do
-          build.update_attributes(artifacts_file: file_upload)
-          get get_url, token: build.token
-          expect(response.status).to eq(200)
-        end
-
-        it "should fail to download if no artifact uploaded" do
-          get get_url, token: build.token
-          expect(response.status).to eq(404)
+        context 'build does not has artifacts' do
+          it 'should respond with not found' do
+            expect(response.status).to eq(404)
+          end
         end
       end
     end

From 53c917a6c6b410dbc56c75f3282ced8f95829d57 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Thu, 4 Feb 2016 10:16:21 +0100
Subject: [PATCH 008/134] Remove unmaintainable db schema comment from build
 factory

---
 spec/factories/ci/builds.rb | 27 ---------------------------
 1 file changed, 27 deletions(-)

diff --git a/spec/factories/ci/builds.rb b/spec/factories/ci/builds.rb
index f0ae3a18561..c1b6ecd329a 100644
--- a/spec/factories/ci/builds.rb
+++ b/spec/factories/ci/builds.rb
@@ -1,30 +1,3 @@
-# == Schema Information
-#
-# Table name: builds
-#
-#  id                 :integer          not null, primary key
-#  project_id         :integer
-#  status             :string(255)
-#  finished_at        :datetime
-#  trace              :text
-#  created_at         :datetime
-#  updated_at         :datetime
-#  started_at         :datetime
-#  runner_id          :integer
-#  commit_id          :integer
-#  coverage           :float
-#  commands           :text
-#  job_id             :integer
-#  name               :string(255)
-#  deploy             :boolean          default(FALSE)
-#  options            :text
-#  allow_failure      :boolean          default(FALSE), not null
-#  stage              :string(255)
-#  trigger_request_id :integer
-#
-
-# Read about factories at https://github.com/thoughtbot/factory_girl
-
 FactoryGirl.define do
   factory :ci_build, class: Ci::Build do
     name 'test'

From bf6d69483725a99d20a88479e469f55567c7b9fd Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Thu, 4 Feb 2016 10:24:14 +0100
Subject: [PATCH 009/134] Extract shared context level up in build specs

Also improve performance of specs by joining some of examples.
---
 spec/requests/ci/api/builds_spec.rb | 73 +++++++----------------------
 1 file changed, 17 insertions(+), 56 deletions(-)

diff --git a/spec/requests/ci/api/builds_spec.rb b/spec/requests/ci/api/builds_spec.rb
index e1b6f981538..01b369720ca 100644
--- a/spec/requests/ci/api/builds_spec.rb
+++ b/spec/requests/ci/api/builds_spec.rb
@@ -160,12 +160,10 @@ describe Ci::API::API do
       let(:headers) { { "GitLab-Workhorse" => "1.0" } }
       let(:headers_with_token) { headers.merge(Ci::API::Helpers::BUILD_TOKEN_HEADER => build.token) }
 
+      before { build.run! }
+
       describe "POST /builds/:id/artifacts/authorize" do
         context "should authorize posting artifact to running build" do
-          before do
-            build.run!
-          end
-
           it "using token as parameter" do
             post authorize_url, { token: build.token }, headers
             expect(response.status).to eq(200)
@@ -180,10 +178,6 @@ describe Ci::API::API do
         end
 
         context "should fail to post too large artifact" do
-          before do
-            build.run!
-          end
-
           it "using token as parameter" do
             stub_application_setting(max_artifacts_size: 0)
             post authorize_url, { token: build.token, filesize: 100 }, headers
@@ -197,8 +191,8 @@ describe Ci::API::API do
           end
         end
 
-        context "should get denied" do
-          it do
+        context 'token is invalid' do
+          it 'should respond with forbidden'do
             post authorize_url, { token: 'invalid', filesize: 100 }
             expect(response.status).to eq(403)
           end
@@ -206,17 +200,13 @@ describe Ci::API::API do
       end
 
       describe "POST /builds/:id/artifacts" do
-        context "Disable sanitizer" do
+        context "disable sanitizer" do
           before do
             # by configuring this path we allow to pass temp file from any path
             allow(ArtifactUploader).to receive(:artifacts_upload_path).and_return('/')
           end
 
           context "should post artifact to running build" do
-            before do
-              build.run!
-            end
-
             it "uses regual file post" do
               upload_artifacts(file_upload, headers_with_token, false)
               expect(response.status).to eq(201)
@@ -244,10 +234,7 @@ describe Ci::API::API do
             let(:stored_artifacts_file) { build.reload.artifacts_file.file }
             let(:stored_metadata_file) { build.reload.artifacts_metadata.file }
 
-            before do
-              build.run!
-              post(post_url, post_data, headers_with_token)
-            end
+            before { post(post_url, post_data, headers_with_token) }
 
             context 'post data accelerated by workhorse is correct' do
               let(:post_data) do
@@ -257,11 +244,8 @@ describe Ci::API::API do
                   'metadata.name' => metadata.original_filename }
               end
 
-              it 'responds with valid status' do
-                expect(response.status).to eq(201)
-              end
-
               it 'stores artifacts and artifacts metadata' do
+                expect(response.status).to eq(201)
                 expect(stored_artifacts_file.original_filename).to eq(artifacts.original_filename)
                 expect(stored_metadata_file.original_filename).to eq(metadata.original_filename)
               end
@@ -282,56 +266,42 @@ describe Ci::API::API do
             end
           end
 
-
-          context "should fail to post too large artifact" do
-            before do
-              build.run!
-            end
-
-            it do
+          context "artifacts file is too large" do
+            it "should fail to post too large artifact" do
               stub_application_setting(max_artifacts_size: 0)
               upload_artifacts(file_upload, headers_with_token)
               expect(response.status).to eq(413)
             end
           end
 
-          context "should fail to post artifacts without file" do
-            before do
-              build.run!
-            end
-
-            it do
+          context "artifacts post request does not contain file" do
+            it "should fail to post artifacts without file" do
               post post_url, {}, headers_with_token
               expect(response.status).to eq(400)
             end
           end
 
-          context "should fail to post artifacts without GitLab-Workhorse" do
-            before do
-              build.run!
-            end
-
-            it do
+          context 'GitLab Workhorse is not configured' do
+            it "should fail to post artifacts without GitLab-Workhorse" do
               post post_url, { token: build.token }, {}
               expect(response.status).to eq(403)
             end
           end
         end
 
-        context "should fail to post artifacts for outside of tmp path" do
+        context "artifacts are being stored outside of tmp path" do
           before do
             # by configuring this path we allow to pass file from @tmpdir only
             # but all temporary files are stored in system tmp directory
             @tmpdir = Dir.mktmpdir
             allow(ArtifactUploader).to receive(:artifacts_upload_path).and_return(@tmpdir)
-            build.run!
           end
 
           after do
             FileUtils.remove_entry @tmpdir
           end
 
-          it do
+          it "should fail to post artifacts for outside of tmp path" do
             upload_artifacts(file_upload, headers_with_token)
             expect(response.status).to eq(400)
           end
@@ -353,15 +323,9 @@ describe Ci::API::API do
         let(:build) { create(:ci_build, :artifacts) }
         before { delete delete_url, token: build.token }
 
-        it 'should respond valid status' do
+        it 'should remove build artifacts' do
           expect(response.status).to eq(200)
-        end
-
-        it 'should remove artifacts file' do
           expect(build.artifacts_file.exists?).to be_falsy
-        end
-
-        it 'should remove artifacts metadata' do
           expect(build.artifacts_metadata.exists?).to be_falsy
         end
       end
@@ -376,11 +340,8 @@ describe Ci::API::API do
               'Content-Disposition'=>'attachment; filename=ci_build_artifacts.zip' }
           end
 
-          it 'should respond with valid status' do
-            expect(response.status).to eq(200)
-          end
-
           it 'should download artifact' do
+            expect(response.status).to eq(200)
             expect(response.headers).to include download_headers
           end
         end

From 5f7be11aa6d5d9edc31baa09b50ac21ee80533aa Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Thu, 4 Feb 2016 11:09:42 +0100
Subject: [PATCH 010/134] Simplify abilities

---
 app/models/ability.rb | 39 +++++++++++++++++++++++----------------
 1 file changed, 23 insertions(+), 16 deletions(-)

diff --git a/app/models/ability.rb b/app/models/ability.rb
index bf24749b173..e1767ed8dd1 100644
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -5,10 +5,9 @@ class Ability
       return [] unless user.is_a?(User)
       return [] if user.blocked?
 
+      # We check with `is_a?`, because CommitStatus uses inheritance
       if subject.is_a?(CommitStatus)
-        rules = project_abilities(user, subject)
-        rules = filter_build_abilities(rules) if subject.is_a?(Ci::Build)
-        return rules
+        return commit_status_abilities(user, subject)
       end
 
       case subject.class.name
@@ -32,9 +31,7 @@ class Ability
       when subject.is_a?(PersonalSnippet)
         anonymous_personal_snippet_abilities(subject)
       when subject.is_a?(CommitStatus)
-        rules = anonymous_project_abilities(subject)
-        rules = filter_build_abilities(rules) if subject.is_a?(Ci::Build)
-        rules
+        anonymous_commit_status_abilities(subject)
       when subject.is_a?(Project) || subject.respond_to?(:project)
         anonymous_project_abilities(subject)
       when subject.is_a?(Group) || subject.respond_to?(:group)
@@ -66,9 +63,8 @@ class Ability
           :download_code
         ]
 
-        if project.allow_guest_to_access_builds?
-          rules << :read_build
-        end
+        # Allow to read builds by anonymous user if guests are allowed
+        rules << :read_build if project.allow_guest_to_access_builds?
 
         rules - project_disabled_features_rules(project)
       else
@@ -76,6 +72,13 @@ class Ability
       end
     end
 
+    def anonymous_commit_status_abilities(subject)
+      rules = anonymous_project_abilities(subject.project)
+      # If subject is Ci::Build which inherits from CommitStatus filter the abilities
+      rules = filter_build_abilities(rules) if subject.is_a?(Ci::Build)
+      rules
+    end
+
     def anonymous_group_abilities(subject)
       group = if subject.is_a?(Group)
                 subject
@@ -123,18 +126,15 @@ class Ability
 
         elsif team.guest?(user)
           rules.push(*project_guest_rules)
-
-          if project.allow_guest_to_access_builds?
-            rules << :read_build
-          end
         end
 
         if project.public? || project.internal?
           rules.push(*public_project_rules)
+        end
 
-          if project.allow_guest_to_access_builds?
-            rules << :read_build
-          end
+        # Allow to read builds if guests are allowed
+        if team.guest?(user) || project.public? || project.internal?
+          rules << :read_build if project.allow_guest_to_access_builds?
         end
 
         if project.owner == user || user.admin?
@@ -406,6 +406,13 @@ class Ability
       rules
     end
 
+    def commit_status_abilities(user, subject)
+      rules = project_abilities(user, subject.project)
+      # If subject is Ci::Build which inherits from CommitStatus filter the abilities
+      rules = filter_build_abilities(rules) if subject.is_a?(Ci::Build)
+      rules
+    end
+
     def filter_build_abilities(rules)
       # If we can't read build we should also not have that
       # ability when looking at this in context of commit_status

From 6a5a175d9fd1d72cdaab033eefc4191561e619cc Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Thu, 4 Feb 2016 11:14:12 +0100
Subject: [PATCH 011/134] Expose allow_guest_to_access_builds in GitLab API

---
 doc/api/projects.md | 10 ++++++++--
 lib/api/entities.rb |  1 +
 lib/api/projects.rb | 12 +++++++++---
 3 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/doc/api/projects.md b/doc/api/projects.md
index 3f372c955d2..873927f0e74 100644
--- a/doc/api/projects.md
+++ b/doc/api/projects.md
@@ -80,7 +80,9 @@ Parameters:
     "avatar_url": "http://example.com/uploads/project/avatar/4/uploads/avatar.png",
     "shared_runners_enabled": true,
     "forks_count": 0,
-    "star_count": 0
+    "star_count": 0,
+    "runners_token": "b8547b1dc37721d05889db52fa2f02",
+    "allow_guest_to_access_builds": true
   },
   {
     "id": 6,
@@ -137,7 +139,8 @@ Parameters:
     "shared_runners_enabled": true,
     "forks_count": 0,
     "star_count": 0,
-    "runners_token": "b8547b1dc37721d05889db52fa2f02"
+    "runners_token": "b8547b1dc37721d05889db52fa2f02",
+    "allow_guest_to_access_builds": true
   }
 ]
 ```
@@ -424,6 +427,7 @@ Parameters:
 - `public` (optional) - if `true` same as setting visibility_level = 20
 - `visibility_level` (optional)
 - `import_url` (optional)
+- `allow_guest_to_access_builds` (optional)
 
 ### Create project for user
 
@@ -446,6 +450,7 @@ Parameters:
 - `public` (optional) - if `true` same as setting visibility_level = 20
 - `visibility_level` (optional)
 - `import_url` (optional)
+- `allow_guest_to_access_builds` (optional)
 
 ### Edit project
 
@@ -469,6 +474,7 @@ Parameters:
 - `snippets_enabled` (optional)
 - `public` (optional) - if `true` same as setting visibility_level = 20
 - `visibility_level` (optional)
+- `allow_guest_to_access_builds` (optional)
 
 On success, method returns 200 with the updated project. If parameters are
 invalid, 400 is returned.
diff --git a/lib/api/entities.rb b/lib/api/entities.rb
index 82a75734de0..3a68b2c7801 100644
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
@@ -72,6 +72,7 @@ module API
       expose :star_count, :forks_count
       expose :open_issues_count, if: lambda { |project, options| project.issues_enabled? && project.default_issues_tracker? }
       expose :runners_token, if: lambda { |_project, options| options[:user_can_admin_project] }
+      expose :allow_guest_to_access_builds
     end
 
     class ProjectMember < UserBasic
diff --git a/lib/api/projects.rb b/lib/api/projects.rb
index 1f991e600e3..f68598e991b 100644
--- a/lib/api/projects.rb
+++ b/lib/api/projects.rb
@@ -99,6 +99,7 @@ module API
       #   public (optional) - if true same as setting visibility_level = 20
       #   visibility_level (optional) - 0 by default
       #   import_url (optional)
+      #   allow_guest_to_access_builds (optional)
       # Example Request
       #   POST /projects
       post do
@@ -115,7 +116,8 @@ module API
                                      :namespace_id,
                                      :public,
                                      :visibility_level,
-                                     :import_url]
+                                     :import_url,
+                                     :allow_guest_to_access_builds]
         attrs = map_public_to_visibility_level(attrs)
         @project = ::Projects::CreateService.new(current_user, attrs).execute
         if @project.saved?
@@ -145,6 +147,7 @@ module API
       #   public (optional) - if true same as setting visibility_level = 20
       #   visibility_level (optional)
       #   import_url (optional)
+      #   allow_guest_to_access_builds (optional)
       # Example Request
       #   POST /projects/user/:user_id
       post "user/:user_id" do
@@ -161,7 +164,8 @@ module API
                                      :shared_runners_enabled,
                                      :public,
                                      :visibility_level,
-                                     :import_url]
+                                     :import_url,
+                                     :allow_guest_to_access_builds]
         attrs = map_public_to_visibility_level(attrs)
         @project = ::Projects::CreateService.new(user, attrs).execute
         if @project.saved?
@@ -205,6 +209,7 @@ module API
       #   shared_runners_enabled (optional)
       #   public (optional) - if true same as setting visibility_level = 20
       #   visibility_level (optional) - visibility level of a project
+      #   allow_guest_to_access_builds (optional)
       # Example Request
       #   PUT /projects/:id
       put ':id' do
@@ -219,7 +224,8 @@ module API
                                      :snippets_enabled,
                                      :shared_runners_enabled,
                                      :public,
-                                     :visibility_level]
+                                     :visibility_level,
+                                     :allow_guest_to_access_builds]
         attrs = map_public_to_visibility_level(attrs)
         authorize_admin_project
         authorize! :rename_project, user_project if attrs[:name].present?

From b4c36130cc285ac25caef842040e44898eaf858d Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Thu, 4 Feb 2016 12:57:46 +0100
Subject: [PATCH 012/134] Rename allow_guest_to_access_builds to public_builds

---
 app/controllers/projects_controller.rb        |   2 +-
 app/models/ability.rb                         |  10 +-
 app/views/projects/edit.html.haml             |   8 +-
 ...dd_allow_guest_to_access_builds_project.rb |   2 +-
 db/schema.rb                                  |  34 ++--
 doc/api/projects.md                           |  10 +-
 features/steps/shared/project.rb              |   8 +
 lib/api/entities.rb                           |   4 +-
 lib/api/projects.rb                           |  12 +-
 spec/features/builds_spec.rb                  |   2 +-
 spec/features/commits_spec.rb                 | 162 +++++++++++-------
 .../security/project/public_access_spec.rb    |  54 ++++++
 12 files changed, 207 insertions(+), 101 deletions(-)

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 153e7caaae3..14ca7426c2f 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -227,7 +227,7 @@ class ProjectsController < ApplicationController
       :issues_enabled, :merge_requests_enabled, :snippets_enabled, :issues_tracker_id, :default_branch,
       :wiki_enabled, :visibility_level, :import_url, :last_activity_at, :namespace_id, :avatar,
       :builds_enabled, :build_allow_git_fetch, :build_timeout_in_minutes, :build_coverage_regex,
-      :allow_guest_to_access_builds,
+      :public_builds,
     )
   end
 
diff --git a/app/models/ability.rb b/app/models/ability.rb
index e1767ed8dd1..a6862f83158 100644
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -64,7 +64,7 @@ class Ability
         ]
 
         # Allow to read builds by anonymous user if guests are allowed
-        rules << :read_build if project.allow_guest_to_access_builds?
+        rules << :read_build if project.public_builds?
 
         rules - project_disabled_features_rules(project)
       else
@@ -132,9 +132,9 @@ class Ability
           rules.push(*public_project_rules)
         end
 
-        # Allow to read builds if guests are allowed
-        if team.guest?(user) || project.public? || project.internal?
-          rules << :read_build if project.allow_guest_to_access_builds?
+        # Allow to read builds for internal projects
+        if project.public? || project.internal?
+          rules << :read_build if project.public_builds?
         end
 
         if project.owner == user || user.admin?
@@ -172,7 +172,6 @@ class Ability
         :read_project_member,
         :read_merge_request,
         :read_note,
-        :read_commit_status,
         :create_project,
         :create_issue,
         :create_note
@@ -187,6 +186,7 @@ class Ability
         :update_issue,
         :admin_issue,
         :admin_label,
+        :read_commit_status,
         :read_build,
       ]
     end
diff --git a/app/views/projects/edit.html.haml b/app/views/projects/edit.html.haml
index fd61ce6a99a..fdcb6987471 100644
--- a/app/views/projects/edit.html.haml
+++ b/app/views/projects/edit.html.haml
@@ -162,10 +162,10 @@
               .form-group
                 .col-sm-offset-2.col-sm-10
                   .checkbox
-                    = f.label :allow_guest_to_access_builds do
-                      = f.check_box :allow_guest_to_access_builds
-                      %strong Guests can see builds
-                    .help-block Allow guests and anonymous users to access builds including build trace and artifacts
+                    = f.label :public_builds do
+                      = f.check_box :public_builds
+                      %strong Public builds
+                    .help-block Allow everyone to access builds for Public and Internal projects
 
           %fieldset.features
             %legend
diff --git a/db/migrate/20160202164642_add_allow_guest_to_access_builds_project.rb b/db/migrate/20160202164642_add_allow_guest_to_access_builds_project.rb
index 69ce8d08bba..793984343b4 100644
--- a/db/migrate/20160202164642_add_allow_guest_to_access_builds_project.rb
+++ b/db/migrate/20160202164642_add_allow_guest_to_access_builds_project.rb
@@ -1,5 +1,5 @@
 class AddAllowGuestToAccessBuildsProject < ActiveRecord::Migration
   def change
-    add_column :projects, :allow_guest_to_access_builds, :boolean, default: true, null: false
+    add_column :projects, :public_builds, :boolean, default: true, null: false
   end
 end
diff --git a/db/schema.rb b/db/schema.rb
index a04e812ae22..4669a777103 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -650,35 +650,35 @@ ActiveRecord::Schema.define(version: 20160202164642) do
     t.datetime "created_at"
     t.datetime "updated_at"
     t.integer  "creator_id"
-    t.boolean  "issues_enabled",               default: true,     null: false
-    t.boolean  "wall_enabled",                 default: true,     null: false
-    t.boolean  "merge_requests_enabled",       default: true,     null: false
-    t.boolean  "wiki_enabled",                 default: true,     null: false
+    t.boolean  "issues_enabled",         default: true,     null: false
+    t.boolean  "wall_enabled",           default: true,     null: false
+    t.boolean  "merge_requests_enabled", default: true,     null: false
+    t.boolean  "wiki_enabled",           default: true,     null: false
     t.integer  "namespace_id"
-    t.string   "issues_tracker",               default: "gitlab", null: false
+    t.string   "issues_tracker",         default: "gitlab", null: false
     t.string   "issues_tracker_id"
-    t.boolean  "snippets_enabled",             default: true,     null: false
+    t.boolean  "snippets_enabled",       default: true,     null: false
     t.datetime "last_activity_at"
     t.string   "import_url"
-    t.integer  "visibility_level",             default: 0,        null: false
-    t.boolean  "archived",                     default: false,    null: false
+    t.integer  "visibility_level",       default: 0,        null: false
+    t.boolean  "archived",               default: false,    null: false
     t.string   "avatar"
     t.string   "import_status"
-    t.float    "repository_size",              default: 0.0
-    t.integer  "star_count",                   default: 0,        null: false
+    t.float    "repository_size",        default: 0.0
+    t.integer  "star_count",             default: 0,        null: false
     t.string   "import_type"
     t.string   "import_source"
-    t.integer  "commit_count",                 default: 0
+    t.integer  "commit_count",           default: 0
     t.text     "import_error"
     t.integer  "ci_id"
-    t.boolean  "builds_enabled",               default: true,     null: false
-    t.boolean  "shared_runners_enabled",       default: true,     null: false
+    t.boolean  "builds_enabled",         default: true,     null: false
+    t.boolean  "shared_runners_enabled", default: true,     null: false
     t.string   "runners_token"
     t.string   "build_coverage_regex"
-    t.boolean  "build_allow_git_fetch",        default: true,     null: false
-    t.integer  "build_timeout",                default: 3600,     null: false
-    t.boolean  "pending_delete",               default: false
-    t.boolean  "allow_guest_to_access_builds", default: true,     null: false
+    t.boolean  "build_allow_git_fetch",  default: true,     null: false
+    t.integer  "build_timeout",          default: 3600,     null: false
+    t.boolean  "pending_delete",         default: false
+    t.boolean  "public_builds",          default: true,     null: false
   end
 
   add_index "projects", ["builds_enabled", "shared_runners_enabled"], name: "index_projects_on_builds_enabled_and_shared_runners_enabled", using: :btree
diff --git a/doc/api/projects.md b/doc/api/projects.md
index 873927f0e74..9e9486cd87a 100644
--- a/doc/api/projects.md
+++ b/doc/api/projects.md
@@ -82,7 +82,7 @@ Parameters:
     "forks_count": 0,
     "star_count": 0,
     "runners_token": "b8547b1dc37721d05889db52fa2f02",
-    "allow_guest_to_access_builds": true
+    "public_builds": true
   },
   {
     "id": 6,
@@ -140,7 +140,7 @@ Parameters:
     "forks_count": 0,
     "star_count": 0,
     "runners_token": "b8547b1dc37721d05889db52fa2f02",
-    "allow_guest_to_access_builds": true
+    "public_builds": true
   }
 ]
 ```
@@ -427,7 +427,7 @@ Parameters:
 - `public` (optional) - if `true` same as setting visibility_level = 20
 - `visibility_level` (optional)
 - `import_url` (optional)
-- `allow_guest_to_access_builds` (optional)
+- `public_builds` (optional)
 
 ### Create project for user
 
@@ -450,7 +450,7 @@ Parameters:
 - `public` (optional) - if `true` same as setting visibility_level = 20
 - `visibility_level` (optional)
 - `import_url` (optional)
-- `allow_guest_to_access_builds` (optional)
+- `public_builds` (optional)
 
 ### Edit project
 
@@ -474,7 +474,7 @@ Parameters:
 - `snippets_enabled` (optional)
 - `public` (optional) - if `true` same as setting visibility_level = 20
 - `visibility_level` (optional)
-- `allow_guest_to_access_builds` (optional)
+- `public_builds` (optional)
 
 On success, method returns 200 with the updated project. If parameters are
 invalid, 400 is returned.
diff --git a/features/steps/shared/project.rb b/features/steps/shared/project.rb
index d9c75d12238..1200eb319d7 100644
--- a/features/steps/shared/project.rb
+++ b/features/steps/shared/project.rb
@@ -240,6 +240,14 @@ module SharedProject
     end
   end
 
+  step 'public access for builds is enabled' do
+    @project.update(public_builds: true)
+  end
+
+  step 'public access for builds is disabled' do
+    @project.update(public_builds: false)
+  end
+
   def user_owns_project(user_name:, project_name:, visibility: :private)
     user = user_exists(user_name, username: user_name.gsub(/\s/, '').underscore)
     project = Project.find_by(name: project_name)
diff --git a/lib/api/entities.rb b/lib/api/entities.rb
index 3a68b2c7801..1aa6570bd06 100644
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
@@ -72,7 +72,7 @@ module API
       expose :star_count, :forks_count
       expose :open_issues_count, if: lambda { |project, options| project.issues_enabled? && project.default_issues_tracker? }
       expose :runners_token, if: lambda { |_project, options| options[:user_can_admin_project] }
-      expose :allow_guest_to_access_builds
+      expose :public_builds
     end
 
     class ProjectMember < UserBasic
@@ -384,7 +384,7 @@ module API
       #       for downloading of artifacts (see: https://gitlab.com/gitlab-org/gitlab-ce/issues/4255)
       expose :download_url do |repo_obj, options|
         if options[:user_can_download_artifacts]
-          repo_obj.download_url
+          repo_obj.artifacts_download_url
         end
       end
       expose :commit, with: RepoCommit do |repo_obj, _options|
diff --git a/lib/api/projects.rb b/lib/api/projects.rb
index f68598e991b..6067c8b4a5e 100644
--- a/lib/api/projects.rb
+++ b/lib/api/projects.rb
@@ -99,7 +99,7 @@ module API
       #   public (optional) - if true same as setting visibility_level = 20
       #   visibility_level (optional) - 0 by default
       #   import_url (optional)
-      #   allow_guest_to_access_builds (optional)
+      #   public_builds (optional)
       # Example Request
       #   POST /projects
       post do
@@ -117,7 +117,7 @@ module API
                                      :public,
                                      :visibility_level,
                                      :import_url,
-                                     :allow_guest_to_access_builds]
+                                     :public_builds]
         attrs = map_public_to_visibility_level(attrs)
         @project = ::Projects::CreateService.new(current_user, attrs).execute
         if @project.saved?
@@ -147,7 +147,7 @@ module API
       #   public (optional) - if true same as setting visibility_level = 20
       #   visibility_level (optional)
       #   import_url (optional)
-      #   allow_guest_to_access_builds (optional)
+      #   public_builds (optional)
       # Example Request
       #   POST /projects/user/:user_id
       post "user/:user_id" do
@@ -165,7 +165,7 @@ module API
                                      :public,
                                      :visibility_level,
                                      :import_url,
-                                     :allow_guest_to_access_builds]
+                                     :public_builds]
         attrs = map_public_to_visibility_level(attrs)
         @project = ::Projects::CreateService.new(user, attrs).execute
         if @project.saved?
@@ -209,7 +209,7 @@ module API
       #   shared_runners_enabled (optional)
       #   public (optional) - if true same as setting visibility_level = 20
       #   visibility_level (optional) - visibility level of a project
-      #   allow_guest_to_access_builds (optional)
+      #   public_builds (optional)
       # Example Request
       #   PUT /projects/:id
       put ':id' do
@@ -225,7 +225,7 @@ module API
                                      :shared_runners_enabled,
                                      :public,
                                      :visibility_level,
-                                     :allow_guest_to_access_builds]
+                                     :public_builds]
         attrs = map_public_to_visibility_level(attrs)
         authorize_admin_project
         authorize! :rename_project, user_project if attrs[:name].present?
diff --git a/spec/features/builds_spec.rb b/spec/features/builds_spec.rb
index d37bd103714..22e38151bd8 100644
--- a/spec/features/builds_spec.rb
+++ b/spec/features/builds_spec.rb
@@ -8,7 +8,7 @@ describe "Builds" do
     @commit = FactoryGirl.create :ci_commit
     @build = FactoryGirl.create :ci_build, commit: @commit
     @project = @commit.project
-    @project.team << [@user, :master]
+    @project.team << [@user, :developer]
   end
 
   describe "GET /:project/builds" do
diff --git a/spec/features/commits_spec.rb b/spec/features/commits_spec.rb
index 5a62da10619..dacaa96d760 100644
--- a/spec/features/commits_spec.rb
+++ b/spec/features/commits_spec.rb
@@ -8,7 +8,6 @@ describe 'Commits' do
   describe 'CI' do
     before do
       login_as :user
-      project.team << [@user, :master]
       stub_ci_commit_to_return_yaml_file
     end
 
@@ -19,6 +18,10 @@ describe 'Commits' do
     context 'commit status is Generic Commit Status' do
       let!(:status) { FactoryGirl.create :generic_commit_status, commit: commit }
 
+      before do
+        project.team << [@user, :reporter]
+      end
+
       describe 'Commit builds' do
         before do
           visit ci_status_path(commit)
@@ -37,83 +40,124 @@ describe 'Commits' do
 
     context 'commit status is Ci Build' do
       let!(:build) { FactoryGirl.create :ci_build, commit: commit }
+      let(:artifacts_file) { fixture_file_upload(Rails.root + 'spec/fixtures/banana_sample.gif', 'image/gif') }
 
-      describe 'Project commits' do
+      context 'when logged as developer' do
         before do
-          visit namespace_project_commits_path(project.namespace, project, :master)
+          project.team << [@user, :developer]
         end
 
-        it 'should show build status' do
-          page.within("//li[@id='commit-#{commit.short_sha}']") do
-            expect(page).to have_css(".ci-status-link")
+        describe 'Project commits' do
+          before do
+            visit namespace_project_commits_path(project.namespace, project, :master)
+          end
+
+          it 'should show build status' do
+            page.within("//li[@id='commit-#{commit.short_sha}']") do
+              expect(page).to have_css(".ci-status-link")
+            end
+          end
+        end
+
+        describe 'Commit builds' do
+          before do
+            visit ci_status_path(commit)
+          end
+
+          it { expect(page).to have_content commit.sha[0..7] }
+          it { expect(page).to have_content commit.git_commit_message }
+          it { expect(page).to have_content commit.git_author_name }
+        end
+
+        context 'Download artifacts' do
+          before do
+            build.update_attributes(artifacts_file: artifacts_file)
+          end
+
+          it do
+            visit ci_status_path(commit)
+            click_on 'Download artifacts'
+            expect(page.response_headers['Content-Type']).to eq(artifacts_file.content_type)
+          end
+        end
+
+        describe 'Cancel all builds' do
+          it 'cancels commit' do
+            visit ci_status_path(commit)
+            click_on 'Cancel running'
+            expect(page).to have_content 'canceled'
+          end
+        end
+
+        describe 'Cancel build' do
+          it 'cancels build' do
+            visit ci_status_path(commit)
+            click_on 'Cancel'
+            expect(page).to have_content 'canceled'
+          end
+        end
+
+        describe '.gitlab-ci.yml not found warning' do
+          context 'ci builds enabled' do
+            it "does not show warning" do
+              visit ci_status_path(commit)
+              expect(page).not_to have_content '.gitlab-ci.yml not found in this commit'
+            end
+
+            it 'shows warning' do
+              stub_ci_commit_yaml_file(nil)
+              visit ci_status_path(commit)
+              expect(page).to have_content '.gitlab-ci.yml not found in this commit'
+            end
+          end
+
+          context 'ci builds disabled' do
+            before do
+              stub_ci_builds_disabled
+              stub_ci_commit_yaml_file(nil)
+              visit ci_status_path(commit)
+            end
+
+            it 'does not show warning' do
+              expect(page).not_to have_content '.gitlab-ci.yml not found in this commit'
+            end
           end
         end
       end
 
-      describe 'Commit builds' do
-        before do
-          visit ci_status_path(commit)
-        end
-
-        it { expect(page).to have_content commit.sha[0..7] }
-        it { expect(page).to have_content commit.git_commit_message }
-        it { expect(page).to have_content commit.git_author_name }
-      end
-
-      context 'Download artifacts' do
-        let(:artifacts_file) { fixture_file_upload(Rails.root + 'spec/fixtures/banana_sample.gif', 'image/gif') }
-
+      context "when logged as reporter" do
         before do
+          project.team << [@user, :reporter]
           build.update_attributes(artifacts_file: artifacts_file)
+          visit ci_status_path(commit)
         end
 
         it do
-          visit ci_status_path(commit)
-          click_on 'Download artifacts'
-          expect(page.response_headers['Content-Type']).to eq(artifacts_file.content_type)
+          expect(page).to have_content commit.sha[0..7]
+          expect(page).to have_content commit.git_commit_message
+          expect(page).to have_content commit.git_author_name
+          expect(page).to have_link('Download artifacts')
+          expect(page).to_not have_link('Cancel running')
+          expect(page).to_not have_link('Retry failed')
         end
       end
 
-      describe 'Cancel all builds' do
-        it 'cancels commit' do
+      context 'when accessing internal project with disallowed access' do
+        before do
+          project.update(
+            visibility_level: Gitlab::VisibilityLevel::INTERNAL,
+            public_builds: false)
+          build.update_attributes(artifacts_file: artifacts_file)
           visit ci_status_path(commit)
-          click_on 'Cancel running'
-          expect(page).to have_content 'canceled'
-        end
-      end
-
-      describe 'Cancel build' do
-        it 'cancels build' do
-          visit ci_status_path(commit)
-          click_on 'Cancel'
-          expect(page).to have_content 'canceled'
-        end
-      end
-
-      describe '.gitlab-ci.yml not found warning' do
-        context 'ci builds enabled' do
-          it "does not show warning" do
-            visit ci_status_path(commit)
-            expect(page).not_to have_content '.gitlab-ci.yml not found in this commit'
-          end
-
-          it 'shows warning' do
-            stub_ci_commit_yaml_file(nil)
-            visit ci_status_path(commit)
-            expect(page).to have_content '.gitlab-ci.yml not found in this commit'
-          end
         end
 
-        context 'ci builds disabled' do
-          before do
-            stub_ci_builds_disabled
-            stub_ci_commit_yaml_file(nil)
-            visit ci_status_path(commit)
-          end
-
-          it 'does not show warning' do
-            expect(page).not_to have_content '.gitlab-ci.yml not found in this commit'
-          end
+        it do
+          expect(page).to have_content commit.sha[0..7]
+          expect(page).to have_content commit.git_commit_message
+          expect(page).to have_content commit.git_author_name
+          expect(page).to_not have_link('Download artifacts')
+          expect(page).to_not have_link('Cancel running')
+          expect(page).to_not have_link('Retry failed')
         end
       end
     end
diff --git a/spec/features/security/project/public_access_spec.rb b/spec/features/security/project/public_access_spec.rb
index 655d2c8b7d9..b98476f854e 100644
--- a/spec/features/security/project/public_access_spec.rb
+++ b/spec/features/security/project/public_access_spec.rb
@@ -96,6 +96,60 @@ describe "Public Project Access", feature: true  do
     it { is_expected.to be_denied_for :visitor }
   end
 
+  describe "GET /:project_path/builds" do
+    subject { namespace_project_builds_path(project.namespace, project) }
+
+    context "when allowed for public" do
+      before { project.update(public_builds: true) }
+
+      it { is_expected.to be_allowed_for master }
+      it { is_expected.to be_allowed_for reporter }
+      it { is_expected.to be_allowed_for :admin }
+      it { is_expected.to be_allowed_for guest }
+      it { is_expected.to be_allowed_for :user }
+      it { is_expected.to be_allowed_for :visitor }
+    end
+
+    context "when disallowed for public" do
+      before { project.update(public_builds: false) }
+
+      it { is_expected.to be_allowed_for master }
+      it { is_expected.to be_allowed_for reporter }
+      it { is_expected.to be_allowed_for :admin }
+      it { is_expected.to be_denied_for guest }
+      it { is_expected.to be_denied_for :user }
+      it { is_expected.to be_denied_for :visitor }
+    end
+  end
+
+  describe "GET /:project_path/builds/:id" do
+    let(:commit) { create(:ci_commit, project: project) }
+    let(:build) { create(:ci_build, commit: commit) }
+    subject { namespace_project_build_path(project.namespace, project, build.id) }
+
+    context "when allowed for public" do
+      before { project.update(public_builds: true) }
+
+      it { is_expected.to be_allowed_for master }
+      it { is_expected.to be_allowed_for reporter }
+      it { is_expected.to be_allowed_for :admin }
+      it { is_expected.to be_allowed_for guest }
+      it { is_expected.to be_allowed_for :user }
+      it { is_expected.to be_allowed_for :visitor }
+    end
+
+    context "when disallowed for public" do
+      before { project.update(public_builds: false) }
+
+      it { is_expected.to be_allowed_for master }
+      it { is_expected.to be_allowed_for reporter }
+      it { is_expected.to be_allowed_for :admin }
+      it { is_expected.to be_denied_for guest }
+      it { is_expected.to be_denied_for :user }
+      it { is_expected.to be_denied_for :visitor }
+    end
+  end
+
   describe "GET /:project_path/blob" do
     before do
       commit = project.repository.commit

From d231b6b9182ce9f68f267af0a073136c898f6892 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Thu, 4 Feb 2016 13:13:01 +0100
Subject: [PATCH 013/134] Add behaviour tests for build permissions

---
 features/project/builds/permissions.feature | 35 +++++++++++++++++++++
 features/steps/project/builds/summary.rb    |  8 -----
 features/steps/shared/builds.rb             | 17 ++++++++++
 features/steps/shared/project.rb            |  4 +++
 4 files changed, 56 insertions(+), 8 deletions(-)

diff --git a/features/project/builds/permissions.feature b/features/project/builds/permissions.feature
index 1193bcd74f6..3c7f72335d9 100644
--- a/features/project/builds/permissions.feature
+++ b/features/project/builds/permissions.feature
@@ -5,6 +5,41 @@ Feature: Project Builds Permissions
     And project has CI enabled
     And project has a recent build
 
+  Scenario: I try to visit build details as guest
+    Given I am member of a project with a guest role
+    When I visit recent build details page
+    Then page status code should be 404
+
+  Scenario: I try to visit project builds page as guest
+    Given I am member of a project with a guest role
+    When I visit project builds page
+    Then page status code should be 404
+
+  Scenario: I try to visit build details of internal project without access to builds
+    Given The project is internal
+    And public access for builds is disabled
+    When I visit recent build details page
+    Then page status code should be 404
+
+  Scenario: I try to visit internal project builds page without access to builds
+    Given The project is internal
+    And public access for builds is disabled
+    When I visit project builds page
+    Then page status code should be 404
+
+  Scenario: I try to visit build details of internal project with access to builds
+    Given The project is internal
+    And public access for builds is enabled
+    When I visit recent build details page
+    Then I see details of a build
+    And I see build trace
+
+  Scenario: I try to visit internal project builds page with access to builds
+    Given The project is internal
+    And public access for builds is enabled
+    When I visit project builds page
+    Then I see the build
+
   Scenario: I try to download build artifacts as guest
     Given I am member of a project with a guest role
     And recent build has artifacts available
diff --git a/features/steps/project/builds/summary.rb b/features/steps/project/builds/summary.rb
index 036bc0a499e..433253dd44b 100644
--- a/features/steps/project/builds/summary.rb
+++ b/features/steps/project/builds/summary.rb
@@ -4,14 +4,6 @@ class Spinach::Features::ProjectBuildsSummary < Spinach::FeatureSteps
   include SharedBuilds
   include RepoHelpers
 
-  step 'I see details of a build' do
-    expect(page).to have_content "Build ##{@build.id}"
-  end
-
-  step 'I see build trace' do
-    expect(page).to have_css '#build-trace'
-  end
-
   step 'I see button to CI Lint' do
     page.within('.controls') do
       ci_lint_tool_link = page.find_link('CI Lint')
diff --git a/features/steps/shared/builds.rb b/features/steps/shared/builds.rb
index 92bf362879b..726e2e814ad 100644
--- a/features/steps/shared/builds.rb
+++ b/features/steps/shared/builds.rb
@@ -38,4 +38,21 @@ module SharedBuilds
   step 'I access artifacts download page' do
     visit download_namespace_project_build_artifacts_path(@project.namespace, @project, @build)
   end
+
+  step 'I see details of a build' do
+    expect(page).to have_content "Build ##{@build.id}"
+  end
+
+  step 'I see build trace' do
+    expect(page).to have_css '#build-trace'
+  end
+
+  step 'I see the build' do
+    page.within('.commit_status') do
+      expect(page).to have_content "##{@build.id}"
+      expect(page).to have_content @build.sha[0..7]
+      expect(page).to have_content @build.ref
+      expect(page).to have_content @build.name
+    end
+  end
 end
diff --git a/features/steps/shared/project.rb b/features/steps/shared/project.rb
index 1200eb319d7..b13e82f276b 100644
--- a/features/steps/shared/project.rb
+++ b/features/steps/shared/project.rb
@@ -240,6 +240,10 @@ module SharedProject
     end
   end
 
+  step 'The project is internal' do
+    @project.update(visibility_level: Gitlab::VisibilityLevel::INTERNAL)
+  end
+
   step 'public access for builds is enabled' do
     @project.update(public_builds: true)
   end

From c64c106091ee5526e9413b9929205134c0ce114f Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Thu, 4 Feb 2016 14:43:52 +0100
Subject: [PATCH 014/134] Update ability model after comments

---
 app/models/ability.rb | 39 +++++++++++++++------------------------
 1 file changed, 15 insertions(+), 24 deletions(-)

diff --git a/app/models/ability.rb b/app/models/ability.rb
index a6862f83158..00f5f3a93b3 100644
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -5,22 +5,18 @@ class Ability
       return [] unless user.is_a?(User)
       return [] if user.blocked?
 
-      # We check with `is_a?`, because CommitStatus uses inheritance
-      if subject.is_a?(CommitStatus)
-        return commit_status_abilities(user, subject)
-      end
-
-      case subject.class.name
-      when "Project" then project_abilities(user, subject)
-      when "Issue" then issue_abilities(user, subject)
-      when "Note" then note_abilities(user, subject)
-      when "ProjectSnippet" then project_snippet_abilities(user, subject)
-      when "PersonalSnippet" then personal_snippet_abilities(user, subject)
-      when "MergeRequest" then merge_request_abilities(user, subject)
-      when "Group" then group_abilities(user, subject)
-      when "Namespace" then namespace_abilities(user, subject)
-      when "GroupMember" then group_member_abilities(user, subject)
-      when "ProjectMember" then project_member_abilities(user, subject)
+      case subject
+      when CommitStatus then commit_status_abilities(user, subject)
+      when Project then project_abilities(user, subject)
+      when Issue then issue_abilities(user, subject)
+      when Note then note_abilities(user, subject)
+      when ProjectSnippet then project_snippet_abilities(user, subject)
+      when PersonalSnippet then personal_snippet_abilities(user, subject)
+      when MergeRequest then merge_request_abilities(user, subject)
+      when Group then group_abilities(user, subject)
+      when Namespace then namespace_abilities(user, subject)
+      when GroupMember then group_member_abilities(user, subject)
+      when ProjectMember then project_member_abilities(user, subject)
       else []
       end.concat(global_abilities(user))
     end
@@ -130,10 +126,8 @@ class Ability
 
         if project.public? || project.internal?
           rules.push(*public_project_rules)
-        end
 
-        # Allow to read builds for internal projects
-        if project.public? || project.internal?
+          # Allow to read builds for internal projects
           rules << :read_build if project.public_builds?
         end
 
@@ -416,11 +410,8 @@ class Ability
     def filter_build_abilities(rules)
       # If we can't read build we should also not have that
       # ability when looking at this in context of commit_status
-      unless rules.include?(:read_build)
-        rules -= [:read_commit_status]
-      end
-      unless rules.include?(:update_build)
-        rules -= [:update_commit_status]
+      %w(read create update admin).each do |rule|
+        rules -= [:"#{rule}_commit_status"] unless rules.include?(:"#{rule}_build")
       end
       rules
     end

From a7c441aa17ba64eb702b583ac9198cdace599d2e Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Thu, 4 Feb 2016 16:32:41 +0100
Subject: [PATCH 015/134] Use `delete` instead of assignment operator when
 filtering build abilities

---
 app/models/ability.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/ability.rb b/app/models/ability.rb
index 00f5f3a93b3..a866eadeebb 100644
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -411,7 +411,7 @@ class Ability
       # If we can't read build we should also not have that
       # ability when looking at this in context of commit_status
       %w(read create update admin).each do |rule|
-        rules -= [:"#{rule}_commit_status"] unless rules.include?(:"#{rule}_build")
+        rules.delete(:"#{rule}_commit_status") unless rules.include?(:"#{rule}_build")
       end
       rules
     end

From 9b925d79c9bfcd1be46bd52e275570a1005a3a79 Mon Sep 17 00:00:00 2001
From: James Lopez <james@jameslopez.es>
Date: Thu, 4 Feb 2016 18:36:16 +0100
Subject: [PATCH 016/134] WIP - fix and spec for cross reference issue with
 forks

---
 app/services/system_note_service.rb       |  4 ++--
 spec/services/system_note_service_spec.rb | 16 ++++++++++++++++
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/app/services/system_note_service.rb b/app/services/system_note_service.rb
index 1083bcec054..34b6636c39f 100644
--- a/app/services/system_note_service.rb
+++ b/app/services/system_note_service.rb
@@ -291,8 +291,8 @@ class SystemNoteService
       notes = notes.where(noteable_id: noteable.id)
     end
 
-    gfm_reference = mentioner.gfm_reference(noteable.project)
-    notes = notes.where(note: cross_reference_note_content(gfm_reference))
+    gfm_reference = mentioner.gfm_reference(nil)
+    notes = notes.where('note LIKE ?', "#{cross_reference_note_prefix}%#{gfm_reference}")
 
     notes.count > 0
   end
diff --git a/spec/services/system_note_service_spec.rb b/spec/services/system_note_service_spec.rb
index d3364a71022..a3d3147a79b 100644
--- a/spec/services/system_note_service_spec.rb
+++ b/spec/services/system_note_service_spec.rb
@@ -424,6 +424,22 @@ describe SystemNoteService, services: true do
           to be_falsey
       end
     end
+
+    context 'commit from fork' do
+      let(:author2) { create(:user) }
+      let(:forked_project) { Projects::ForkService.new(project, author2).execute }
+      let(:service) { CreateCommitBuildsService.new }
+      let(:commit2) { forked_project.commit }
+
+      before do
+        described_class.cross_reference(commit0, commit2, author2)
+      end
+
+      it 'is falsey when is a fork mentioning an external issue' do
+        expect(described_class.cross_reference_exists?(commit0, commit2)).
+            to be_falsey
+      end
+    end
   end
 
   include JiraServiceHelper

From c663ca434fb6c8a2251e4251c6f0f9d13660ccbe Mon Sep 17 00:00:00 2001
From: James Lopez <james@jameslopez.es>
Date: Thu, 4 Feb 2016 18:38:11 +0100
Subject: [PATCH 017/134] remove unnecessary lower function on SQL

---
 .../20160129135155_remove_dot_atom_path_ending_of_projects.rb   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/db/migrate/20160129135155_remove_dot_atom_path_ending_of_projects.rb b/db/migrate/20160129135155_remove_dot_atom_path_ending_of_projects.rb
index 091de54978b..d3ea956952e 100644
--- a/db/migrate/20160129135155_remove_dot_atom_path_ending_of_projects.rb
+++ b/db/migrate/20160129135155_remove_dot_atom_path_ending_of_projects.rb
@@ -48,7 +48,7 @@ class RemoveDotAtomPathEndingOfProjects < ActiveRecord::Migration
   end
 
   def projects_with_dot_atom
-    select_all("SELECT p.id, p.path, n.path as namespace_path, n.id as namespace_id FROM projects p inner join namespaces n on n.id = p.namespace_id WHERE lower(p.path) LIKE '%.atom'")
+    select_all("SELECT p.id, p.path, n.path as namespace_path, n.id as namespace_id FROM projects p inner join namespaces n on n.id = p.namespace_id WHERE p.path LIKE '%.atom'")
   end
 
   def up

From 5f38dbc026add6b4afd2d74b4b664d2c63e12222 Mon Sep 17 00:00:00 2001
From: Drew Blessing <drew@gitlab.com>
Date: Thu, 4 Feb 2016 13:40:42 -0600
Subject: [PATCH 018/134] Increase project import timeout from 4 minutes to 15
 minutes

Many users were experiencing timeouts when we only allowed
4 minutes before a timeout. A 15 minute timeout is more
than reasonable and prevents us from having to add a
configuration for this.

Fixes gitlab-org/gitlab-ee#246
---
 CHANGELOG                               | 1 +
 app/views/shared/_import_form.html.haml | 2 +-
 lib/gitlab/backend/shell.rb             | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index b7e8822fdd6..76e776742b4 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -14,6 +14,7 @@ v 8.5.0 (unreleased)
   - Fix diff comments loaded by AJAX to load comment with diff in discussion tab
   - Whitelist raw "abbr" elements when parsing Markdown (Benedict Etzel)
   - Don't vendor minified JS
+  - Increase project import timeout to 15 minutes
   - Display 404 error on group not found
   - Track project import failure
   - Support Two-factor Authentication for LDAP users
diff --git a/app/views/shared/_import_form.html.haml b/app/views/shared/_import_form.html.haml
index 285af56ad73..627814bcfae 100644
--- a/app/views/shared/_import_form.html.haml
+++ b/app/views/shared/_import_form.html.haml
@@ -11,6 +11,6 @@
         %li
           If your HTTP repository is not publicly accessible, add authentication information to the URL: <code>https://username:password@gitlab.company.com/group/project.git</code>.
         %li
-          The import will time out after 4 minutes. For big repositories, use a clone/push combination.
+          The import will time out after 15 minutes. For repositories that take longer, use a clone/push combination.
         %li
           To migrate an SVN repository, check out #{link_to "this document", "http://doc.gitlab.com/ce/workflow/importing/migrating_from_svn.html"}.
diff --git a/lib/gitlab/backend/shell.rb b/lib/gitlab/backend/shell.rb
index f751458ac66..b9bb6e76081 100644
--- a/lib/gitlab/backend/shell.rb
+++ b/lib/gitlab/backend/shell.rb
@@ -36,7 +36,7 @@ module Gitlab
     #   import_repository("gitlab/gitlab-ci", "https://github.com/randx/six.git")
     #
     def import_repository(name, url)
-      output, status = Popen::popen([gitlab_shell_projects_path, 'import-project', "#{name}.git", url, '240'])
+      output, status = Popen::popen([gitlab_shell_projects_path, 'import-project', "#{name}.git", url, '900'])
       raise Error, output unless status.zero?
       true
     end

From be3399868cbcfdce85daa6fdf53a079bc163056a Mon Sep 17 00:00:00 2001
From: Zeger-Jan van de Weg <mail@zjvandeweg.nl>
Date: Mon, 2 Nov 2015 19:02:08 +0100
Subject: [PATCH 019/134] Minor refactoring on Gitlab::Git

---
 lib/gitlab/git.rb           | 7 ++++---
 spec/lib/gitlab/git_spec.rb | 9 +++++++++
 2 files changed, 13 insertions(+), 3 deletions(-)
 create mode 100644 spec/lib/gitlab/git_spec.rb

diff --git a/lib/gitlab/git.rb b/lib/gitlab/git.rb
index f065cc5e9e9..a33daeb119f 100644
--- a/lib/gitlab/git.rb
+++ b/lib/gitlab/git.rb
@@ -1,8 +1,9 @@
 module Gitlab
   module Git
-    BLANK_SHA = '0' * 40
-    TAG_REF_PREFIX = "refs/tags/"
-    BRANCH_REF_PREFIX = "refs/heads/"
+    # '0' * 40 -- this was easyer to freeze
+    BLANK_SHA = "0000000000000000000000000000000000000000".freeze
+    TAG_REF_PREFIX = "refs/tags/".freeze
+    BRANCH_REF_PREFIX = "refs/heads/".freeze
 
     class << self
       def ref_name(ref)
diff --git a/spec/lib/gitlab/git_spec.rb b/spec/lib/gitlab/git_spec.rb
new file mode 100644
index 00000000000..3b4052fa549
--- /dev/null
+++ b/spec/lib/gitlab/git_spec.rb
@@ -0,0 +1,9 @@
+require 'spec_helper'
+
+describe Gitlab::Git do
+  describe "BLANK_SHA" do
+    it "is a string of 40 zero's" do
+      expect(Gitlab::Git::BLANK_SHA).to eq('0' * 40)
+    end
+  end
+end

From 5ffec2c953478fbad35d7e7f4fc4b6eb119d7918 Mon Sep 17 00:00:00 2001
From: Zeger-Jan van de Weg <mail@zjvandeweg.nl>
Date: Tue, 3 Nov 2015 13:09:18 +0100
Subject: [PATCH 020/134] Freeze the expression instead of the literal

Also remove the spec for it
---
 lib/gitlab/git.rb           | 3 +--
 spec/lib/gitlab/git_spec.rb | 9 ---------
 2 files changed, 1 insertion(+), 11 deletions(-)
 delete mode 100644 spec/lib/gitlab/git_spec.rb

diff --git a/lib/gitlab/git.rb b/lib/gitlab/git.rb
index a33daeb119f..191bea86ac3 100644
--- a/lib/gitlab/git.rb
+++ b/lib/gitlab/git.rb
@@ -1,7 +1,6 @@
 module Gitlab
   module Git
-    # '0' * 40 -- this was easyer to freeze
-    BLANK_SHA = "0000000000000000000000000000000000000000".freeze
+    BLANK_SHA = ('0' * 40).freeze
     TAG_REF_PREFIX = "refs/tags/".freeze
     BRANCH_REF_PREFIX = "refs/heads/".freeze
 
diff --git a/spec/lib/gitlab/git_spec.rb b/spec/lib/gitlab/git_spec.rb
deleted file mode 100644
index 3b4052fa549..00000000000
--- a/spec/lib/gitlab/git_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe Gitlab::Git do
-  describe "BLANK_SHA" do
-    it "is a string of 40 zero's" do
-      expect(Gitlab::Git::BLANK_SHA).to eq('0' * 40)
-    end
-  end
-end

From 94af78ac4a7a0b76eb370a22320ee6410b6a4695 Mon Sep 17 00:00:00 2001
From: Valery Sizov <valery@gitlab.com>
Date: Fri, 5 Feb 2016 18:20:29 +0200
Subject: [PATCH 021/134] Faster snippet search

---
 CHANGELOG                                     |  1 +
 app/helpers/snippets_helper.rb                |  6 +--
 .../search/results/_snippet_blob.html.haml    | 44 ++++++++++---------
 lib/gitlab/snippet_search_results.rb          |  8 +---
 4 files changed, 30 insertions(+), 29 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index d43b8f69063..b510ade27e8 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -34,6 +34,7 @@ v 8.5.0 (unreleased)
   - Add sort dropdown to dashboard projects page
   - Hide remove source branch button when the MR is merged but new commits are pushed (Zeger-Jan van de Weg)
   - In seach autocomplete show only groups and projects you are member of
+  - Faster snippet search
 
 v 8.4.3
   - Increase lfs_objects size column to 8-byte integer to allow files larger
diff --git a/app/helpers/snippets_helper.rb b/app/helpers/snippets_helper.rb
index bc36434f549..41ae4048992 100644
--- a/app/helpers/snippets_helper.rb
+++ b/app/helpers/snippets_helper.rb
@@ -33,7 +33,7 @@ module SnippetsHelper
   # surrounding code.
   #
   # @returns Array, unique and sorted.
-  def matching_lines(lined_content, surrounding_lines)
+  def matching_lines(lined_content, surrounding_lines, query)
     used_lines = []
     lined_content.each_with_index do |line, line_number|
       used_lines.concat bounded_line_numbers(
@@ -51,9 +51,9 @@ module SnippetsHelper
   # surrounding_lines() worth of unmatching lines.
   #
   # @returns a hash with {snippet_object, snippet_chunks:{data,start_line}}
-  def chunk_snippet(snippet, surrounding_lines = 3)
+  def chunk_snippet(snippet, query, surrounding_lines = 3)
     lined_content = snippet.content.split("\n")
-    used_lines = matching_lines(lined_content, surrounding_lines)
+    used_lines = matching_lines(lined_content, surrounding_lines, query)
 
     snippet_chunk = []
     snippet_chunks = []
diff --git a/app/views/search/results/_snippet_blob.html.haml b/app/views/search/results/_snippet_blob.html.haml
index dcd61199717..6b77d24f50c 100644
--- a/app/views/search/results/_snippet_blob.html.haml
+++ b/app/views/search/results/_snippet_blob.html.haml
@@ -1,46 +1,50 @@
+- snippet_blob = chunk_snippet(snippet_blob, @search_term)
+- snippet = snippet_blob[:snippet_object]
+- snippet_chunks = snippet_blob[:snippet_chunks]
+
 .search-result-row
   %span
-    = snippet_blob[:snippet_object].title
+    = snippet.title
     by
-    = link_to user_snippets_path(snippet_blob[:snippet_object].author) do
-      = image_tag avatar_icon(snippet_blob[:snippet_object].author_email), class: "avatar avatar-inline s16", alt: ''
-      = snippet_blob[:snippet_object].author_name
-    %span.light #{time_ago_with_tooltip(snippet_blob[:snippet_object].created_at)}
+    = link_to user_snippets_path(snippet.author) do
+      = image_tag avatar_icon(snippet.author_email), class: "avatar avatar-inline s16", alt: ''
+      = snippet.author_name
+    %span.light #{time_ago_with_tooltip(snippet.created_at)}
   %h4.snippet-title
-  - snippet_path = reliable_snippet_path(snippet_blob[:snippet_object])
+  - snippet_path = reliable_snippet_path(snippet)
   = link_to snippet_path do
     .file-holder
       .file-title
         %i.fa.fa-file
-        %strong= snippet_blob[:snippet_object].file_name
-      - if markup?(snippet_blob[:snippet_object].file_name)
+        %strong= snippet.file_name
+      - if markup?(snippet.file_name)
         .file-content.wiki
-          - snippet_blob[:snippet_chunks].each do |snippet|
-            - unless snippet[:data].empty?
-              = render_markup(snippet_blob[:snippet_object].file_name, snippet[:data])
+          - snippet_chunks.each do |chunk|
+            - unless chunk[:data].empty?
+              = render_markup(snippet.file_name, chunk[:data])
             - else
               .file-content.code
                 .nothing-here-block Empty file
       - else
         .file-content.code.js-syntax-highlight
           .line-numbers
-            - snippet_blob[:snippet_chunks].each do |snippet|
-              - unless snippet[:data].empty?
-                - snippet[:data].lines.to_a.size.times do |index|
-                  - offset = defined?(snippet[:start_line]) ? snippet[:start_line] : 1
+            - snippet_chunks.each do |chunk|
+              - unless chunk[:data].empty?
+                - chunk[:data].lines.to_a.size.times do |index|
+                  - offset = defined?(chunk[:start_line]) ? chunk[:start_line] : 1
                   - i = index + offset
                   = link_to snippet_path+"#L#{i}", id: "L#{i}", rel: "#L#{i}", class: "diff-line-num" do
                     %i.fa.fa-link
                     = i
-                - unless snippet == snippet_blob[:snippet_chunks].last
+                - unless snippet == snippet_chunks.last
                   %a.diff-line-num
                     = "."
           %pre.code
             %code
-              - snippet_blob[:snippet_chunks].each do |snippet|
-                - unless snippet[:data].empty?
-                  = snippet[:data]
-                  - unless snippet == snippet_blob[:snippet_chunks].last
+              - snippet_chunks.each do |chunk|
+                - unless chunk[:data].empty?
+                  = chunk[:data]
+                  - unless chunk == snippet_chunks.last
                     %a
                       = "..."
                 - else
diff --git a/lib/gitlab/snippet_search_results.rb b/lib/gitlab/snippet_search_results.rb
index 38364a0b151..cadb010ef03 100644
--- a/lib/gitlab/snippet_search_results.rb
+++ b/lib/gitlab/snippet_search_results.rb
@@ -14,7 +14,7 @@ module Gitlab
       when 'snippet_titles'
         Kaminari.paginate_array(snippet_titles).page(page).per(per_page)
       when 'snippet_blobs'
-        Kaminari.paginate_array(snippet_blobs).page(page).per(per_page)
+        snippet_blobs.page(page).per(per_page)
       else
         super
       end
@@ -39,11 +39,7 @@ module Gitlab
     end
 
     def snippet_blobs
-      search = Snippet.where(id: limit_snippet_ids).search_code(query)
-      search = search.order('updated_at DESC').to_a
-      snippets = []
-      search.each { |e| snippets << chunk_snippet(e) }
-      snippets
+      Snippet.where(id: limit_snippet_ids).search_code(query).order('updated_at DESC')
     end
 
     def default_scope

From 8f929b8747daf446bb6d31197e69f8948b951189 Mon Sep 17 00:00:00 2001
From: Valery Sizov <valery@gitlab.com>
Date: Fri, 5 Feb 2016 18:27:12 +0200
Subject: [PATCH 022/134] one more improvement to snippet search

---
 lib/gitlab/snippet_search_results.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/gitlab/snippet_search_results.rb b/lib/gitlab/snippet_search_results.rb
index cadb010ef03..addda95be2b 100644
--- a/lib/gitlab/snippet_search_results.rb
+++ b/lib/gitlab/snippet_search_results.rb
@@ -12,7 +12,7 @@ module Gitlab
     def objects(scope, page = nil)
       case scope
       when 'snippet_titles'
-        Kaminari.paginate_array(snippet_titles).page(page).per(per_page)
+        snippet_titles.page(page).per(per_page)
       when 'snippet_blobs'
         snippet_blobs.page(page).per(per_page)
       else

From a64d881bac1e7b846a718ce1f105b7e39f4dd1b3 Mon Sep 17 00:00:00 2001
From: James Lopez <james@jameslopez.es>
Date: Fri, 5 Feb 2016 17:43:05 +0100
Subject: [PATCH 024/134] fixed spec - at last!

---
 spec/services/system_note_service_spec.rb | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/spec/services/system_note_service_spec.rb b/spec/services/system_note_service_spec.rb
index a3d3147a79b..655efa0670b 100644
--- a/spec/services/system_note_service_spec.rb
+++ b/spec/services/system_note_service_spec.rb
@@ -428,15 +428,14 @@ describe SystemNoteService, services: true do
     context 'commit from fork' do
       let(:author2) { create(:user) }
       let(:forked_project) { Projects::ForkService.new(project, author2).execute }
-      let(:service) { CreateCommitBuildsService.new }
       let(:commit2) { forked_project.commit }
 
       before do
-        described_class.cross_reference(commit0, commit2, author2)
+        described_class.cross_reference(noteable, commit2, author2)
       end
 
       it 'is falsey when is a fork mentioning an external issue' do
-        expect(described_class.cross_reference_exists?(commit0, commit2)).
+        expect(described_class.cross_reference_exists?(noteable, commit2)).
             to be_falsey
       end
     end

From 08064767615ad7b0e2599aed94c53117516e8377 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Fri, 5 Feb 2016 20:17:58 +0100
Subject: [PATCH 025/134] Remove current_user && when can? is used

---
 app/views/admin/builds/_build.html.haml  | 2 +-
 app/views/projects/builds/show.html.haml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/admin/builds/_build.html.haml b/app/views/admin/builds/_build.html.haml
index bd7fb0b36f4..34d955568f2 100644
--- a/app/views/admin/builds/_build.html.haml
+++ b/app/views/admin/builds/_build.html.haml
@@ -63,7 +63,7 @@
       - if can?(current_user, :read_build, project) && build.artifacts?
         = link_to build.artifacts_download_url, title: 'Download artifacts' do
           %i.fa.fa-download
-      - if current_user && can?(current_user, :update_build, build.project)
+      - if can?(current_user, :update_build, build.project)
         - if build.active?
           - if build.cancel_url
             = link_to build.cancel_url, method: :post, title: 'Cancel' do
diff --git a/app/views/projects/builds/show.html.haml b/app/views/projects/builds/show.html.haml
index c43d6c3b427..ca1441a20d8 100644
--- a/app/views/projects/builds/show.html.haml
+++ b/app/views/projects/builds/show.html.haml
@@ -101,7 +101,7 @@
       .build-widget
         %h4.title
           Build ##{@build.id}
-          - if current_user && can?(current_user, :update_build, @project)
+          - if can?(current_user, :update_build, @project)
             .pull-right
               - if @build.cancel_url
                 = link_to "Cancel", @build.cancel_url, class: 'btn btn-sm btn-danger', method: :post

From ebeb35a01cc41eb1b55271644a633397ca4ce7a1 Mon Sep 17 00:00:00 2001
From: Jacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home>
Date: Fri, 5 Feb 2016 18:18:34 -0500
Subject: [PATCH 026/134] Fix ugly state of dropdown

when editing a dropdown,
but not changing anything you end up in an ugly state
Fixes #13215
---
 app/assets/stylesheets/pages/issuable.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/pages/issuable.scss b/app/assets/stylesheets/pages/issuable.scss
index 9d5dc42b6cc..c0b5557bcbd 100644
--- a/app/assets/stylesheets/pages/issuable.scss
+++ b/app/assets/stylesheets/pages/issuable.scss
@@ -75,7 +75,7 @@
       border: none;
     }
 
-    span {
+    span:not(.select2-container span) {
       margin-top: 7px;
       display: inline-block;
     }

From d164f1982a865ea5ba7aa33308804cff755c6858 Mon Sep 17 00:00:00 2001
From: Jacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home>
Date: Fri, 5 Feb 2016 18:21:50 -0500
Subject: [PATCH 027/134] Change hover color of sidebar buttons

---
 app/assets/stylesheets/pages/issuable.scss | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/assets/stylesheets/pages/issuable.scss b/app/assets/stylesheets/pages/issuable.scss
index c0b5557bcbd..95e3758b0f1 100644
--- a/app/assets/stylesheets/pages/issuable.scss
+++ b/app/assets/stylesheets/pages/issuable.scss
@@ -194,6 +194,11 @@
     border: 1px solid $border-gray-normal;
   }
 
+  .btn:hover {
+    background: $gray-dark;
+    border: 1px solid $border-gray-dark;
+  }
+
   &.right-sidebar-collapsed {
     .issuable-count,
     .issuable-nav,

From 9860bd72abe3cfd81cc4fdf367a65a310674180b Mon Sep 17 00:00:00 2001
From: Jacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home>
Date: Fri, 5 Feb 2016 18:25:26 -0500
Subject: [PATCH 028/134] Add hover for gutter toggle button

---
 app/assets/stylesheets/pages/issuable.scss | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/app/assets/stylesheets/pages/issuable.scss b/app/assets/stylesheets/pages/issuable.scss
index 95e3758b0f1..93b88a11388 100644
--- a/app/assets/stylesheets/pages/issuable.scss
+++ b/app/assets/stylesheets/pages/issuable.scss
@@ -88,6 +88,10 @@
       margin-left: 20px;
       border-left: 1px solid $border-gray-light;
       padding-left: 10px;
+
+      &:hover {
+        color: $gray-darkest;
+      }
     }
   }
 
@@ -192,11 +196,10 @@
   .btn {
     background: $gray-normal;
     border: 1px solid $border-gray-normal;
-  }
-
-  .btn:hover {
-    background: $gray-dark;
-    border: 1px solid $border-gray-dark;
+    &:hover {
+      background: $gray-dark;
+      border: 1px solid $border-gray-dark;
+    }
   }
 
   &.right-sidebar-collapsed {

From dcfdef689a250ae4db6a92a1ad4413f2a86c9113 Mon Sep 17 00:00:00 2001
From: Jacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home>
Date: Fri, 5 Feb 2016 18:29:17 -0500
Subject: [PATCH 029/134] Fix span margin issues

---
 app/assets/stylesheets/pages/issuable.scss | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/pages/issuable.scss b/app/assets/stylesheets/pages/issuable.scss
index 93b88a11388..c440388090e 100644
--- a/app/assets/stylesheets/pages/issuable.scss
+++ b/app/assets/stylesheets/pages/issuable.scss
@@ -75,11 +75,15 @@
       border: none;
     }
 
-    span:not(.select2-container span) {
+    span {
       margin-top: 7px;
       display: inline-block;
     }
 
+    .select2-container span {
+      margin-top: 0;
+    }
+
     .issuable-count {
 
     }

From 306c50cecde50b0bbfc9d665a09ecd2fa1676005 Mon Sep 17 00:00:00 2001
From: Jacob Schatz <jacobschatz@Jacobs-MBP.fios-router.home>
Date: Fri, 5 Feb 2016 19:43:18 -0500
Subject: [PATCH 030/134] Make copy button in collapsed sidebar work.

---
 app/assets/stylesheets/pages/issuable.scss   | 13 +++++++++++++
 app/views/shared/issuable/_sidebar.html.haml |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/pages/issuable.scss b/app/assets/stylesheets/pages/issuable.scss
index c440388090e..ef62f069dc2 100644
--- a/app/assets/stylesheets/pages/issuable.scss
+++ b/app/assets/stylesheets/pages/issuable.scss
@@ -235,6 +235,19 @@
         display: block;
         margin-top: 0;
       }
+
+      .btn-clipboard {
+        border: none;
+
+        &:hover {
+          background: transparent;
+        }
+
+        i {
+          color: #999999;
+        }
+      }
+
     }
 
   }
diff --git a/app/views/shared/issuable/_sidebar.html.haml b/app/views/shared/issuable/_sidebar.html.haml
index ae96a45453f..eb19b936e3e 100644
--- a/app/views/shared/issuable/_sidebar.html.haml
+++ b/app/views/shared/issuable/_sidebar.html.haml
@@ -118,7 +118,7 @@
       - project_ref = cross_project_reference(@project, issuable)
       .block.project-reference
         .sidebar-collapsed-icon
-          = icon('clipboard')
+          = clipboard_button(clipboard_text: project_ref)
         .title
         .cross-project-reference
           %span

From 311f407651e9ad1859bb0e9b6b9d6de79fde1a3d Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Sat, 6 Feb 2016 15:01:37 +0100
Subject: [PATCH 031/134] Fix commit status tests

---
 spec/requests/api/commit_status_spec.rb | 48 +++++++++++++++----------
 1 file changed, 30 insertions(+), 18 deletions(-)

diff --git a/spec/requests/api/commit_status_spec.rb b/spec/requests/api/commit_status_spec.rb
index 21482fc1070..89b554622ef 100644
--- a/spec/requests/api/commit_status_spec.rb
+++ b/spec/requests/api/commit_status_spec.rb
@@ -2,18 +2,17 @@ require 'spec_helper'
 
 describe API::CommitStatus, api: true do
   include ApiHelpers
-  let(:user) { create(:user) }
-  let(:user2) { create(:user) }
-  let!(:project) { create(:project, creator_id: user.id) }
-  let!(:reporter) { create(:project_member, user: user, project: project, access_level: ProjectMember::REPORTER) }
-  let!(:guest) { create(:project_member, user: user2, project: project, access_level: ProjectMember::GUEST) }
+  let!(:project) { create(:project) }
   let(:commit) { project.repository.commit }
   let!(:ci_commit) { project.ensure_ci_commit(commit.id) }
   let(:commit_status) { create(:commit_status, commit: ci_commit) }
+  let(:guest) { create_user(ProjectMember::GUEST) }
+  let(:reporter) { create_user(ProjectMember::REPORTER) }
+  let(:developer) { create_user(ProjectMember::DEVELOPER) }
 
   describe "GET /projects/:id/repository/commits/:sha/statuses" do
     it_behaves_like 'a paginated resources' do
-      let(:request) { get api("/projects/#{project.id}/repository/commits/#{commit.id}/statuses", user) }
+      let(:request) { get api("/projects/#{project.id}/repository/commits/#{commit.id}/statuses", reporter) }
     end
 
     context "reporter user" do
@@ -29,7 +28,7 @@ describe API::CommitStatus, api: true do
       end
 
       it "should return latest commit statuses" do
-        get api("/projects/#{project.id}/repository/commits/#{commit.id}/statuses", user)
+        get api("/projects/#{project.id}/repository/commits/#{commit.id}/statuses", reporter)
         expect(response.status).to eq(200)
 
         expect(json_response).to be_an Array
@@ -39,7 +38,7 @@ describe API::CommitStatus, api: true do
       end
 
       it "should return all commit statuses" do
-        get api("/projects/#{project.id}/repository/commits/#{commit.id}/statuses?all=1", user)
+        get api("/projects/#{project.id}/repository/commits/#{commit.id}/statuses?all=1", reporter)
         expect(response.status).to eq(200)
 
         expect(json_response).to be_an Array
@@ -47,7 +46,7 @@ describe API::CommitStatus, api: true do
       end
 
       it "should return latest commit statuses for specific ref" do
-        get api("/projects/#{project.id}/repository/commits/#{commit.id}/statuses?ref=develop", user)
+        get api("/projects/#{project.id}/repository/commits/#{commit.id}/statuses?ref=develop", reporter)
         expect(response.status).to eq(200)
 
         expect(json_response).to be_an Array
@@ -55,7 +54,7 @@ describe API::CommitStatus, api: true do
       end
 
       it "should return latest commit statuses for specific name" do
-        get api("/projects/#{project.id}/repository/commits/#{commit.id}/statuses?name=coverage", user)
+        get api("/projects/#{project.id}/repository/commits/#{commit.id}/statuses?name=coverage", reporter)
         expect(response.status).to eq(200)
 
         expect(json_response).to be_an Array
@@ -65,7 +64,7 @@ describe API::CommitStatus, api: true do
 
     context "guest user" do
       it "should not return project commits" do
-        get api("/projects/#{project.id}/repository/commits/#{commit.id}/statuses", user2)
+        get api("/projects/#{project.id}/repository/commits/#{commit.id}/statuses", guest)
         expect(response.status).to eq(403)
       end
     end
@@ -81,10 +80,10 @@ describe API::CommitStatus, api: true do
   describe 'POST /projects/:id/statuses/:sha' do
     let(:post_url) { "/projects/#{project.id}/statuses/#{commit.id}" }
 
-    context 'reporter user' do
+    context 'developer user' do
       context 'should create commit status' do
         it 'with only required parameters' do
-          post api(post_url, user), state: 'success'
+          post api(post_url, developer), state: 'success'
           expect(response.status).to eq(201)
           expect(json_response['sha']).to eq(commit.id)
           expect(json_response['status']).to eq('success')
@@ -95,7 +94,7 @@ describe API::CommitStatus, api: true do
         end
 
         it 'with all optional parameters' do
-          post api(post_url, user), state: 'success', context: 'coverage', ref: 'develop', target_url: 'url', description: 'test'
+          post api(post_url, developer), state: 'success', context: 'coverage', ref: 'develop', target_url: 'url', description: 'test'
           expect(response.status).to eq(201)
           expect(json_response['sha']).to eq(commit.id)
           expect(json_response['status']).to eq('success')
@@ -108,25 +107,32 @@ describe API::CommitStatus, api: true do
 
       context 'should not create commit status' do
         it 'with invalid state' do
-          post api(post_url, user), state: 'invalid'
+          post api(post_url, developer), state: 'invalid'
           expect(response.status).to eq(400)
         end
 
         it 'without state' do
-          post api(post_url, user)
+          post api(post_url, developer)
           expect(response.status).to eq(400)
         end
 
         it 'invalid commit' do
-          post api("/projects/#{project.id}/statuses/invalid_sha", user), state: 'running'
+          post api("/projects/#{project.id}/statuses/invalid_sha", developer), state: 'running'
           expect(response.status).to eq(404)
         end
       end
     end
 
+    context 'reporter user' do
+      it 'should not create commit status' do
+        post api(post_url, reporter)
+        expect(response.status).to eq(403)
+      end
+    end
+
     context 'guest user' do
       it 'should not create commit status' do
-        post api(post_url, user2)
+        post api(post_url, guest)
         expect(response.status).to eq(403)
       end
     end
@@ -138,4 +144,10 @@ describe API::CommitStatus, api: true do
       end
     end
   end
+
+  def create_user(access_level)
+    user = create(:user)
+    create(:project_member, user: user, project: project, access_level: access_level)
+    user
+  end
 end

From 89b3ddd609063d93f39a02279f0f3e23b8b6b364 Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Wed, 3 Feb 2016 23:01:04 -0500
Subject: [PATCH 032/134] Allow limited Markdown in Broadcast Messages

Closes #11853
---
 CHANGELOG                                     |  1 +
 app/assets/javascripts/admin.js.coffee        | 13 -----------
 .../javascripts/broadcast_message.js.coffee   | 22 +++++++++++++++++++
 app/assets/stylesheets/pages/admin.scss       | 10 +++++++++
 .../admin/broadcast_messages_controller.rb    |  4 ++++
 app/helpers/broadcast_messages_helper.rb      |  6 ++++-
 .../admin/broadcast_messages/_form.html.haml  |  7 ++++--
 .../admin/broadcast_messages/preview.js.haml  |  1 +
 config/routes.rb                              |  5 ++++-
 features/admin/broadcast_messages.feature     |  6 +++++
 features/steps/admin/broadcast_messages.rb    | 14 +++++++++++-
 .../pipeline/broadcast_message_pipeline.rb    | 16 ++++++++++++++
 12 files changed, 87 insertions(+), 18 deletions(-)
 create mode 100644 app/assets/javascripts/broadcast_message.js.coffee
 create mode 100644 app/views/admin/broadcast_messages/preview.js.haml
 create mode 100644 lib/banzai/pipeline/broadcast_message_pipeline.rb

diff --git a/CHANGELOG b/CHANGELOG
index 50b27e25492..fba6c3ccd1b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -19,6 +19,7 @@ v 8.5.0 (unreleased)
   - Track project import failure
   - Support Two-factor Authentication for LDAP users
   - Display database type and version in Administration dashboard
+  - Allow limited Markdown in Broadcast Messages
   - Fix visibility level text in admin area (Zeger-Jan van de Weg)
   - Warn admin during OAuth of granting admin rights (Zeger-Jan van de Weg)
   - Update the ExternalIssue regex pattern (Blake Hitchcock)
diff --git a/app/assets/javascripts/admin.js.coffee b/app/assets/javascripts/admin.js.coffee
index eb951f71711..b2b8e1b7ffb 100644
--- a/app/assets/javascripts/admin.js.coffee
+++ b/app/assets/javascripts/admin.js.coffee
@@ -12,19 +12,6 @@ class @Admin
       e.preventDefault()
       $('.js-toggle-colors-container').toggle()
 
-    $('input#broadcast_message_color').on 'input', ->
-      previewColor = $(@).val()
-      $('div.broadcast-message-preview').css('background-color', previewColor)
-
-    $('input#broadcast_message_font').on 'input', ->
-      previewColor = $(@).val()
-      $('div.broadcast-message-preview').css('color', previewColor)
-
-    $('textarea#broadcast_message_message').on 'input', ->
-      previewMessage = $(@).val()
-      previewMessage = "Your message here" if previewMessage.trim() == ''
-      $('div.broadcast-message-preview span').text(previewMessage)
-
     $('.log-tabs a').click (e) ->
       e.preventDefault()
       $(this).tab('show')
diff --git a/app/assets/javascripts/broadcast_message.js.coffee b/app/assets/javascripts/broadcast_message.js.coffee
new file mode 100644
index 00000000000..a38a329c4c2
--- /dev/null
+++ b/app/assets/javascripts/broadcast_message.js.coffee
@@ -0,0 +1,22 @@
+$ ->
+  $('input#broadcast_message_color').on 'input', ->
+    previewColor = $(@).val()
+    $('div.broadcast-message-preview').css('background-color', previewColor)
+
+  $('input#broadcast_message_font').on 'input', ->
+    previewColor = $(@).val()
+    $('div.broadcast-message-preview').css('color', previewColor)
+
+  previewPath = $('textarea#broadcast_message_message').data('preview-path')
+
+  $('textarea#broadcast_message_message').on 'input', ->
+    message = $(@).val()
+
+    if message == ''
+      $('.js-broadcast-message-preview').text("Your message here")
+    else
+      $.ajax(
+        url: previewPath
+        type: "POST"
+        data: { broadcast_message: { message: message } }
+      )
diff --git a/app/assets/stylesheets/pages/admin.scss b/app/assets/stylesheets/pages/admin.scss
index 144852e7874..a61161810a3 100644
--- a/app/assets/stylesheets/pages/admin.scss
+++ b/app/assets/stylesheets/pages/admin.scss
@@ -55,6 +55,16 @@
   @extend .alert-warning;
   padding: 10px;
   text-align: center;
+
+  > div, p {
+    display: inline;
+    margin: 0;
+
+    a {
+      color: inherit;
+      text-decoration: underline;
+    }
+  }
 }
 
 .broadcast-message-preview {
diff --git a/app/controllers/admin/broadcast_messages_controller.rb b/app/controllers/admin/broadcast_messages_controller.rb
index a470d865408..fc342924987 100644
--- a/app/controllers/admin/broadcast_messages_controller.rb
+++ b/app/controllers/admin/broadcast_messages_controller.rb
@@ -36,6 +36,10 @@ class Admin::BroadcastMessagesController < Admin::ApplicationController
     end
   end
 
+  def preview
+    @message = broadcast_message_params[:message]
+  end
+
   protected
 
   def finder
diff --git a/app/helpers/broadcast_messages_helper.rb b/app/helpers/broadcast_messages_helper.rb
index 1ed8c710f77..43a29c96bca 100644
--- a/app/helpers/broadcast_messages_helper.rb
+++ b/app/helpers/broadcast_messages_helper.rb
@@ -3,7 +3,7 @@ module BroadcastMessagesHelper
     return unless message.present?
 
     content_tag :div, class: 'broadcast-message', style: broadcast_message_style(message) do
-      icon('bullhorn') << ' ' << message.message
+      icon('bullhorn') << ' ' << render_broadcast_message(message.message)
     end
   end
 
@@ -31,4 +31,8 @@ module BroadcastMessagesHelper
       'Pending'
     end
   end
+
+  def render_broadcast_message(message)
+    Banzai.render(message, pipeline: :broadcast_message).html_safe
+  end
 end
diff --git a/app/views/admin/broadcast_messages/_form.html.haml b/app/views/admin/broadcast_messages/_form.html.haml
index 953b8b69368..5c9403fa0c2 100644
--- a/app/views/admin/broadcast_messages/_form.html.haml
+++ b/app/views/admin/broadcast_messages/_form.html.haml
@@ -1,6 +1,7 @@
 .broadcast-message-preview{ style: broadcast_message_style(@broadcast_message) }
   = icon('bullhorn')
-  %span= @broadcast_message.message || "Your message here"
+  .js-broadcast-message-preview
+    = render_broadcast_message(@broadcast_message.message.presence || "Your message here")
 
 = form_for [:admin, @broadcast_message], html: { class: 'broadcast-message-form form-horizontal js-requires-input'} do |f|
   -if @broadcast_message.errors.any?
@@ -10,7 +11,9 @@
   .form-group
     = f.label :message, class: 'control-label'
     .col-sm-10
-      = f.text_area :message, class: "form-control js-quick-submit", rows: 2, required: true
+      = f.text_area :message, class: "form-control js-quick-submit js-autosize",
+        required: true,
+        data: { preview_path: preview_admin_broadcast_messages_path }
   .form-group.js-toggle-colors-container
     .col-sm-10.col-sm-offset-2
       = link_to 'Customize colors', '#', class: 'js-toggle-colors-link'
diff --git a/app/views/admin/broadcast_messages/preview.js.haml b/app/views/admin/broadcast_messages/preview.js.haml
new file mode 100644
index 00000000000..fbc9453c72e
--- /dev/null
+++ b/app/views/admin/broadcast_messages/preview.js.haml
@@ -0,0 +1 @@
+$('.js-broadcast-message-preview').html("#{j(render_broadcast_message(@message))}");
diff --git a/config/routes.rb b/config/routes.rb
index 034bfaf1bcd..f5951bf3e8d 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -227,7 +227,10 @@ Rails.application.routes.draw do
       get :test
     end
 
-    resources :broadcast_messages, only: [:index, :edit, :create, :update, :destroy]
+    resources :broadcast_messages, only: [:index, :edit, :create, :update, :destroy] do
+      post :preview, on: :collection
+    end
+
     resource :logs, only: [:show]
     resource :background_jobs, controller: 'background_jobs', only: [:show]
 
diff --git a/features/admin/broadcast_messages.feature b/features/admin/broadcast_messages.feature
index fd3bac77f86..4f9c651561e 100644
--- a/features/admin/broadcast_messages.feature
+++ b/features/admin/broadcast_messages.feature
@@ -25,3 +25,9 @@ Feature: Admin Broadcast Messages
     When I remove an existing broadcast message
     Then I should be redirected to admin messages page
     And I should not see the removed broadcast message
+
+  @javascript
+  Scenario: Live preview a customized broadcast message
+    When I visit admin messages page
+    And I enter a broadcast message with Markdown
+    Then I should see a live preview of the rendered broadcast message
diff --git a/features/steps/admin/broadcast_messages.rb b/features/steps/admin/broadcast_messages.rb
index 6cacdf4764c..af2b4a29313 100644
--- a/features/steps/admin/broadcast_messages.rb
+++ b/features/steps/admin/broadcast_messages.rb
@@ -19,7 +19,7 @@ class Spinach::Features::AdminBroadcastMessages < Spinach::FeatureSteps
   end
 
   step 'submit form with new customized broadcast message' do
-    fill_in 'broadcast_message_message', with: 'Application update from 4:00 CST to 5:00 CST'
+    fill_in 'broadcast_message_message', with: 'Application update from **4:00 CST to 5:00 CST**'
     fill_in 'broadcast_message_color', with: '#f2dede'
     fill_in 'broadcast_message_font', with: '#b94a48'
     select Date.today.next_year.year, from: "broadcast_message_ends_at_1i"
@@ -28,6 +28,7 @@ class Spinach::Features::AdminBroadcastMessages < Spinach::FeatureSteps
 
   step 'I should see a customized broadcast message' do
     expect(page).to have_content 'Application update from 4:00 CST to 5:00 CST'
+    expect(page).to have_selector 'strong', text: '4:00 CST to 5:00 CST'
     expect(page).to have_selector %(div[style="background-color: #f2dede; color: #b94a48"])
   end
 
@@ -51,4 +52,15 @@ class Spinach::Features::AdminBroadcastMessages < Spinach::FeatureSteps
   step 'I should not see the removed broadcast message' do
     expect(page).not_to have_content 'Migration to new server'
   end
+
+  step 'I enter a broadcast message with Markdown' do
+    fill_in 'broadcast_message_message', with: "Live **Markdown** previews. :tada:"
+  end
+
+  step 'I should see a live preview of the rendered broadcast message' do
+    page.within('.broadcast-message-preview') do
+      expect(page).to have_selector('strong', text: 'Markdown')
+      expect(page).to have_selector('img.emoji')
+    end
+  end
 end
diff --git a/lib/banzai/pipeline/broadcast_message_pipeline.rb b/lib/banzai/pipeline/broadcast_message_pipeline.rb
new file mode 100644
index 00000000000..4bb85e24c38
--- /dev/null
+++ b/lib/banzai/pipeline/broadcast_message_pipeline.rb
@@ -0,0 +1,16 @@
+module Banzai
+  module Pipeline
+    class BroadcastMessagePipeline < DescriptionPipeline
+      def self.filters
+        @filters ||= [
+          Filter::MarkdownFilter,
+          Filter::SanitizationFilter,
+
+          Filter::EmojiFilter,
+          Filter::AutolinkFilter,
+          Filter::ExternalLinkFilter
+        ]
+      end
+    end
+  end
+end

From 9eba0eaac3199ddf581c74b73fe69b94fa3e5498 Mon Sep 17 00:00:00 2001
From: Aaron Hamilton <aaron@correspondwith.me>
Date: Sat, 6 Feb 2016 23:18:34 +0000
Subject: [PATCH 033/134] Prevent rasterization artefacts in the logo, and
 simplify markup.

 - Remove sketch-namespaced attributes.
 - Remove unused groups, and cancel out unnecessary transforms.
 - Use overlap to avoid rasterization artefacts in the logo.
 - Extend comment for `#logo` click event handler, as it's a non-obvious hack for Safari.
 - Remove viewBox parameter and define paths in their final form.
---
 app/assets/javascripts/logo.js.coffee |  3 ++-
 app/views/shared/_logo.svg            | 28 ++++++++-------------------
 2 files changed, 10 insertions(+), 21 deletions(-)

diff --git a/app/assets/javascripts/logo.js.coffee b/app/assets/javascripts/logo.js.coffee
index e7d884662ea..35b2fbbba07 100644
--- a/app/assets/javascripts/logo.js.coffee
+++ b/app/assets/javascripts/logo.js.coffee
@@ -44,6 +44,7 @@ $(document).on('page:fetch',  start)
 $(document).on('page:change', stop)
 
 $ ->
-  # Make logo clickable
+  # Make logo clickable as part of a workaround for Safari visited
+  # link behaviour (See !2690).
   $('#logo').on 'click', ->
     $('#js-shortcuts-home').get(0).click()
diff --git a/app/views/shared/_logo.svg b/app/views/shared/_logo.svg
index 3d279ec228c..b07f1c5603e 100644
--- a/app/views/shared/_logo.svg
+++ b/app/views/shared/_logo.svg
@@ -1,21 +1,9 @@
-<svg width="36px" height="36px" viewBox="0 0 210 210" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" id="tanuki-logo">
-    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
-        <g id="logo" sketch:type="MSLayerGroup" transform="translate(0.000000, 10.000000)">
-            <g id="Page-1" sketch:type="MSShapeGroup">
-                <g id="Fill-1-+-Group-24">
-                    <g id="Group-24">
-                        <g id="Group">
-                            <path id="tanuki-right-ear"   d="M12.2685,74.7342 L66.4215,74.7342 L43.1485,3.1092 C41.9515,-0.5768 36.7375,-0.5758 35.5405,3.1092 L12.2685,74.7342 L12.2685,74.7342 Z" fill="#E24329" class="tanuki-shape"></path>
-                            <path id="tanuki-right-cheek" d="M12.2685,74.7341 L12.2685,74.7341 L0.5265,110.8731 C-0.5445,114.1691 0.6285,117.7801 3.4325,119.8171 L105.0615,193.6551 L12.2685,74.7341 L12.2685,74.7341 Z" fill="#FCA326" class="tanuki-shape"></path>
-                            <path id="tanuki-right-eye"   d="M105.0614,193.6548 L66.4214,74.7338 L12.2684,74.7338 L105.0614,193.6548 L105.0614,193.6548 Z" fill="#FC6D26" class="tanuki-shape"></path>
-                            <path id="tanuki-nose"        d="M105.0614,193.655 L105.0614,193.655 L143.7014,74.734 L66.4214,74.734 L105.0614,193.655 L105.0614,193.655 Z" fill="#E24329" class="tanuki-shape"></path>
-                            <path id="tanuki-left-eye"    d="M105.0614,193.6548 L143.7014,74.7338 L197.8544,74.7338 L105.0614,193.6548 L105.0614,193.6548 Z" fill="#FC6D26" class="tanuki-shape"></path>
-                            <path id="tanuki-left-cheek"  d="M197.8544,74.7341 L197.8544,74.7341 L209.5964,110.8731 C210.6674,114.1691 209.4944,117.7801 206.6904,119.8171 L105.0614,193.6551 L197.8544,74.7341 L197.8544,74.7341 Z" fill="#FCA326" class="tanuki-shape"></path>
-                            <path id="tanuki-left-ear"    d="M197.8544,74.7342 L143.7014,74.7342 L166.9744,3.1092 C168.1714,-0.5768 173.3854,-0.5758 174.5824,3.1092 L197.8544,74.7342 L197.8544,74.7342 Z" fill="#E24329" class="tanuki-shape"></path>
-                        </g>
-                    </g>
-                </g>
-            </g>
-        </g>
-    </g>
+<svg width="36" height="36" id="tanuki-logo">
+  <path id="tanuki-right-ear" class="tanuki-shape" fill="#e24329" d="M2 14l9.38 9v-9l-4-12.28c-.205-.632-1.176-.632-1.38 0z"/>
+  <path id="tanuki-left-ear" class="tanuki-shape" fill="#e24329" d="M34 14l-9.38 9v-9l4-12.28c.205-.632 1.176-.632 1.38 0z"/>
+  <path id="tanuki-nose" class="tanuki-shape" fill="#e24329" d="M18,34.38 3,14 33,14 Z"/>
+  <path id="tanuki-right-eye" class="tanuki-shape" fill="#fc6d26" d="M18,34.38 11.38,14 2,14 6,25Z"/>
+  <path id="tanuki-left-eye" class="tanuki-shape" fill="#fc6d26" d="M18,34.38 24.62,14 34,14 30,25Z"/>
+  <path id="tanuki-right-cheek" class="tanuki-shape" fill="#fca326" d="M2 14L.1 20.16c-.18.565 0 1.2.5 1.56l17.42 12.66z"/>
+  <path id="tanuki-left-cheek" class="tanuki-shape" fill="#fca326" d="M34 14l1.9 6.16c.18.565 0 1.2-.5 1.56L18 34.38z"/>
 </svg>

From d38c17739e99635ee2ee5d82659cc6102431c162 Mon Sep 17 00:00:00 2001
From: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
Date: Wed, 3 Feb 2016 09:55:02 +0100
Subject: [PATCH 034/134] Add a tooltip to the stuck warning build symbol

We want to give people an idea of what is wrong with their build, we do this by
adding a tooltip telling them where they can find more information about their
broken builds.

Fixes #10919

Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
---
 app/views/projects/commit_statuses/_commit_status.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/projects/commit_statuses/_commit_status.html.haml b/app/views/projects/commit_statuses/_commit_status.html.haml
index 2e3c956ddc4..943b025c80f 100644
--- a/app/views/projects/commit_statuses/_commit_status.html.haml
+++ b/app/views/projects/commit_statuses/_commit_status.html.haml
@@ -15,7 +15,7 @@
       %strong ##{commit_status.id}
 
     - if commit_status.show_warning?
-      %i.fa.fa-warning.text-warning
+      %i.fa.fa-warning.text-warning{data: { toggle: "tooltip" }, title: "This build is stuck, open it to know more"}
 
   - if defined?(commit_sha) && commit_sha
     %td

From f7c06ecdde1740d3dc61d6b2063af1b41ea4ad95 Mon Sep 17 00:00:00 2001
From: James Lopez <james@jameslopez.es>
Date: Mon, 8 Feb 2016 10:13:03 +0100
Subject: [PATCH 035/134] update changelog

---
 CHANGELOG | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG b/CHANGELOG
index d43b8f69063..4f45f30f1da 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -34,6 +34,7 @@ v 8.5.0 (unreleased)
   - Add sort dropdown to dashboard projects page
   - Hide remove source branch button when the MR is merged but new commits are pushed (Zeger-Jan van de Weg)
   - In seach autocomplete show only groups and projects you are member of
+  - Don't process cross-reference notes from forks
 
 v 8.4.3
   - Increase lfs_objects size column to 8-byte integer to allow files larger

From d7e97a36d2756c2abaf3a8a7cd1c6172d34c0779 Mon Sep 17 00:00:00 2001
From: James Lopez <james@jameslopez.es>
Date: Mon, 8 Feb 2016 10:36:42 +0100
Subject: [PATCH 036/134] split gitlab-ci builds for ruby 2.1

---
 .gitlab-ci.yml | 93 ++++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 87 insertions(+), 6 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index dbdbae9d787..5dfeb8a1f90 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -137,23 +137,104 @@ bundler:audit:
 
 # Ruby 2.1 jobs
 
-spec:ruby21:
+spec:feature:ruby21:
   image: ruby:2.1
+  only:
+  - master
   script:
     - RAILS_ENV=test bundle exec rake assets:precompile 2>/dev/null
-    - RAILS_ENV=test SIMPLECOV=true bundle exec rake spec
+    - RAILS_ENV=test SIMPLECOV=true bundle exec rake spec:feature
   tags:
     - ruby
     - mysql
-  only:
-  - master
 
-spinach:ruby21:
+spec:api:ruby21:
   image: ruby:2.1
+  only:
+  - master
   script:
-    - RAILS_ENV=test SIMPLECOV=true bundle exec rake spinach
+    - RAILS_ENV=test SIMPLECOV=true bundle exec rake spec:api
   tags:
     - ruby
     - mysql
+
+spec:models:ruby21:
+  image: ruby:2.1
   only:
   - master
+  script:
+    - RAILS_ENV=test SIMPLECOV=true bundle exec rake spec:models
+  tags:
+    - ruby
+    - mysql
+
+spec:lib:ruby21:
+  image: ruby:2.1
+  only:
+  - master
+  script:
+    - RAILS_ENV=test SIMPLECOV=true bundle exec rake spec:lib
+  tags:
+    - ruby
+    - mysql
+
+spec:services:ruby21:
+  image: ruby:2.1
+  only:
+  - master
+  script:
+    - RAILS_ENV=test SIMPLECOV=true bundle exec rake spec:services
+  tags:
+    - ruby
+    - mysql
+
+spec:benchmark:ruby21:
+  image: ruby:2.1
+  only:
+  - master
+  script:
+    - RAILS_ENV=test bundle exec rake spec:benchmark
+  tags:
+    - ruby
+    - mysql
+  allow_failure: true
+
+spec:other:ruby21:
+  image: ruby:2.1
+  only:
+  - master
+  script:
+    - RAILS_ENV=test SIMPLECOV=true bundle exec rake spec:other
+  tags:
+    - ruby
+    - mysql
+
+spinach:project:half:ruby21:
+  image: ruby:2.1
+  only:
+  - master
+  script:
+    - RAILS_ENV=test SIMPLECOV=true bundle exec rake spinach:project:half
+  tags:
+    - ruby
+    - mysql
+
+spinach:project:rest:ruby21:
+  image: ruby:2.1
+  only:
+  - master
+  script:
+    - RAILS_ENV=test SIMPLECOV=true bundle exec rake spinach:project:rest
+  tags:
+    - ruby
+    - mysql
+
+spinach:other:ruby21:
+  image: ruby:2.1
+  only:
+  - master
+  script:
+    - RAILS_ENV=test SIMPLECOV=true bundle exec rake spinach:other
+  tags:
+    - ruby
+    - mysql

From b62cdc3c479365b2c96400c44b5e31eeb3d0c204 Mon Sep 17 00:00:00 2001
From: Tony Chu <cwq1913@163.com>
Date: Fri, 11 Dec 2015 21:47:57 +0800
Subject: [PATCH 037/134] Actually use the `skip_merges` option in
 Repository#commits

---
 CHANGELOG                      | 1 +
 app/models/repository.rb       | 3 ++-
 spec/models/repository_spec.rb | 6 ++++++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 50b27e25492..18ed8ff58cd 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -24,6 +24,7 @@ v 8.5.0 (unreleased)
   - Update the ExternalIssue regex pattern (Blake Hitchcock)
   - Optimized performance of finding issues to be closed by a merge request
   - Revert "Add IP check against DNSBLs at account sign-up"
+  - Actually use the `skip_merges` option in Repository#commits (Tony Chu)
   - Fix API to keep request parameters in Link header (Michael Potthoff)
   - Deprecate API "merge_request/:merge_request_id/comments". Use "merge_requests/:merge_request_id/notes" instead
   - Deprecate API "merge_request/:merge_request_id/...". Use "merge_requests/:merge_request_id/..." instead
diff --git a/app/models/repository.rb b/app/models/repository.rb
index e813c946bc1..a5b8f556a58 100644
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -78,7 +78,8 @@ class Repository
       offset: offset,
       # --follow doesn't play well with --skip. See:
       # https://gitlab.com/gitlab-org/gitlab-ce/issues/3574#note_3040520
-      follow: false
+      follow: false,
+      skip_merges: skip_merges
     }
 
     commits = Gitlab::Git::Commit.where(options)
diff --git a/spec/models/repository_spec.rb b/spec/models/repository_spec.rb
index c484ae8fc8c..db86f7032c6 100644
--- a/spec/models/repository_spec.rb
+++ b/spec/models/repository_spec.rb
@@ -239,4 +239,10 @@ describe Repository, models: true do
       it { is_expected.to eq(true) }
     end
   end
+
+  describe :skip_merged_commit do
+    subject { repository.commits(Gitlab::Git::BRANCH_REF_PREFIX + "'test'", nil, 100, 0, true).map{ |k| k.id } }
+
+    it { is_expected.not_to include('e56497bb5f03a90a51293fc6d516788730953899') }
+  end
 end

From 308c967d0dee4b56613d4b285fbd0cf0a1c3ce69 Mon Sep 17 00:00:00 2001
From: Zeger-Jan van de Weg <mail@zjvandeweg.nl>
Date: Tue, 2 Feb 2016 10:44:30 +0100
Subject: [PATCH 038/134] Validate uniqueness of milestone title per project

Fixes #3903
---
 CHANGELOG                     |  1 +
 app/models/milestone.rb       |  2 +-
 spec/models/milestone_spec.rb | 14 ++++++++++++++
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 983a219703a..25acdbcb485 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -35,6 +35,7 @@ v 8.5.0 (unreleased)
   - Fixed logo animation on Safari (Roman Rott)
   - Hide remove source branch button when the MR is merged but new commits are pushed (Zeger-Jan van de Weg)
   - In seach autocomplete show only groups and projects you are member of
+  - Title for milestones should be unique (Zeger-Jan van de Weg)
 
 v 8.4.4
   - Update omniauth-saml gem to 1.4.2
diff --git a/app/models/milestone.rb b/app/models/milestone.rb
index c9a0ad8b9b6..9c4476c768e 100644
--- a/app/models/milestone.rb
+++ b/app/models/milestone.rb
@@ -34,7 +34,7 @@ class Milestone < ActiveRecord::Base
   scope :closed, -> { with_state(:closed) }
   scope :of_projects, ->(ids) { where(project_id: ids) }
 
-  validates :title, presence: true
+  validates :title, presence: true, uniqueness: { scope: :project_id }
   validates :project, presence: true
 
   strip_attributes :title
diff --git a/spec/models/milestone_spec.rb b/spec/models/milestone_spec.rb
index 30a71987d86..1b1380ce4e2 100644
--- a/spec/models/milestone_spec.rb
+++ b/spec/models/milestone_spec.rb
@@ -33,6 +33,20 @@ describe Milestone, models: true do
   let(:milestone) { create(:milestone) }
   let(:issue) { create(:issue) }
 
+  describe "unique milestone title per project" do
+    it "shouldn't accept the same title in a project twice" do
+      new_milestone = Milestone.new(project: milestone.project, title: milestone.title)
+      expect(new_milestone).not_to be_valid
+    end
+
+    it "should accept the same title in another project" do
+      project = build(:project)
+      new_milestone = Milestone.new(project: project, title: milestone.title)
+
+      expect(new_milestone).to be_valid
+    end
+  end
+
   describe "#percent_complete" do
     it "should not count open issues" do
       milestone.issues << issue

From 9a99d8e49dc07faaaa2fae436423e11dab5a7d7e Mon Sep 17 00:00:00 2001
From: Yorick Peterse <yorickpeterse@gmail.com>
Date: Mon, 8 Feb 2016 12:50:55 +0100
Subject: [PATCH 039/134] Cache various Repository Git operations

This caches the output of the following methods:

* Repository#empty?
* Repository#has_visible_content?
* Repository#root_ref

The cache for Repository#has_visible_content? is flushed whenever a
commit is pushed to a new branch or an existing branch is removed.
The cache for Repository#root_ref is only flushed whenever a user
changes the default branch of a project. The cache for Repository#empty?
is never explicitly flushed as there's no need for it.
---
 CHANGELOG                              |  1 +
 app/models/project.rb                  |  2 +
 app/models/repository.rb               | 22 ++++++-
 app/services/git_push_service.rb       |  4 ++
 spec/models/repository_spec.rb         | 87 +++++++++++++++++++++++++-
 spec/services/git_push_service_spec.rb | 30 +++++++++
 6 files changed, 140 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 983a219703a..abcec42e0fb 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
 Please view this file on the master branch, on stable branches it's out of date.
 
 v 8.5.0 (unreleased)
+  - Cache various Repository methods to improve performance (Yorick Peterse)
   - Ensure rake tasks that don't need a DB connection can be run without one
   - Update New Relic gem to 3.14.1.311 (Stan Hu)
   - Add "visibility" flag to GET /projects api endpoint
diff --git a/app/models/project.rb b/app/models/project.rb
index 043f08b9a13..f11c6d7c6be 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -790,6 +790,8 @@ class Project < ActiveRecord::Base
   def change_head(branch)
     # Cached divergent commit counts are based on repository head
     repository.expire_branch_cache
+    repository.expire_root_ref_cache
+
     gitlab_shell.update_repository_head(self.path_with_namespace, branch)
     reload_default_branch
   end
diff --git a/app/models/repository.rb b/app/models/repository.rb
index e813c946bc1..27bdbac3e52 100644
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -44,7 +44,9 @@ class Repository
   end
 
   def empty?
-    raw_repository.empty?
+    return @empty unless @empty.nil?
+
+    @empty = cache.fetch(:empty?) { raw_repository.empty? }
   end
 
   #
@@ -57,7 +59,11 @@ class Repository
   # This method return true if repository contains some content visible in project page.
   #
   def has_visible_content?
-    raw_repository.branch_count > 0
+    return @has_visible_content unless @has_visible_content.nil?
+
+    @has_visible_content = cache.fetch(:has_visible_content?) do
+      raw_repository.branch_count > 0
+    end
   end
 
   def commit(id = 'HEAD')
@@ -243,6 +249,16 @@ class Repository
     end
   end
 
+  def expire_root_ref_cache
+    cache.expire(:root_ref)
+    @root_ref = nil
+  end
+
+  def expire_has_visible_content_cache
+    cache.expire(:has_visible_content?)
+    @has_visible_content = nil
+  end
+
   def rebuild_cache
     cache_keys.each do |key|
       cache.expire(key)
@@ -480,7 +496,7 @@ class Repository
   end
 
   def root_ref
-    @root_ref ||= raw_repository.root_ref
+    @root_ref ||= cache.fetch(:root_ref) { raw_repository.root_ref }
   end
 
   def commit_dir(user, path, message, branch)
diff --git a/app/services/git_push_service.rb b/app/services/git_push_service.rb
index d7ea30bc315..0f31756797d 100644
--- a/app/services/git_push_service.rb
+++ b/app/services/git_push_service.rb
@@ -21,8 +21,12 @@ class GitPushService
     project.repository.expire_cache
 
     if push_remove_branch?(ref, newrev)
+      project.repository.expire_has_visible_content_cache
+
       @push_commits = []
     elsif push_to_new_branch?(ref, oldrev)
+      project.repository.expire_has_visible_content_cache
+
       # Re-find the pushed commits.
       if is_default_branch?(ref)
         # Initial push to the default branch. Take the full history of that branch as "newly pushed".
diff --git a/spec/models/repository_spec.rb b/spec/models/repository_spec.rb
index c484ae8fc8c..753012be578 100644
--- a/spec/models/repository_spec.rb
+++ b/spec/models/repository_spec.rb
@@ -232,11 +232,92 @@ describe Repository, models: true do
     end
 
     describe 'when there are branches' do
-      before do
-        allow(repository.raw_repository).to receive(:branch_count).and_return(3)
+      it 'returns true' do
+        expect(repository.raw_repository).to receive(:branch_count).and_return(3)
+
+        expect(subject).to eq(true)
       end
 
-      it { is_expected.to eq(true) }
+      it 'caches the output' do
+        expect(repository.raw_repository).to receive(:branch_count).
+          once.
+          and_return(3)
+
+        repository.has_visible_content?
+        repository.has_visible_content?
+      end
+    end
+  end
+
+  describe '#empty?' do
+    let(:empty_repository) { create(:project_empty_repo).repository }
+
+    it 'returns true for an empty repository' do
+      expect(empty_repository.empty?).to eq(true)
+    end
+
+    it 'returns false for a non-empty repository' do
+      expect(repository.empty?).to eq(false)
+    end
+
+    it 'caches the output' do
+      expect(repository.raw_repository).to receive(:empty?).
+        once.
+        and_return(false)
+
+      repository.empty?
+      repository.empty?
+    end
+  end
+
+  describe '#root_ref' do
+    it 'returns a branch name' do
+      expect(repository.root_ref).to be_an_instance_of(String)
+    end
+
+    it 'caches the output' do
+      expect(repository.raw_repository).to receive(:root_ref).
+        once.
+        and_return('master')
+
+      repository.root_ref
+      repository.root_ref
+    end
+  end
+
+  describe '#expire_cache' do
+    it 'expires all caches' do
+      expect(repository).to receive(:expire_branch_cache)
+
+      repository.expire_cache
+    end
+  end
+
+  describe '#expire_root_ref_cache' do
+    it 'expires the root reference cache' do
+      repository.root_ref
+
+      expect(repository.raw_repository).to receive(:root_ref).
+        once.
+        and_return('foo')
+
+      repository.expire_root_ref_cache
+
+      expect(repository.root_ref).to eq('foo')
+    end
+  end
+
+  describe '#expire_has_visible_content_cache' do
+    it 'expires the visible content cache' do
+      repository.has_visible_content?
+
+      expect(repository.raw_repository).to receive(:branch_count).
+        once.
+        and_return(0)
+
+      repository.expire_has_visible_content_cache
+
+      expect(repository.has_visible_content?).to eq(false)
     end
   end
 end
diff --git a/spec/services/git_push_service_spec.rb b/spec/services/git_push_service_spec.rb
index c1080ef190a..349809743c7 100644
--- a/spec/services/git_push_service_spec.rb
+++ b/spec/services/git_push_service_spec.rb
@@ -21,6 +21,18 @@ describe GitPushService, services: true do
       end
 
       it { is_expected.to be_truthy }
+
+      it 'flushes general cached data' do
+        expect(project.repository).to receive(:expire_cache)
+
+        subject
+      end
+
+      it 'flushes the visible content cache' do
+        expect(project.repository).to receive(:expire_has_visible_content_cache)
+
+        subject
+      end
     end
 
     context 'existing branch' do
@@ -29,6 +41,12 @@ describe GitPushService, services: true do
       end
 
       it { is_expected.to be_truthy }
+
+      it 'flushes general cached data' do
+        expect(project.repository).to receive(:expire_cache)
+
+        subject
+      end
     end
 
     context 'rm branch' do
@@ -37,6 +55,18 @@ describe GitPushService, services: true do
       end
 
       it { is_expected.to be_truthy }
+
+      it 'flushes the visible content cache' do
+        expect(project.repository).to receive(:expire_has_visible_content_cache)
+
+        subject
+      end
+
+      it 'flushes general cached data' do
+        expect(project.repository).to receive(:expire_cache)
+
+        subject
+      end
     end
   end
 

From 81f2a9e5b038ed76404cba4d00870bf227a168a7 Mon Sep 17 00:00:00 2001
From: Kirill Skachkov <kskachkov@tradingview.com>
Date: Tue, 15 Dec 2015 16:40:03 +0000
Subject: [PATCH 040/134] API: Allow to set or update a merge-request's
 milestone

---
 CHANGELOG                 | 1 +
 doc/api/merge_requests.md | 2 ++
 lib/api/merge_requests.rb | 6 ++++--
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 7572b6af151..b31fad1d3de 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -31,6 +31,7 @@ v 8.5.0 (unreleased)
   - Prevent parse error when name of project ends with .atom and prevent path issues
   - Mark inline difference between old and new paths when a file is renamed
   - Support Akismet spam checking for creation of issues via API (Stan Hu)
+  - API: Allow to set or update a merge-request's milestone (Kirill Skachkov)
   - Improve UI consistency between projects and groups lists
   - Add sort dropdown to dashboard projects page
   - Fixed logo animation on Safari (Roman Rott)
diff --git a/doc/api/merge_requests.md b/doc/api/merge_requests.md
index 85ed31320b9..7e732b9a2b4 100644
--- a/doc/api/merge_requests.md
+++ b/doc/api/merge_requests.md
@@ -225,6 +225,7 @@ Parameters:
 - `description` (optional)       - Description of MR
 - `target_project_id` (optional) - The target project (numeric id)
 - `labels` (optional)            - Labels for MR as a comma-separated list
+- `milestone_id` (optional)      - Milestone ID
 
 ```json
 {
@@ -277,6 +278,7 @@ Parameters:
 - `description`                 - Description of MR
 - `state_event`                 - New state (close|reopen|merge)
 - `labels` (optional)           - Labels for MR as a comma-separated list
+- `milestone_id` (optional)     - Milestone ID
 
 ```json
 {
diff --git a/lib/api/merge_requests.rb b/lib/api/merge_requests.rb
index dd7f24f3279..c54beb00ac5 100644
--- a/lib/api/merge_requests.rb
+++ b/lib/api/merge_requests.rb
@@ -71,6 +71,7 @@ module API
       #   title (required)         - Title of MR
       #   description              - Description of MR
       #   labels (optional)        - Labels for MR as a comma-separated list
+      #   milestone_id (optional)   - Milestone ID
       #
       # Example:
       #   POST /projects/:id/merge_requests
@@ -78,7 +79,7 @@ module API
       post ":id/merge_requests" do
         authorize! :create_merge_request, user_project
         required_attributes! [:source_branch, :target_branch, :title]
-        attrs = attributes_for_keys [:source_branch, :target_branch, :assignee_id, :title, :target_project_id, :description]
+        attrs = attributes_for_keys [:source_branch, :target_branch, :assignee_id, :title, :target_project_id, :description, :milestone_id]
 
         # Validate label names in advance
         if (errors = validate_label_params(params)).any?
@@ -163,11 +164,12 @@ module API
         #   state_event                 - Status of MR. (close|reopen|merge)
         #   description                 - Description of MR
         #   labels (optional)           - Labels for a MR as a comma-separated list
+        #   milestone_id (optional)     - Milestone ID
         # Example:
         #   PUT /projects/:id/merge_requests/:merge_request_id
         #
         put path do
-          attrs = attributes_for_keys [:target_branch, :assignee_id, :title, :state_event, :description]
+          attrs = attributes_for_keys [:target_branch, :assignee_id, :title, :state_event, :description, :milestone_id]
           merge_request = user_project.merge_requests.find(params[:merge_request_id])
           authorize! :update_merge_request, merge_request
 

From 86d15c1e9a824343d7698e81bd2eb4c6f2d7cc74 Mon Sep 17 00:00:00 2001
From: Andrei Dziahel <develop7@develop7.info>
Date: Sun, 17 Jan 2016 18:59:43 +0000
Subject: [PATCH 041/134] Expose MergeRequest::merge_status to API

---
 lib/api/entities.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/api/entities.rb b/lib/api/entities.rb
index 82a75734de0..93e1c13c4c5 100644
--- a/lib/api/entities.rb
+++ b/lib/api/entities.rb
@@ -175,6 +175,7 @@ module API
       expose :work_in_progress?, as: :work_in_progress
       expose :milestone, using: Entities::Milestone
       expose :merge_when_build_succeeds
+      expose :merge_status
     end
 
     class MergeRequestChanges < MergeRequest

From f6a666bdc2b9b557247c34935b69f35fb518e348 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Coutable?= <remy@rymai.me>
Date: Mon, 8 Feb 2016 17:18:44 +0100
Subject: [PATCH 042/134] Add an API spec for MergeRequest#merge_status and
 properly document this resource

---
 CHANGELOG                                |   1 +
 doc/api/merge_requests.md                | 126 +++++++++++++++++++++--
 spec/requests/api/merge_requests_spec.rb |   1 +
 3 files changed, 117 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 7572b6af151..3b5f7a13868 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -24,6 +24,7 @@ v 8.5.0 (unreleased)
   - Update the ExternalIssue regex pattern (Blake Hitchcock)
   - Remember user's inline/side-by-side diff view preference in a cookie (Kirill Katsnelson)
   - Optimized performance of finding issues to be closed by a merge request
+  - API: Expose MergeRequest#merge_status (Andrei Dziahel)
   - Revert "Add IP check against DNSBLs at account sign-up"
   - Fix API to keep request parameters in Link header (Michael Potthoff)
   - Deprecate API "merge_request/:merge_request_id/comments". Use "merge_requests/:merge_request_id/notes" instead
diff --git a/doc/api/merge_requests.md b/doc/api/merge_requests.md
index 85ed31320b9..b4dca6dd35e 100644
--- a/doc/api/merge_requests.md
+++ b/doc/api/merge_requests.md
@@ -2,7 +2,7 @@
 
 ## List merge requests
 
-Get all merge requests for this project. 
+Get all merge requests for this project.
 The `state` parameter can be used to get only merge requests with a given state (`opened`, `closed`, or `merged`) or all of them (`all`).
 The pagination parameters `page` and `per_page` can be used to restrict the list of merge requests.
 
@@ -49,8 +49,24 @@ Parameters:
       "state": "active",
       "created_at": "2012-04-29T08:46:00Z"
     },
+    "source_project_id": "2",
+    "target_project_id": "3",
+    "labels": [ ],
     "description":"fixed login page css paddings",
-    "work_in_progress": false
+    "work_in_progress": false,
+    "milestone": {
+      "id": 5,
+      "iid": 1,
+      "project_id": 3,
+      "title": "v2.0",
+      "description": "Assumenda aut placeat expedita exercitationem labore sunt enim earum.",
+      "state": "closed",
+      "created_at": "2015-02-02T19:49:26.013Z",
+      "updated_at": "2015-02-02T19:49:26.013Z",
+      "due_date": null
+    },
+    "merge_when_build_succeeds": true,
+    "merge_status": "can_be_merged"
   }
 ]
 ```
@@ -95,8 +111,24 @@ Parameters:
     "state": "active",
     "created_at": "2012-04-29T08:46:00Z"
   },
+  "source_project_id": "2",
+  "target_project_id": "3",
+  "labels": [ ],
   "description":"fixed login page css paddings",
-  "work_in_progress": false
+  "work_in_progress": false,
+  "milestone": {
+    "id": 5,
+    "iid": 1,
+    "project_id": 3,
+    "title": "v2.0",
+    "description": "Assumenda aut placeat expedita exercitationem labore sunt enim earum.",
+    "state": "closed",
+    "created_at": "2015-02-02T19:49:26.013Z",
+    "updated_at": "2015-02-02T19:49:26.013Z",
+    "due_date": null
+  },
+  "merge_when_build_succeeds": true,
+  "merge_status": "can_be_merged"
 }
 ```
 
@@ -156,8 +188,6 @@ Parameters:
   "iid": 1,
   "project_id": 4,
   "title": "Blanditiis beatae suscipit hic assumenda et molestias nisi asperiores repellat et.",
-  "description": "Qui voluptatibus placeat ipsa alias quasi. Deleniti rem ut sint. Optio velit qui distinctio.",
-  "work_in_progress": false,
   "state": "reopened",
   "created_at": "2015-02-02T19:49:39.159Z",
   "updated_at": "2015-02-02T20:08:49.959Z",
@@ -182,6 +212,8 @@ Parameters:
   "source_project_id": 4,
   "target_project_id": 4,
   "labels": [ ],
+  "description": "Qui voluptatibus placeat ipsa alias quasi. Deleniti rem ut sint. Optio velit qui distinctio.",
+  "work_in_progress": false,
   "milestone": {
     "id": 5,
     "iid": 1,
@@ -193,6 +225,8 @@ Parameters:
     "updated_at": "2015-02-02T19:49:26.013Z",
     "due_date": null
   },
+  "merge_when_build_succeeds": true,
+  "merge_status": "can_be_merged",
   "changes": [
     {
     "old_path": "VERSION",
@@ -252,7 +286,24 @@ Parameters:
     "state": "active",
     "created_at": "2012-04-29T08:46:00Z"
   },
-  "description":"fixed login page css paddings"
+  "source_project_id": 4,
+  "target_project_id": 4,
+  "labels": [ ],
+  "description":"fixed login page css paddings",
+  "work_in_progress": false,
+  "milestone": {
+    "id": 5,
+    "iid": 1,
+    "project_id": 4,
+    "title": "v2.0",
+    "description": "Assumenda aut placeat expedita exercitationem labore sunt enim earum.",
+    "state": "closed",
+    "created_at": "2015-02-02T19:49:26.013Z",
+    "updated_at": "2015-02-02T19:49:26.013Z",
+    "due_date": null
+  },
+  "merge_when_build_succeeds": true,
+  "merge_status": "can_be_merged"
 }
 ```
 
@@ -284,7 +335,6 @@ Parameters:
   "target_branch": "master",
   "project_id": 3,
   "title": "test1",
-  "description": "description1",
   "state": "opened",
   "upvotes": 0,
   "downvotes": 0,
@@ -303,7 +353,25 @@ Parameters:
     "name": "Administrator",
     "state": "active",
     "created_at": "2012-04-29T08:46:00Z"
-  }
+  },
+  "source_project_id": 4,
+  "target_project_id": 4,
+  "labels": [ ],
+  "description": "description1",
+  "work_in_progress": false,
+  "milestone": {
+    "id": 5,
+    "iid": 1,
+    "project_id": 4,
+    "title": "v2.0",
+    "description": "Assumenda aut placeat expedita exercitationem labore sunt enim earum.",
+    "state": "closed",
+    "created_at": "2015-02-02T19:49:26.013Z",
+    "updated_at": "2015-02-02T19:49:26.013Z",
+    "due_date": null
+  },
+  "merge_when_build_succeeds": true,
+  "merge_status": "can_be_merged"
 }
 ```
 
@@ -359,7 +427,25 @@ Parameters:
     "name": "Administrator",
     "state": "active",
     "created_at": "2012-04-29T08:46:00Z"
-  }
+  },
+  "source_project_id": 4,
+  "target_project_id": 4,
+  "labels": [ ],
+  "description":"fixed login page css paddings",
+  "work_in_progress": false,
+  "milestone": {
+    "id": 5,
+    "iid": 1,
+    "project_id": 4,
+    "title": "v2.0",
+    "description": "Assumenda aut placeat expedita exercitationem labore sunt enim earum.",
+    "state": "closed",
+    "created_at": "2015-02-02T19:49:26.013Z",
+    "updated_at": "2015-02-02T19:49:26.013Z",
+    "due_date": null
+  },
+  "merge_when_build_succeeds": true,
+  "merge_status": "can_be_merged"
 }
 ```
 
@@ -387,7 +473,7 @@ Parameters:
   "source_branch": "test1",
   "project_id": 3,
   "title": "test1",
-  "state": "merged",
+  "state": "opened",
   "upvotes": 0,
   "downvotes": 0,
   "author": {
@@ -405,7 +491,25 @@ Parameters:
     "name": "Administrator",
     "state": "active",
     "created_at": "2012-04-29T08:46:00Z"
-  }
+  },
+  "source_project_id": 4,
+  "target_project_id": 4,
+  "labels": [ ],
+  "description":"fixed login page css paddings",
+  "work_in_progress": false,
+  "milestone": {
+    "id": 5,
+    "iid": 1,
+    "project_id": 4,
+    "title": "v2.0",
+    "description": "Assumenda aut placeat expedita exercitationem labore sunt enim earum.",
+    "state": "closed",
+    "created_at": "2015-02-02T19:49:26.013Z",
+    "updated_at": "2015-02-02T19:49:26.013Z",
+    "due_date": null
+  },
+  "merge_when_build_succeeds": true,
+  "merge_status": "can_be_merged"
 }
 ```
 
diff --git a/spec/requests/api/merge_requests_spec.rb b/spec/requests/api/merge_requests_spec.rb
index d7bfa17b0b1..a91a8696831 100644
--- a/spec/requests/api/merge_requests_spec.rb
+++ b/spec/requests/api/merge_requests_spec.rb
@@ -115,6 +115,7 @@ describe API::API, api: true  do
       expect(response.status).to eq(200)
       expect(json_response['title']).to eq(merge_request.title)
       expect(json_response['iid']).to eq(merge_request.iid)
+      expect(json_response['merge_status']).to eq('can_be_merged')
     end
 
     it 'should return merge_request by iid' do

From 897f18032a471e647e0d796c241f911ac1ad0cd8 Mon Sep 17 00:00:00 2001
From: Jeroen Nijhof <jeroen@jeroennijhof.nl>
Date: Mon, 8 Feb 2016 17:31:24 +0100
Subject: [PATCH 043/134] Make sure there is a connection before using
 ActiveRecord

---
 lib/backup/manager.rb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/backup/manager.rb b/lib/backup/manager.rb
index 099062eeb8b..4962f5e53ce 100644
--- a/lib/backup/manager.rb
+++ b/lib/backup/manager.rb
@@ -1,6 +1,9 @@
 module Backup
   class Manager
     def pack
+      # Make sure there is a connection
+      ActiveRecord::Base.connection.reconnect!
+
       # saving additional informations
       s = {}
       s[:db_version]         = "#{ActiveRecord::Migrator.current_version}"

From cdcedd5b26fcabba451747f37fd2942fe6775410 Mon Sep 17 00:00:00 2001
From: 3kami3 <github@yumimix.org>
Date: Tue, 19 Jan 2016 22:17:21 +0900
Subject: [PATCH 044/134] Add an option to supply root email through an
 environmental variable.

---
 CHANGELOG                           | 1 +
 db/fixtures/production/001_admin.rb | 4 +++-
 doc/install/installation.md         | 4 ++--
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 983a219703a..488b68000df 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -4,6 +4,7 @@ v 8.5.0 (unreleased)
   - Ensure rake tasks that don't need a DB connection can be run without one
   - Update New Relic gem to 3.14.1.311 (Stan Hu)
   - Add "visibility" flag to GET /projects api endpoint
+  - Add an option to supply root email through an environmental variable (Koichiro Mikami)
   - Ignore binary files in code search to prevent Error 500 (Stan Hu)
   - Render sanitized SVG images (Stan Hu)
   - Support download access by PRIVATE-TOKEN header (Stan Hu)
diff --git a/db/fixtures/production/001_admin.rb b/db/fixtures/production/001_admin.rb
index b0c0b6450f6..308b0528c9b 100644
--- a/db/fixtures/production/001_admin.rb
+++ b/db/fixtures/production/001_admin.rb
@@ -6,8 +6,10 @@ else
   expire_time = nil
 end
 
+email = ENV['GITLAB_ROOT_EMAIL'].presence || 'admin@example.com'
+
 admin = User.create(
-  email: "admin@example.com",
+  email: email,
   name: "Administrator",
   username: 'root',
   password: password,
diff --git a/doc/install/installation.md b/doc/install/installation.md
index 3eb9b1767c5..39c9b12ade9 100644
--- a/doc/install/installation.md
+++ b/doc/install/installation.md
@@ -373,9 +373,9 @@ GitLab Shell is an SSH access and repository management software developed speci
 
     # When done you see 'Administrator account created:'
 
-**Note:** You can set the Administrator/root password by supplying it in environmental variable `GITLAB_ROOT_PASSWORD` as seen below. If you don't set the password (and it is set to the default one) please wait with exposing GitLab to the public internet until the installation is done and you've logged into the server the first time. During the first login you'll be forced to change the default password.
+**Note:** You can set the Administrator/root password and e-mail by supplying them in environmental variables, `GITLAB_ROOT_PASSWORD` and `GITLAB_ROOT_EMAIL` respectively, as seen below. If you don't set the password (and it is set to the default one) please wait with exposing GitLab to the public internet until the installation is done and you've logged into the server the first time. During the first login you'll be forced to change the default password.
 
-    sudo -u git -H bundle exec rake gitlab:setup RAILS_ENV=production GITLAB_ROOT_PASSWORD=yourpassword
+    sudo -u git -H bundle exec rake gitlab:setup RAILS_ENV=production GITLAB_ROOT_PASSWORD=yourpassword GITLAB_ROOT_EMAIL=youremail
 
 ### Secure secrets.yml
 

From 4558bb1f4a4be88bd05f0de9826686a86d63acad Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Tue, 9 Feb 2016 00:44:27 +0100
Subject: [PATCH 045/134] Filter out variables from production logs

This prevents leakage of CI Secure Variables
---
 config/application.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/application.rb b/config/application.rb
index d255ff0719f..33d7b881fa4 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -31,7 +31,7 @@ module Gitlab
     config.encoding = "utf-8"
 
     # Configure sensitive parameters which will be filtered from the log file.
-    config.filter_parameters.push(:password, :password_confirmation, :private_token, :otp_attempt)
+    config.filter_parameters.push(:password, :password_confirmation, :private_token, :otp_attempt, :variables)
 
     # Enable escaping HTML in JSON.
     config.active_support.escape_html_entities_in_json = true

From 078ec5e414bde2d8014d40cd476917d75d4756ac Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Tue, 9 Feb 2016 01:08:49 +0100
Subject: [PATCH 046/134] Add information about expose of build variables.

---
 app/views/projects/variables/show.html.haml | 4 +++-
 doc/ci/variables/README.md                  | 5 ++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/views/projects/variables/show.html.haml b/app/views/projects/variables/show.html.haml
index e80dffc1ced..efe1e6f24c2 100644
--- a/app/views/projects/variables/show.html.haml
+++ b/app/views/projects/variables/show.html.haml
@@ -3,9 +3,11 @@
   Secret Variables
 
 %p.light
-  These variables will be set to environment by the runner and will be hidden in the build log.
+  These variables will be set to environment by the runner.
   %br
   So you can use them for passwords, secret keys or whatever you want.
+  %br
+  The value of the variable can be visible in build log if explicitly asked to do so.
 
 %hr
 
diff --git a/doc/ci/variables/README.md b/doc/ci/variables/README.md
index 862cacda586..018d1898594 100644
--- a/doc/ci/variables/README.md
+++ b/doc/ci/variables/README.md
@@ -77,9 +77,12 @@ More information about Docker integration can be found in [Using Docker Images](
 
 GitLab CI allows you to define per-project **Secure Variables** that are set in build environment. 
 The secure variables are stored out of the repository (the `.gitlab-ci.yml`).
-These variables are securely stored in GitLab CI database and are hidden in the build log.
+The variables are securely passed to GitLab Runner and are available in build environment.
 It's desired method to use them for storing passwords, secret keys or whatever you want.
 
+**The value of the variable can be shown in build log if explicitly asked to do so.**
+If your project is public or internal you can make the builds private.
+
 Secure Variables can added by going to `Project > Variables > Add Variable`.
 
 They will be available for all subsequent builds.

From e080fdad6ebddfda8e78f3fc1e553206a1fbd6c7 Mon Sep 17 00:00:00 2001
From: "Artem V. Navrotskiy" <bozaro@yandex.ru>
Date: Tue, 9 Feb 2016 07:30:06 +0300
Subject: [PATCH 047/134] Change default smpt port to 465 (default smtps port)

---
 config/initializers/smtp_settings.rb.sample | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/initializers/smtp_settings.rb.sample b/config/initializers/smtp_settings.rb.sample
index ec182502d4e..2287a76fca7 100644
--- a/config/initializers/smtp_settings.rb.sample
+++ b/config/initializers/smtp_settings.rb.sample
@@ -12,7 +12,7 @@ if Rails.env.production?
 
   ActionMailer::Base.smtp_settings = {
     address: "email.server.com",
-    port: 456,
+    port: 465,
     user_name: "smtp",
     password: "123456",
     domain: "gitlab.company.com",

From 2d59a0ff448cbb970db5754787753db810a9acc4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Coutable?= <remy@rymai.me>
Date: Mon, 8 Feb 2016 15:54:34 +0100
Subject: [PATCH 048/134] Add a spec for setting/updating a MR's milestone via
 the API

---
 spec/requests/api/merge_requests_spec.rb | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/spec/requests/api/merge_requests_spec.rb b/spec/requests/api/merge_requests_spec.rb
index d7bfa17b0b1..aa12d456aa9 100644
--- a/spec/requests/api/merge_requests_spec.rb
+++ b/spec/requests/api/merge_requests_spec.rb
@@ -10,6 +10,7 @@ describe API::API, api: true  do
   let!(:merge_request_merged) { create(:merge_request, state: "merged", author: user, assignee: user, source_project: project, target_project: project, title: "Merged test", created_at: base_time + 2.seconds) }
   let!(:note) { create(:note_on_merge_request, author: user, project: project, noteable: merge_request, note: "a comment on a MR") }
   let!(:note2) { create(:note_on_merge_request, author: user, project: project, noteable: merge_request, note: "another comment on a MR") }
+  let(:milestone) { create(:milestone, title: '1.0.0', project: project) }
 
   before do
     project.team << [user, :reporters]
@@ -169,10 +170,12 @@ describe API::API, api: true  do
              source_branch: 'feature_conflict',
              target_branch: 'master',
              author: user,
-             labels: 'label, label2'
+             labels: 'label, label2',
+             milestone_id: milestone.id
         expect(response.status).to eq(201)
         expect(json_response['title']).to eq('Test merge_request')
         expect(json_response['labels']).to eq(['label', 'label2'])
+        expect(json_response['milestone']['id']).to eq(milestone.id)
       end
 
       it "should return 422 when source_branch equals target_branch" do
@@ -373,18 +376,24 @@ describe API::API, api: true  do
   end
 
   describe "PUT /projects/:id/merge_requests/:merge_request_id" do
-    it "should return merge_request" do
+    it "updates title and returns merge_request" do
       put api("/projects/#{project.id}/merge_requests/#{merge_request.id}", user), title: "New title"
       expect(response.status).to eq(200)
       expect(json_response['title']).to eq('New title')
     end
 
-    it "should return merge_request" do
+    it "updates description and returns merge_request" do
       put api("/projects/#{project.id}/merge_requests/#{merge_request.id}", user), description: "New description"
       expect(response.status).to eq(200)
       expect(json_response['description']).to eq('New description')
     end
 
+    it "updates milestone_id and returns merge_request" do
+      put api("/projects/#{project.id}/merge_requests/#{merge_request.id}", user), milestone_id: milestone.id
+      expect(response.status).to eq(200)
+      expect(json_response['milestone']['id']).to eq(milestone.id)
+    end
+
     it "should return 400 when source_branch is specified" do
       put api("/projects/#{project.id}/merge_requests/#{merge_request.id}", user),
       source_branch: "master", target_branch: "master"

From 16ff8858c466179858a627304c8ed3237713f61d Mon Sep 17 00:00:00 2001
From: Valery Sizov <valery@gitlab.com>
Date: Tue, 9 Feb 2016 12:05:47 +0200
Subject: [PATCH 049/134] update changelog

---
 CHANGELOG | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 109ec41ab89..e06d8476d36 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -38,10 +38,10 @@ v 8.5.0 (unreleased)
   - Hide remove source branch button when the MR is merged but new commits are pushed (Zeger-Jan van de Weg)
   - In seach autocomplete show only groups and projects you are member of
   - Fix: init.d script not working on OS X
+  - Faster snippet search
 
 v 8.4.4
   - Update omniauth-saml gem to 1.4.2
-  - Faster snippet search
 
 v 8.4.3
   - Increase lfs_objects size column to 8-byte integer to allow files larger

From 1cbc75b53cac7a494d673ee73be126aec131b296 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Fri, 5 Feb 2016 10:12:36 +0100
Subject: [PATCH 050/134] Validate maximum attachment size in application
 settings

`max_attachment_size` in `ApplicationSetting` should be present,
only integers greater than zero are valid.

Closes #13188
---
 app/models/application_setting.rb       | 4 ++++
 spec/models/application_setting_spec.rb | 8 ++++++++
 2 files changed, 12 insertions(+)

diff --git a/app/models/application_setting.rb b/app/models/application_setting.rb
index 9cafc78f761..5e1cf7749fa 100644
--- a/app/models/application_setting.rb
+++ b/app/models/application_setting.rb
@@ -92,6 +92,10 @@ class ApplicationSetting < ActiveRecord::Base
             presence: true,
             if: :akismet_enabled
 
+  validates :max_attachment_size,
+            presence: true,
+            numericality: { only_integer: true, greater_than: 0 }
+
   validates_each :restricted_visibility_levels do |record, attr, value|
     unless value.nil?
       value.each do |level|
diff --git a/spec/models/application_setting_spec.rb b/spec/models/application_setting_spec.rb
index f4c58882757..161a32c51e6 100644
--- a/spec/models/application_setting_spec.rb
+++ b/spec/models/application_setting_spec.rb
@@ -66,6 +66,14 @@ describe ApplicationSetting, models: true do
     it { is_expected.to allow_value(http).for(:after_sign_out_path) }
     it { is_expected.to allow_value(https).for(:after_sign_out_path) }
     it { is_expected.not_to allow_value(ftp).for(:after_sign_out_path) }
+
+    it { is_expected.to validate_presence_of(:max_attachment_size) }
+
+    it do
+      is_expected.to validate_numericality_of(:max_attachment_size)
+        .only_integer
+        .is_greater_than(0)
+    end
   end
 
   context 'restricted signup domains' do

From dd3b9feafa958742d2772078309ede027720d4c0 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Fri, 5 Feb 2016 10:24:14 +0100
Subject: [PATCH 051/134] Add Changelog entry for new maximum attachment size
 validator

---
 CHANGELOG | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG b/CHANGELOG
index 9245895bf0c..1db293fa3e8 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -40,6 +40,7 @@ v 8.5.0 (unreleased)
   - In seach autocomplete show only groups and projects you are member of
   - Fix: init.d script not working on OS X
   - Faster snippet search
+  - Validate correctness of maximum attachment size application setting
 
 v 8.4.4
   - Update omniauth-saml gem to 1.4.2

From 9474e36f462522af1804e760e5fe134f101fce08 Mon Sep 17 00:00:00 2001
From: Jason Lee <huacnlee@gmail.com>
Date: Tue, 26 Jan 2016 21:34:42 +0800
Subject: [PATCH 052/134] Add option to include the sender name in body of
 Notify email. fix #7824

---
 CHANGELOG                                     |  1 +
 .../admin/application_settings_controller.rb  |  1 +
 app/models/application_setting.rb             |  1 +
 .../application_settings/_form.html.haml      | 10 +++++
 app/views/notify/_note_message.html.haml      |  3 ++
 app/views/notify/new_issue_email.html.haml    |  3 ++
 .../notify/new_merge_request_email.html.haml  |  3 ++
 ..._author_in_body_to_application_settings.rb |  5 +++
 db/schema.rb                                  |  1 +
 spec/mailers/notify_spec.rb                   | 37 +++++++++++++++++++
 10 files changed, 65 insertions(+)
 create mode 100644 db/migrate/20160121030729_add_email_author_in_body_to_application_settings.rb

diff --git a/CHANGELOG b/CHANGELOG
index c0562feafca..664b543bea1 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -9,6 +9,7 @@ v 8.5.0 (unreleased)
   - Render sanitized SVG images (Stan Hu)
   - Support download access by PRIVATE-TOKEN header (Stan Hu)
   - Upgrade gitlab_git to 7.2.23 to fix commit message mentions in first branch push
+  - Add option to include the sender name in body of Notify email (Jason Lee)
   - New UI for pagination
   - Don't prevent sign out when 2FA enforcement is enabled and user hasn't yet
     set it up
diff --git a/app/controllers/admin/application_settings_controller.rb b/app/controllers/admin/application_settings_controller.rb
index 1515086b16d..04a99d8c84a 100644
--- a/app/controllers/admin/application_settings_controller.rb
+++ b/app/controllers/admin/application_settings_controller.rb
@@ -81,6 +81,7 @@ class Admin::ApplicationSettingsController < Admin::ApplicationController
       :sentry_dsn,
       :akismet_enabled,
       :akismet_api_key,
+      :email_author_in_body,
       restricted_visibility_levels: [],
       import_sources: []
     )
diff --git a/app/models/application_setting.rb b/app/models/application_setting.rb
index 9cafc78f761..44bbe5fb168 100644
--- a/app/models/application_setting.rb
+++ b/app/models/application_setting.rb
@@ -43,6 +43,7 @@
 #  metrics_port                      :integer          default(8089)
 #  sentry_enabled                    :boolean          default(FALSE)
 #  sentry_dsn                        :string
+#  email_author_in_body              :boolean          default(FALSE)
 #
 
 class ApplicationSetting < ActiveRecord::Base
diff --git a/app/views/admin/application_settings/_form.html.haml b/app/views/admin/application_settings/_form.html.haml
index b4e3d96d405..b30dfd109ea 100644
--- a/app/views/admin/application_settings/_form.html.haml
+++ b/app/views/admin/application_settings/_form.html.haml
@@ -47,6 +47,16 @@
           = f.label :version_check_enabled do
             = f.check_box :version_check_enabled
             Version check enabled
+    .form-group
+      .col-sm-offset-2.col-sm-10
+        .checkbox
+          = f.label :email_author_in_body do
+            = f.check_box :email_author_in_body
+            Include author name in notification email body
+          .help-block
+            Some email servers do not support overriding the email sender name.
+            Enable this option to include the name of the author of the issue,
+            merge request or comment in the email body instead.
     .form-group
       = f.label :admin_notification_email, class: 'control-label col-sm-2'
       .col-sm-10
diff --git a/app/views/notify/_note_message.html.haml b/app/views/notify/_note_message.html.haml
index 00cb4aa24cc..12ded41fbf2 100644
--- a/app/views/notify/_note_message.html.haml
+++ b/app/views/notify/_note_message.html.haml
@@ -1,2 +1,5 @@
+- if current_application_settings.email_author_in_body
+  %div
+    #{link_to @note.author_name, user_url(@note.author)} wrote:
 %div
   = markdown(@note.note, pipeline: :email)
diff --git a/app/views/notify/new_issue_email.html.haml b/app/views/notify/new_issue_email.html.haml
index d3b799fca23..ad3ab2525bb 100644
--- a/app/views/notify/new_issue_email.html.haml
+++ b/app/views/notify/new_issue_email.html.haml
@@ -1,3 +1,6 @@
+- if current_application_settings.email_author_in_body
+  %div
+    #{link_to @issue.author_name, user_url(@issue.author)} wrote:
 -if @issue.description
   = markdown(@issue.description, pipeline: :email)
 
diff --git a/app/views/notify/new_merge_request_email.html.haml b/app/views/notify/new_merge_request_email.html.haml
index 90ebdfc3fe2..23423e7d981 100644
--- a/app/views/notify/new_merge_request_email.html.haml
+++ b/app/views/notify/new_merge_request_email.html.haml
@@ -1,3 +1,6 @@
+- if current_application_settings.email_author_in_body
+  %div
+    #{link_to @merge_request.author_name, user_url(@merge_request.author)} wrote:
 %p.details
   != merge_path_description(@merge_request, '&rarr;')
 
diff --git a/db/migrate/20160121030729_add_email_author_in_body_to_application_settings.rb b/db/migrate/20160121030729_add_email_author_in_body_to_application_settings.rb
new file mode 100644
index 00000000000..d50791410f9
--- /dev/null
+++ b/db/migrate/20160121030729_add_email_author_in_body_to_application_settings.rb
@@ -0,0 +1,5 @@
+class AddEmailAuthorInBodyToApplicationSettings < ActiveRecord::Migration
+  def change
+    add_column :application_settings, :email_author_in_body, :boolean, default: false
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index d4710346b82..f2eb48e37ed 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -66,6 +66,7 @@ ActiveRecord::Schema.define(version: 20160129135155) do
     t.string   "sentry_dsn"
     t.boolean  "akismet_enabled",                   default: false
     t.string   "akismet_api_key"
+    t.boolean  "email_author_in_body",              default: false
   end
 
   create_table "audit_events", force: :cascade do |t|
diff --git a/spec/mailers/notify_spec.rb b/spec/mailers/notify_spec.rb
index 7289e596ef3..82bd057b16c 100644
--- a/spec/mailers/notify_spec.rb
+++ b/spec/mailers/notify_spec.rb
@@ -270,6 +270,17 @@ describe Notify do
           it 'contains a link to the new issue' do
             is_expected.to have_body_text /#{namespace_project_issue_path project.namespace, project, issue}/
           end
+
+          context 'when enabled email_author_in_body' do
+            before do
+              allow(current_application_settings).to receive(:email_author_in_body).and_return(true)
+            end
+
+            it 'contains a link to note author' do
+              is_expected.to have_body_text issue.author_name
+              is_expected.to have_body_text /wrote\:/
+            end
+          end
         end
 
         describe 'that are new with a description' do
@@ -377,6 +388,17 @@ describe Notify do
           it 'has the correct message-id set' do
             is_expected.to have_header 'Message-ID', "<merge_request_#{merge_request.id}@#{Gitlab.config.gitlab.host}>"
           end
+
+          context 'when enabled email_author_in_body' do
+            before do
+              allow(current_application_settings).to receive(:email_author_in_body).and_return(true)
+            end
+
+            it 'contains a link to note author' do
+              is_expected.to have_body_text merge_request.author_name
+              is_expected.to have_body_text /wrote\:/
+            end
+          end
         end
 
         describe 'that are new with a description' do
@@ -550,6 +572,21 @@ describe Notify do
         it 'contains the message from the note' do
           is_expected.to have_body_text /#{note.note}/
         end
+
+        it 'not contains note author' do
+          is_expected.not_to have_body_text /wrote\:/
+        end
+
+        context 'when enabled email_author_in_body' do
+          before do
+            allow(current_application_settings).to receive(:email_author_in_body).and_return(true)
+          end
+
+          it 'contains a link to note author' do
+            is_expected.to have_body_text note.author_name
+            is_expected.to have_body_text /wrote\:/
+          end
+        end
       end
 
       describe 'on a commit' do

From 6c3cd241e87938373d31d5d4914fccda74145e02 Mon Sep 17 00:00:00 2001
From: Valery Sizov <valery@gitlab.com>
Date: Tue, 9 Feb 2016 15:10:22 +0200
Subject: [PATCH 053/134] Add index for snippet's updated_at

---
 db/migrate/20160209130428_add_index_to_snippet.rb | 5 +++++
 db/schema.rb                                      | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 db/migrate/20160209130428_add_index_to_snippet.rb

diff --git a/db/migrate/20160209130428_add_index_to_snippet.rb b/db/migrate/20160209130428_add_index_to_snippet.rb
new file mode 100644
index 00000000000..95d5719be59
--- /dev/null
+++ b/db/migrate/20160209130428_add_index_to_snippet.rb
@@ -0,0 +1,5 @@
+class AddIndexToSnippet < ActiveRecord::Migration
+  def change
+    add_index :snippets, :updated_at
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index d4710346b82..87bca70b117 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20160129135155) do
+ActiveRecord::Schema.define(version: 20160209130428) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -770,6 +770,7 @@ ActiveRecord::Schema.define(version: 20160129135155) do
   add_index "snippets", ["created_at"], name: "index_snippets_on_created_at", using: :btree
   add_index "snippets", ["expires_at"], name: "index_snippets_on_expires_at", using: :btree
   add_index "snippets", ["project_id"], name: "index_snippets_on_project_id", using: :btree
+  add_index "snippets", ["updated_at"], name: "index_snippets_on_updated_at", using: :btree
   add_index "snippets", ["visibility_level"], name: "index_snippets_on_visibility_level", using: :btree
 
   create_table "spam_logs", force: :cascade do |t|

From 4603e5714705da75fda4ef4857c327ac4b087848 Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Mon, 8 Feb 2016 21:52:00 -0800
Subject: [PATCH 054/134] Fix duplicated branch creation/deletion Web
 hooks/service notifications when using Web UI

Similar to 423d2d6, except duplicates occurred only if a Web service (e.g. Slack) were
configured.

When deleting a branch, this is what was happening:

    1. DeleteBranchService calls execute_hooks and execute_services
    2. The call to repository.rm_branch triggers the GitHooksService.
    3. This, in turn, calls GitPushService and then calls the same hooks/services again.

5145706 now makes it no longer necessary for DeleteBranchService and CreateBranchService to execute
the branch hooks/services. Note that tags behave differently in GitTagPushService and GitPushService
is not called.

Closes #10330
---
 CHANGELOG                             | 1 +
 app/services/create_branch_service.rb | 6 +-----
 app/services/delete_branch_service.rb | 6 +-----
 3 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 5785aaa13bb..f6cf3c40ba2 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,7 @@ Please view this file on the master branch, on stable branches it's out of date.
 
 v 8.5.0 (unreleased)
   - Cache various Repository methods to improve performance (Yorick Peterse)
+  - Fix duplicated branch creation/deletion Web hooks/service notifications when using Web UI (Stan Hu)
   - Ensure rake tasks that don't need a DB connection can be run without one
   - Update New Relic gem to 3.14.1.311 (Stan Hu)
   - Add "visibility" flag to GET /projects api endpoint
diff --git a/app/services/create_branch_service.rb b/app/services/create_branch_service.rb
index c0e08a151f2..707c2f7ff85 100644
--- a/app/services/create_branch_service.rb
+++ b/app/services/create_branch_service.rb
@@ -29,11 +29,7 @@ class CreateBranchService < BaseService
     end
 
     if new_branch
-      push_data = build_push_data(project, current_user, new_branch)
-
-      project.execute_hooks(push_data.dup, :push_hooks)
-      project.execute_services(push_data.dup, :push_hooks)
-
+      # GitPushService handles execution of services and hooks for branch pushes
       success(new_branch)
     else
       error('Invalid reference name')
diff --git a/app/services/delete_branch_service.rb b/app/services/delete_branch_service.rb
index 004b3ce7286..fae069ee4a5 100644
--- a/app/services/delete_branch_service.rb
+++ b/app/services/delete_branch_service.rb
@@ -25,11 +25,7 @@ class DeleteBranchService < BaseService
     end
 
     if repository.rm_branch(current_user, branch_name)
-      push_data = build_push_data(branch)
-
-      project.execute_hooks(push_data.dup, :push_hooks)
-      project.execute_services(push_data.dup, :push_hooks)
-
+      # GitPushService handles execution of services and hooks for branch pushes
       success('Branch was removed')
     else
       error('Failed to remove branch')

From 41a957591274895bc15848744c35ee28adea0682 Mon Sep 17 00:00:00 2001
From: Achilleas Pipinellis <axilleas@axilleas.me>
Date: Tue, 9 Feb 2016 16:31:38 +0200
Subject: [PATCH 055/134] Add relative URL documentation

---
 doc/install/installation.md |   5 ++
 doc/install/relative_url.md | 123 ++++++++++++++++++++++++++++++++++++
 2 files changed, 128 insertions(+)
 create mode 100644 doc/install/relative_url.md

diff --git a/doc/install/installation.md b/doc/install/installation.md
index 3eb9b1767c5..86d37d64edd 100644
--- a/doc/install/installation.md
+++ b/doc/install/installation.md
@@ -484,6 +484,11 @@ You can use `sudo service gitlab start` and `sudo service gitlab stop` to start
 
 ## Advanced Setup Tips
 
+### Relative URL support
+
+See the [Relative URL documentation](relative_url.md) for more information on
+how to set this up.
+
 ### Using HTTPS
 
 To use GitLab with HTTPS:
diff --git a/doc/install/relative_url.md b/doc/install/relative_url.md
new file mode 100644
index 00000000000..e6d530e2729
--- /dev/null
+++ b/doc/install/relative_url.md
@@ -0,0 +1,123 @@
+## Install GitLab under a relative URL
+
+_**Note:**
+This document describes how to run GitLab under a relative URL for installations
+from source. If you are using an Omnibus package,
+[the steps are different][omnibus-rel]. Use this guide along with the
+[installation guide](installation.md) if you are installing GitLab for the
+first time._
+
+---
+
+While it is recommended to install GitLab in its own (sub)domain, sometimes
+this is not possible due to a variety of reasons. In that case, GitLab can also
+be installed under a relative URL, for example `https://example.com/gitlab`.
+
+There is no limit as to how much deeply nested the relative URL can be. For
+example you could serve GitLab under `/foo/bar/gitlab/git` without any issues.
+
+Note that by changing the URL on an existing GitLab installation, all remote
+URLS will change, so you'll have to manually edit them in any local repository
+that points to your GitLab instance.
+
+---
+
+The TL;DR list of configuration files that you need to change in order to
+serve GitLab under a relative URL is:
+
+- `/home/git/gitlab/config/application.rb`
+- `/home/git/gitlab/config/gitlab.yml`
+- `/home/git/gitlab/config/unicorn.rb`
+- `/home/git/gitlab-shell/config.yml`
+- `/etc/default/gitlab`
+
+After all the changes you need to recompile the assets and [restart GitLab].
+
+### Relative URL requirements
+
+If you configure GitLab with a relative URL, the assets (JavaScript, CSS, fonts,
+images, etc.) will need to be recompiled, which is a task which consumes a lot
+of CPU and memory resources. To avoid out-of-memory errors, you should have at
+least 2GB of RAM available on your system, while we recommend 4GB RAM, and 4 or
+8 CPU cores.
+
+See the [requirements](requirements.md) document for more information.
+
+### Enable relative URL in GitLab
+
+_**Note:**
+Do not make any changes to your web server configuration file regarding
+relative URL. The relative URL support is basically implemented by GitLab
+Workhorse._
+
+---
+
+Before following the steps below to enable relative URL in GitLab, some
+assumptions are made:
+
+- GitLab is served under `/gitlab`
+- The directory under which GitLab is installed is `/home/git/`
+
+Make sure to follow all steps below:
+
+1.  (Optional) If you run short on resources, you can temporarily free up some
+    memory by shutting down the GitLab service with the following command:
+
+    ```shell
+    sudo service gitlab stop
+    ```
+
+1.  Edit `/home/git/gitlab/config/application.rb` and uncomment/change the
+    following line:
+
+    ```ruby
+    config.relative_url_root = "/gitlab"
+    ```
+
+1.  Edit `/home/git/gitlab/config/gitlab.yml` and uncomment/change the
+    following line:
+
+    ```yaml
+    relative_url_root: /gitlab
+    ```
+
+1.  Edit `/home/git/gitlab/config/unicorn.rb` and uncomment/change the
+    following line:
+
+    ```ruby
+    ENV['RAILS_RELATIVE_URL_ROOT'] = "/gitlab"
+    ```
+
+1.  Edit `/home/git/gitlab-shell/config.yml` and append the relative path to
+    the following line:
+
+    ```yaml
+    gitlab_url: http://127.0.0.1/gitlab
+    ```
+
+1.  Make sure you have copied the supplied init script and the defaults file
+    as stated in the [installation guide](installation.md#install-init-script).
+    Then, edit `/etc/default/gitlab` and set in `gitlab_workhorse_options` the
+    `-authBackend` to read like:
+
+    ```shell
+    -authBackend http://127.0.0.1:8080/gitlab
+    ```
+
+1.  After all the above changes recompile the assets. This is an important task
+    and will take some time to complete depending on the server resources.
+
+    ```
+    cd /home/git/gitlab
+    sudo -u git -H bundle exec rake assets:clean assets:precompile RAILS_ENV=production
+    ```
+
+1. [Restart GitLab][] for the changes to take effect.
+
+### Disable relative URL in GitLab
+
+To disable the relative URL, follow the same steps as above and set up the
+GitLab URL to a one that doesn't contain a relative path.
+
+[omnibus-rel]: http://doc.gitlab.com/omnibus/settings/configuration.html#configuring-a-relative-url-for-gitlab "How to setup relative URL in Omnibus GitLab"
+[restart gitlab]: ../administration/restart_gitlab.md#installations-from-source "How to restart GitLab"

From b532109b97a7764aef808673a084da1731ed452d Mon Sep 17 00:00:00 2001
From: Achilleas Pipinellis <axilleas@axilleas.me>
Date: Tue, 9 Feb 2016 16:50:42 +0200
Subject: [PATCH 056/134] Edit configuration files for relative URL support

[ci skip]
---
 config/application.rb                     | 15 ++++-----------
 config/gitlab.yml.example                 |  7 +++++--
 config/unicorn.rb.example                 |  8 +++++---
 lib/support/init.d/gitlab.default.example | 13 +++++++++----
 4 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/config/application.rb b/config/application.rb
index d255ff0719f..17574d8c992 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -52,17 +52,10 @@ module Gitlab
 
     config.action_view.sanitized_allowed_protocols = %w(smb)
 
-    # Relative url support
-    # Uncomment and customize the last line to run in a non-root path
-    # WARNING: We recommend creating a FQDN to host GitLab in a root path instead of this.
-    # Note that following settings need to be changed for this to work.
-    # 1) In your application.rb file: config.relative_url_root = "/gitlab"
-    # 2) In your gitlab.yml file: relative_url_root: /gitlab
-    # 3) In your unicorn.rb: ENV['RAILS_RELATIVE_URL_ROOT'] = "/gitlab"
-    # 4) In ../gitlab-shell/config.yml: gitlab_url: "http://127.0.0.1/gitlab"
-    # 5) In lib/support/nginx/gitlab : do not use asset gzipping, remove block starting with "location ~ ^/(assets)/"
-    #
-    # To update the path, run: sudo -u git -H bundle exec rake assets:precompile RAILS_ENV=production
+    # Relative URL support
+    # WARNING: We recommend using an FQDN to host GitLab in a root path instead of this.
+    # Documentation: http://doc.gitlab.com/ce/install/relative_url.html
+    # Uncomment and customize the following line to run in a non-root path
     #
     # config.relative_url_root = "/gitlab"
 
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
index d6e2c9380a5..667e32dd671 100644
--- a/config/gitlab.yml.example
+++ b/config/gitlab.yml.example
@@ -38,8 +38,11 @@ production: &base
     # Otherwise, ssh host will be set to the `host:` value above
     # ssh_host: ssh.host_example.com
 
-    # WARNING: See config/application.rb under "Relative url support" for the list of
-    # other files that need to be changed for relative url support
+    # Relative URL support
+    # WARNING: We recommend using an FQDN to host GitLab in a root path instead of this.
+    # Documentation: http://doc.gitlab.com/ce/install/relative_url.html
+    # Uncomment and customize the following line to run in a non-root path
+    #
     # relative_url_root: /gitlab
 
     # Uncomment and customize if you can't use the default user to run GitLab (default: 'git')
diff --git a/config/unicorn.rb.example b/config/unicorn.rb.example
index b937b092789..02b251f1847 100644
--- a/config/unicorn.rb.example
+++ b/config/unicorn.rb.example
@@ -10,9 +10,11 @@
 
 # Note: If you change this file in a Merge Request, please also create a
 # Merge Request on https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests
-#
-# WARNING: See config/application.rb under "Relative url support" for the list of
-# other files that need to be changed for relative url support
+
+# Relative URL support
+# WARNING: We recommend using an FQDN to host GitLab in a root path instead of this.
+# Documentation: http://doc.gitlab.com/ce/install/relative_url.html
+# Uncomment and customize the following line to run in a non-root path
 #
 # ENV['RAILS_RELATIVE_URL_ROOT'] = "/gitlab"
 
diff --git a/lib/support/init.d/gitlab.default.example b/lib/support/init.d/gitlab.default.example
index 4e6e56ac2db..cc8617b72ca 100755
--- a/lib/support/init.d/gitlab.default.example
+++ b/lib/support/init.d/gitlab.default.example
@@ -34,11 +34,16 @@ sidekiq_pid_path="$pid_path/sidekiq.pid"
 # /home/git/gitlab-workhorse .
 gitlab_workhorse_dir=$(cd $app_root/../gitlab-workhorse && pwd)
 gitlab_workhorse_pid_path="$pid_path/gitlab-workhorse.pid"
+
 # The -listenXxx settings determine where gitlab-workhorse
-# listens for connections from NGINX. To listen on localhost:8181, write
-# '-listenNetwork tcp -listenAddr localhost:8181'.
-# The -authBackend setting tells gitlab-workhorse where it can reach
-# Unicorn.
+# listens for connections from the web server. By default it listens to a
+# socket. To listen on TCP connections (needed by Apache) change to:
+# '-listenNetwork tcp -listenAddr 127.0.0.1:8181'
+#
+# The -authBackend setting tells gitlab-workhorse where it can reach Unicorn.
+# For relative URL support change to:
+# '-authBackend http://127.0.0.1/8080/gitlab'
+# Read more in http://doc.gitlab.com/ce/install/relative_url.html
 gitlab_workhorse_options="-listenUmask 0 -listenNetwork unix -listenAddr $socket_path/gitlab-workhorse.socket -authBackend http://127.0.0.1:8080 -authSocket $socket_path/gitlab.socket -documentRoot $app_root/public"
 gitlab_workhorse_log="$app_root/log/gitlab-workhorse.log"
 

From f81495b1e1afeacedf7bc66b69e238e3db53010f Mon Sep 17 00:00:00 2001
From: Achilleas Pipinellis <axilleas@axilleas.me>
Date: Tue, 9 Feb 2016 17:04:41 +0200
Subject: [PATCH 057/134] Add note on using a custom init script

[ci skip]
---
 doc/install/relative_url.md | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/doc/install/relative_url.md b/doc/install/relative_url.md
index e6d530e2729..24dde42b310 100644
--- a/doc/install/relative_url.md
+++ b/doc/install/relative_url.md
@@ -98,12 +98,16 @@ Make sure to follow all steps below:
 1.  Make sure you have copied the supplied init script and the defaults file
     as stated in the [installation guide](installation.md#install-init-script).
     Then, edit `/etc/default/gitlab` and set in `gitlab_workhorse_options` the
-    `-authBackend` to read like:
+    `-authBackend` setting to read like:
 
     ```shell
     -authBackend http://127.0.0.1:8080/gitlab
     ```
 
+    **Note:**
+    If you are using a custom init script, make sure to edit the above
+    gitlab-workhorse setting as needed.
+
 1.  After all the above changes recompile the assets. This is an important task
     and will take some time to complete depending on the server resources.
 

From dd1a683c6411588141c262187d404899e5689521 Mon Sep 17 00:00:00 2001
From: Josh Frye <joshfng@gmail.com>
Date: Fri, 5 Feb 2016 10:56:22 -0500
Subject: [PATCH 058/134] Fix explore filter. Fixes #13182

---
 app/assets/javascripts/dashboard.js.coffee    |  1 +
 .../javascripts/projects_list.js.coffee       | 36 ++++++++++---------
 app/views/explore/projects/_filter.html.haml  |  8 -----
 3 files changed, 21 insertions(+), 24 deletions(-)

diff --git a/app/assets/javascripts/dashboard.js.coffee b/app/assets/javascripts/dashboard.js.coffee
index dd295088312..c2c28a50440 100644
--- a/app/assets/javascripts/dashboard.js.coffee
+++ b/app/assets/javascripts/dashboard.js.coffee
@@ -1,5 +1,6 @@
 @Dashboard =
   init: ->
+    $("#project-filter-form-field").unbind()
     this.initSearch()
 
   initSearch: ->
diff --git a/app/assets/javascripts/projects_list.js.coffee b/app/assets/javascripts/projects_list.js.coffee
index ebf7140b7e3..873495bfe72 100644
--- a/app/assets/javascripts/projects_list.js.coffee
+++ b/app/assets/javascripts/projects_list.js.coffee
@@ -1,24 +1,28 @@
 class @ProjectsList
   constructor: ->
+    $("#project-filter-form-field").unbind()
     $(".projects-list .js-expand").on 'click', (e) ->
       e.preventDefault()
       list = $(this).closest('.projects-list')
-      list.find("li").show()
-      list.find("li.bottom").hide()
 
-    $(".projects-list-filter").keyup ->
-      terms = $(this).val()
-      uiBox = $('div.projects-list-holder')
-      filterSelector = $(this).data('filter-selector') || 'span.filter-title'
+    $("#filter_projects").keyup ->
+      ProjectsList.filter_results("#filter_projects")
+    $("#project-filter-form-field").keyup ->
+      ProjectsList.filter_results("#project-filter-form-field")
 
-      if terms == "" || terms == undefined
-        uiBox.find("ul.projects-list li").show()
-      else
-        uiBox.find("ul.projects-list li").each (index) ->
-          name = $(this).find(filterSelector).text()
+  @filter_results: (element) ->
+    terms = $(element).val()
+    filterSelector = $(element).data('filter-selector') || 'span.filter-title'
 
-          if name.toLowerCase().search(terms.toLowerCase()) == -1
-            $(this).hide()
-          else
-            $(this).show()
-      uiBox.find("ul.projects-list li.bottom").hide()
+    if terms == "" || terms == undefined
+      $("ul.projects-list li").show()
+      $('.gl-pagination').show()
+    else
+      $("ul.projects-list li").each (index) ->
+        name = $(this).find(filterSelector).text()
+
+        if name.toLowerCase().search(terms.toLowerCase()) == -1
+          $(this).hide()
+        else
+          $(this).show()
+      $('.gl-pagination').hide()
diff --git a/app/views/explore/projects/_filter.html.haml b/app/views/explore/projects/_filter.html.haml
index 66a4b535ae5..c248dbb695f 100644
--- a/app/views/explore/projects/_filter.html.haml
+++ b/app/views/explore/projects/_filter.html.haml
@@ -1,11 +1,3 @@
-.pull-left
-  = form_tag explore_projects_filter_path, method: :get, class: 'form-inline form-tiny' do |f|
-    .form-group
-      = search_field_tag :search, params[:search], placeholder: "Filter by name", class: "form-control search-text-input", id: "projects_search", spellcheck: false
-      = hidden_field_tag :sort, @sort
-    .form-group
-      = button_tag 'Search', class: "btn"
-
 .pull-right.hidden-sm.hidden-xs
   - if current_user
     .dropdown.inline.append-right-10

From 0dc64a8ce1e9bde993ea7a862c71d7edaa69a286 Mon Sep 17 00:00:00 2001
From: Josh Frye <joshfng@gmail.com>
Date: Fri, 5 Feb 2016 13:51:17 -0500
Subject: [PATCH 059/134] JS Fixes

---
 app/assets/javascripts/dashboard.js.coffee    |  2 +-
 .../javascripts/projects_list.js.coffee       | 27 ++++++++++---------
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/app/assets/javascripts/dashboard.js.coffee b/app/assets/javascripts/dashboard.js.coffee
index c2c28a50440..c7757540b31 100644
--- a/app/assets/javascripts/dashboard.js.coffee
+++ b/app/assets/javascripts/dashboard.js.coffee
@@ -1,6 +1,6 @@
 @Dashboard =
   init: ->
-    $("#project-filter-form-field").unbind()
+    $("#project-filter-form-field").off('keyup')
     this.initSearch()
 
   initSearch: ->
diff --git a/app/assets/javascripts/projects_list.js.coffee b/app/assets/javascripts/projects_list.js.coffee
index 873495bfe72..b4f5546a42f 100644
--- a/app/assets/javascripts/projects_list.js.coffee
+++ b/app/assets/javascripts/projects_list.js.coffee
@@ -1,28 +1,29 @@
 class @ProjectsList
   constructor: ->
-    $("#project-filter-form-field").unbind()
+    $("#project-filter-form-field").off('keyup')
     $(".projects-list .js-expand").on 'click', (e) ->
       e.preventDefault()
       list = $(this).closest('.projects-list')
 
-    $("#filter_projects").keyup ->
-      ProjectsList.filter_results("#filter_projects")
-    $("#project-filter-form-field").keyup ->
-      ProjectsList.filter_results("#project-filter-form-field")
+    $("#filter_projects").on 'keyup', ->
+      ProjectsList.filter_results($("#filter_projects"))
+    $("#project-filter-form-field").on 'keyup', ->
+      ProjectsList.filter_results($("#project-filter-form-field"))
 
-  @filter_results: (element) ->
-    terms = $(element).val()
-    filterSelector = $(element).data('filter-selector') || 'span.filter-title'
+  @filter_results: ($element) ->
+    terms = $($element).val()
+    filterSelector = $($element).data('filter-selector') || 'span.filter-title'
 
-    if terms == "" || terms == undefined
+    if not terms
       $("ul.projects-list li").show()
       $('.gl-pagination').show()
     else
       $("ul.projects-list li").each (index) ->
-        name = $(this).find(filterSelector).text()
+        $this = $(this)
+        name = $this.find(filterSelector).text()
 
-        if name.toLowerCase().search(terms.toLowerCase()) == -1
-          $(this).hide()
+        if name.toLowerCase().indexOf(terms.toLowerCase()) == -1
+          $this.hide()
         else
-          $(this).show()
+          $this.show()
       $('.gl-pagination').hide()

From 30e022a2feec7450c4173038d3fdfef0d6242953 Mon Sep 17 00:00:00 2001
From: Josh Frye <joshfng@gmail.com>
Date: Fri, 5 Feb 2016 14:33:24 -0500
Subject: [PATCH 060/134] Starred, All, and Trending on explore are paged also
 group projects. Need ajax filter.

---
 app/assets/javascripts/dashboard.js.coffee    |  4 +--
 app/assets/javascripts/dispatcher.js.coffee   |  2 ++
 .../javascripts/projects_list.js.coffee       |  4 +--
 .../explore/projects_controller.rb            | 30 +++++++++++++++++++
 app/controllers/groups_controller.rb          | 11 +++++--
 app/views/groups/_projects.html.haml          | 17 ++++++-----
 app/views/shared/projects/_list.html.haml     |  1 +
 7 files changed, 55 insertions(+), 14 deletions(-)

diff --git a/app/assets/javascripts/dashboard.js.coffee b/app/assets/javascripts/dashboard.js.coffee
index c7757540b31..7e77ed5e7ff 100644
--- a/app/assets/javascripts/dashboard.js.coffee
+++ b/app/assets/javascripts/dashboard.js.coffee
@@ -5,7 +5,7 @@
 
   initSearch: ->
     @timer = null
-    $("#project-filter-form-field").on('keyup', ->
+    $("#project-filter-form-field,.projects-list-filter").on('keyup', ->
       clearTimeout(@timer)
       @timer = setTimeout(Dashboard.filterResults, 500)
     )
@@ -25,7 +25,7 @@
       complete: ->
         $('.projects-list-holder').fadeTo(250, 1)
       success: (data) ->
-        $('div.projects-list-holder').replaceWith(data.html)
+        $('.projects-list-holder,.public-projects').replaceWith(data.html)
         # Change url so if user reload a page - search results are saved
         history.replaceState {page: project_filter_url}, document.title, project_filter_url
       dataType: "json"
diff --git a/app/assets/javascripts/dispatcher.js.coffee b/app/assets/javascripts/dispatcher.js.coffee
index d4a2b74b143..b17f8e51470 100644
--- a/app/assets/javascripts/dispatcher.js.coffee
+++ b/app/assets/javascripts/dispatcher.js.coffee
@@ -16,6 +16,8 @@ class Dispatcher
     shortcut_handler = null
 
     switch page
+      when 'explore:projects:index', 'explore:projects:starred', 'explore:projects:trending'
+        Dashboard.init()
       when 'projects:issues:index'
         Issues.init()
         shortcut_handler = new ShortcutsNavigation()
diff --git a/app/assets/javascripts/projects_list.js.coffee b/app/assets/javascripts/projects_list.js.coffee
index b4f5546a42f..bb392140b73 100644
--- a/app/assets/javascripts/projects_list.js.coffee
+++ b/app/assets/javascripts/projects_list.js.coffee
@@ -11,8 +11,8 @@ class @ProjectsList
       ProjectsList.filter_results($("#project-filter-form-field"))
 
   @filter_results: ($element) ->
-    terms = $($element).val()
-    filterSelector = $($element).data('filter-selector') || 'span.filter-title'
+    terms = $element.val()
+    filterSelector = $element.data('filter-selector') || 'span.filter-title'
 
     if not terms
       $("ul.projects-list li").show()
diff --git a/app/controllers/explore/projects_controller.rb b/app/controllers/explore/projects_controller.rb
index 2689bf4f1ec..317ad835006 100644
--- a/app/controllers/explore/projects_controller.rb
+++ b/app/controllers/explore/projects_controller.rb
@@ -6,19 +6,49 @@ class Explore::ProjectsController < Explore::ApplicationController
     @projects = @projects.where(visibility_level: params[:visibility_level]) if params[:visibility_level].present?
     @projects = @projects.non_archived
     @projects = @projects.search(params[:search]) if params[:search].present?
+    @projects = @projects.search(params[:filter_projects]) if params[:filter_projects].present?
     @projects = @projects.sort(@sort = params[:sort])
     @projects = @projects.includes(:namespace).page(params[:page]).per(PER_PAGE)
+
+    respond_to do |format|
+      format.html
+      format.json do
+        render json: {
+          html: view_to_html_string("dashboard/projects/_projects", locals: { projects: @projects })
+        }
+      end
+    end
   end
 
   def trending
     @projects = TrendingProjectsFinder.new.execute(current_user)
     @projects = @projects.non_archived
+    @projects = @projects.search(params[:filter_projects]) if params[:filter_projects].present?
     @projects = @projects.page(params[:page]).per(PER_PAGE)
+
+    respond_to do |format|
+      format.html
+      format.json do
+        render json: {
+          html: view_to_html_string("dashboard/projects/_projects", locals: { projects: @projects })
+        }
+      end
+    end
   end
 
   def starred
     @projects = ProjectsFinder.new.execute(current_user)
+    @projects = @projects.search(params[:filter_projects]) if params[:filter_projects].present?
     @projects = @projects.reorder('star_count DESC')
     @projects = @projects.page(params[:page]).per(PER_PAGE)
+
+    respond_to do |format|
+      format.html
+      format.json do
+        render json: {
+          html: view_to_html_string("dashboard/projects/_projects", locals: { projects: @projects })
+        }
+      end
+    end
   end
 end
diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb
index 90475c17c17..b4dd0021ed7 100644
--- a/app/controllers/groups_controller.rb
+++ b/app/controllers/groups_controller.rb
@@ -41,14 +41,21 @@ class GroupsController < Groups::ApplicationController
   def show
     @last_push = current_user.recent_push if current_user
     @projects = @projects.includes(:namespace)
+    @projects = @projects.search(params[:filter_projects]) if params[:filter_projects].present?
     @projects = @projects.page(params[:page]).per(PER_PAGE)
 
     respond_to do |format|
       format.html
 
       format.json do
-        load_events
-        pager_json("events/_events", @events.count)
+        if params[:filter_projects]
+          render json: {
+            html: view_to_html_string("dashboard/projects/_projects", locals: { projects: @projects })
+          }
+        else
+          load_events
+          pager_json("events/_events", @events.count)
+        end
       end
 
       format.atom do
diff --git a/app/views/groups/_projects.html.haml b/app/views/groups/_projects.html.haml
index a829479bb38..73305efbcb9 100644
--- a/app/views/groups/_projects.html.haml
+++ b/app/views/groups/_projects.html.haml
@@ -1,10 +1,11 @@
-.projects-list-holder.prepend-top-default
-  .input-group
-    = search_field_tag :filter_projects, nil, placeholder: 'Filter by name', class: 'projects-list-filter form-control', spellcheck: false
-    - if can? current_user, :create_projects, @group
-      %span.input-group-btn
-        = link_to new_project_path(namespace_id: @group.id), class: 'btn btn-new' do
-          = icon('plus')
-          New Project
+.top-area
+  .nav-controls
+    = form_tag request.original_url, method: :get, class: 'project-filter-form', id: 'project-filter-form' do |f|
+      = search_field_tag :filter_projects, params[:filter_projects], placeholder: 'Filter by name...', class: 'input-short project-filter-form-field form-control', spellcheck: false, id: 'project-filter-form-field'
+    - if current_user && current_user.can_create_project?
+      = link_to new_project_path, class: 'btn btn-new' do
+        = icon('plus')
+        New Project
 
+.projects-list-holder
   = render 'shared/projects/list', projects: @projects, projects_limit: 20, stars: false, skip_namespace: true
diff --git a/app/views/shared/projects/_list.html.haml b/app/views/shared/projects/_list.html.haml
index 67edb264b7e..4787502fbc2 100644
--- a/app/views/shared/projects/_list.html.haml
+++ b/app/views/shared/projects/_list.html.haml
@@ -27,3 +27,4 @@
 
 :javascript
   new ProjectsList();
+  Dashboard.init();

From 8b4e9720d948d0f0fe61ba7344158560e639393f Mon Sep 17 00:00:00 2001
From: Josh Frye <joshfng@gmail.com>
Date: Sat, 6 Feb 2016 12:36:46 -0500
Subject: [PATCH 061/134] Extract events rendering to own action.

---
 .../dashboard/projects_controller.rb          |  4 ++--
 .../explore/projects_controller.rb            |  6 ++---
 app/controllers/groups_controller.rb          | 24 +++++++++++--------
 app/views/groups/show.html.haml               |  2 +-
 app/views/shared/projects/_list.html.haml     |  2 +-
 config/routes.rb                              |  1 +
 6 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/app/controllers/dashboard/projects_controller.rb b/app/controllers/dashboard/projects_controller.rb
index 0bcc78a8bc7..2413680a4b0 100644
--- a/app/controllers/dashboard/projects_controller.rb
+++ b/app/controllers/dashboard/projects_controller.rb
@@ -12,7 +12,7 @@ class Dashboard::ProjectsController < Dashboard::ApplicationController
       @projects = @projects.search(terms)
     end
 
-    @projects = @projects.page(params[:page]).per(PER_PAGE)
+    @projects = @projects.page(params[:page]).per(PER_PAGE) if !terms.present?
     @last_push = current_user.recent_push
 
     respond_to do |format|
@@ -41,7 +41,7 @@ class Dashboard::ProjectsController < Dashboard::ApplicationController
       @projects = @projects.search(terms)
     end
 
-    @projects = @projects.page(params[:page]).per(PER_PAGE)
+    @projects = @projects.page(params[:page]).per(PER_PAGE) if !terms.present?
     @last_push = current_user.recent_push
     @groups = []
 
diff --git a/app/controllers/explore/projects_controller.rb b/app/controllers/explore/projects_controller.rb
index 317ad835006..1afa77bb02b 100644
--- a/app/controllers/explore/projects_controller.rb
+++ b/app/controllers/explore/projects_controller.rb
@@ -8,7 +8,7 @@ class Explore::ProjectsController < Explore::ApplicationController
     @projects = @projects.search(params[:search]) if params[:search].present?
     @projects = @projects.search(params[:filter_projects]) if params[:filter_projects].present?
     @projects = @projects.sort(@sort = params[:sort])
-    @projects = @projects.includes(:namespace).page(params[:page]).per(PER_PAGE)
+    @projects = @projects.includes(:namespace).page(params[:page]).per(PER_PAGE) if !params[:filter_projects].present?
 
     respond_to do |format|
       format.html
@@ -24,7 +24,7 @@ class Explore::ProjectsController < Explore::ApplicationController
     @projects = TrendingProjectsFinder.new.execute(current_user)
     @projects = @projects.non_archived
     @projects = @projects.search(params[:filter_projects]) if params[:filter_projects].present?
-    @projects = @projects.page(params[:page]).per(PER_PAGE)
+    @projects = @projects.page(params[:page]).per(PER_PAGE) if !params[:filter_projects].present?
 
     respond_to do |format|
       format.html
@@ -40,7 +40,7 @@ class Explore::ProjectsController < Explore::ApplicationController
     @projects = ProjectsFinder.new.execute(current_user)
     @projects = @projects.search(params[:filter_projects]) if params[:filter_projects].present?
     @projects = @projects.reorder('star_count DESC')
-    @projects = @projects.page(params[:page]).per(PER_PAGE)
+    @projects = @projects.page(params[:page]).per(PER_PAGE) if !params[:filter_projects].present?
 
     respond_to do |format|
       format.html
diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb
index b4dd0021ed7..99d38615c08 100644
--- a/app/controllers/groups_controller.rb
+++ b/app/controllers/groups_controller.rb
@@ -14,7 +14,7 @@ class GroupsController < Groups::ApplicationController
 
   # Load group projects
   before_action :load_projects, except: [:index, :new, :create, :projects, :edit, :update, :autocomplete]
-  before_action :event_filter, only: :show
+  before_action :event_filter, only: [:show, :events]
 
   layout :determine_layout
 
@@ -42,20 +42,15 @@ class GroupsController < Groups::ApplicationController
     @last_push = current_user.recent_push if current_user
     @projects = @projects.includes(:namespace)
     @projects = @projects.search(params[:filter_projects]) if params[:filter_projects].present?
-    @projects = @projects.page(params[:page]).per(PER_PAGE)
+    @projects = @projects.page(params[:page]).per(PER_PAGE) if !params[:filter_projects].present?
 
     respond_to do |format|
       format.html
 
       format.json do
-        if params[:filter_projects]
-          render json: {
-            html: view_to_html_string("dashboard/projects/_projects", locals: { projects: @projects })
-          }
-        else
-          load_events
-          pager_json("events/_events", @events.count)
-        end
+        render json: {
+          html: view_to_html_string("dashboard/projects/_projects", locals: { projects: @projects })
+        }
       end
 
       format.atom do
@@ -65,6 +60,15 @@ class GroupsController < Groups::ApplicationController
     end
   end
 
+  def events
+    respond_to do |format|
+      format.json do
+        load_events
+        pager_json("events/_events", @events.count)
+      end
+    end
+  end
+
   def edit
   end
 
diff --git a/app/views/groups/show.html.haml b/app/views/groups/show.html.haml
index ebb3df7dca3..52db77e3adb 100644
--- a/app/views/groups/show.html.haml
+++ b/app/views/groups/show.html.haml
@@ -47,7 +47,7 @@
 
             = render 'shared/event_filter'
 
-        .content_list
+        .content_list{:"data-href" => events_group_path}
         = spinner
 
       .tab-pane#projects
diff --git a/app/views/shared/projects/_list.html.haml b/app/views/shared/projects/_list.html.haml
index 4787502fbc2..75684b972f1 100644
--- a/app/views/shared/projects/_list.html.haml
+++ b/app/views/shared/projects/_list.html.haml
@@ -21,7 +21,7 @@
           #{projects_limit} of #{pluralize(projects.count, 'project')} displayed.
           = link_to '#', class: 'js-expand' do
             Show all
-    = paginate projects, theme: "gitlab" if !projects.kind_of?(Array)
+    = paginate projects, theme: "gitlab" if projects.respond_to? :total_pages
   - else
     %h3 No projects found
 
diff --git a/config/routes.rb b/config/routes.rb
index f5951bf3e8d..3f6561a1fe0 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -352,6 +352,7 @@ Rails.application.routes.draw do
       get :issues
       get :merge_requests
       get :projects
+      get :events
     end
 
     scope module: :groups do

From 120dca0f35a09110a9eeb3e4b93b998eca0ecb69 Mon Sep 17 00:00:00 2001
From: Josh Frye <joshfng@gmail.com>
Date: Mon, 8 Feb 2016 20:34:54 -0500
Subject: [PATCH 062/134] MR feedback

---
 app/assets/javascripts/projects_list.js.coffee   | 7 ++-----
 app/controllers/dashboard/projects_controller.rb | 4 ++--
 app/controllers/explore/projects_controller.rb   | 6 +++---
 app/controllers/groups_controller.rb             | 2 +-
 app/views/groups/show.html.haml                  | 2 +-
 5 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/app/assets/javascripts/projects_list.js.coffee b/app/assets/javascripts/projects_list.js.coffee
index bb392140b73..eab34be652a 100644
--- a/app/assets/javascripts/projects_list.js.coffee
+++ b/app/assets/javascripts/projects_list.js.coffee
@@ -1,24 +1,21 @@
 class @ProjectsList
   constructor: ->
-    $("#project-filter-form-field").off('keyup')
     $(".projects-list .js-expand").on 'click', (e) ->
       e.preventDefault()
       list = $(this).closest('.projects-list')
 
     $("#filter_projects").on 'keyup', ->
       ProjectsList.filter_results($("#filter_projects"))
-    $("#project-filter-form-field").on 'keyup', ->
-      ProjectsList.filter_results($("#project-filter-form-field"))
 
   @filter_results: ($element) ->
     terms = $element.val()
     filterSelector = $element.data('filter-selector') || 'span.filter-title'
 
     if not terms
-      $("ul.projects-list li").show()
+      $(".projects-list li").show()
       $('.gl-pagination').show()
     else
-      $("ul.projects-list li").each (index) ->
+      $(".projects-list li").each (index) ->
         $this = $(this)
         name = $this.find(filterSelector).text()
 
diff --git a/app/controllers/dashboard/projects_controller.rb b/app/controllers/dashboard/projects_controller.rb
index 2413680a4b0..2df6924b13d 100644
--- a/app/controllers/dashboard/projects_controller.rb
+++ b/app/controllers/dashboard/projects_controller.rb
@@ -12,7 +12,7 @@ class Dashboard::ProjectsController < Dashboard::ApplicationController
       @projects = @projects.search(terms)
     end
 
-    @projects = @projects.page(params[:page]).per(PER_PAGE) if !terms.present?
+    @projects = @projects.page(params[:page]).per(PER_PAGE) if terms.blank?
     @last_push = current_user.recent_push
 
     respond_to do |format|
@@ -41,7 +41,7 @@ class Dashboard::ProjectsController < Dashboard::ApplicationController
       @projects = @projects.search(terms)
     end
 
-    @projects = @projects.page(params[:page]).per(PER_PAGE) if !terms.present?
+    @projects = @projects.page(params[:page]).per(PER_PAGE) if terms.blank?
     @last_push = current_user.recent_push
     @groups = []
 
diff --git a/app/controllers/explore/projects_controller.rb b/app/controllers/explore/projects_controller.rb
index 1afa77bb02b..a384f3004db 100644
--- a/app/controllers/explore/projects_controller.rb
+++ b/app/controllers/explore/projects_controller.rb
@@ -8,7 +8,7 @@ class Explore::ProjectsController < Explore::ApplicationController
     @projects = @projects.search(params[:search]) if params[:search].present?
     @projects = @projects.search(params[:filter_projects]) if params[:filter_projects].present?
     @projects = @projects.sort(@sort = params[:sort])
-    @projects = @projects.includes(:namespace).page(params[:page]).per(PER_PAGE) if !params[:filter_projects].present?
+    @projects = @projects.includes(:namespace).page(params[:page]).per(PER_PAGE) if params[:filter_projects].blank?
 
     respond_to do |format|
       format.html
@@ -24,7 +24,7 @@ class Explore::ProjectsController < Explore::ApplicationController
     @projects = TrendingProjectsFinder.new.execute(current_user)
     @projects = @projects.non_archived
     @projects = @projects.search(params[:filter_projects]) if params[:filter_projects].present?
-    @projects = @projects.page(params[:page]).per(PER_PAGE) if !params[:filter_projects].present?
+    @projects = @projects.page(params[:page]).per(PER_PAGE) if params[:filter_projects].blank?
 
     respond_to do |format|
       format.html
@@ -40,7 +40,7 @@ class Explore::ProjectsController < Explore::ApplicationController
     @projects = ProjectsFinder.new.execute(current_user)
     @projects = @projects.search(params[:filter_projects]) if params[:filter_projects].present?
     @projects = @projects.reorder('star_count DESC')
-    @projects = @projects.page(params[:page]).per(PER_PAGE) if !params[:filter_projects].present?
+    @projects = @projects.page(params[:page]).per(PER_PAGE) if params[:filter_projects].blank?
 
     respond_to do |format|
       format.html
diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb
index 99d38615c08..ca5ce1e2046 100644
--- a/app/controllers/groups_controller.rb
+++ b/app/controllers/groups_controller.rb
@@ -42,7 +42,7 @@ class GroupsController < Groups::ApplicationController
     @last_push = current_user.recent_push if current_user
     @projects = @projects.includes(:namespace)
     @projects = @projects.search(params[:filter_projects]) if params[:filter_projects].present?
-    @projects = @projects.page(params[:page]).per(PER_PAGE) if !params[:filter_projects].present?
+    @projects = @projects.page(params[:page]).per(PER_PAGE) if params[:filter_projects].blank?
 
     respond_to do |format|
       format.html
diff --git a/app/views/groups/show.html.haml b/app/views/groups/show.html.haml
index 52db77e3adb..a0ba11b11a1 100644
--- a/app/views/groups/show.html.haml
+++ b/app/views/groups/show.html.haml
@@ -47,7 +47,7 @@
 
             = render 'shared/event_filter'
 
-        .content_list{:"data-href" => events_group_path}
+        .content_list{data: {href: events_group_path}}
         = spinner
 
       .tab-pane#projects

From 2ce0d06389c3eb7ac9a2b81f9fd339e7e56512bb Mon Sep 17 00:00:00 2001
From: Yorick Peterse <yorickpeterse@gmail.com>
Date: Tue, 9 Feb 2016 14:59:11 +0100
Subject: [PATCH 063/134] Smarter flushing of branch statistics caches

Instead of flushing the behind/ahead counts for all branches upon every
push we now only flush the cache of branches that actually need to have
these statistics recalculated. There are now basically 2 scenarios and
their effects:

1. A user pushes a commit to the default branch, this results in the
   cache being flushed for all branches.
2. A user pushes to a non default branch, this results in _only_ the
   cache for that branch being flushed.

The existing code (Repository#expire_cache) remains backwards compatible
with the previous behaviour, the new behaviour is only applied when a
branch name is passed as an argument. This ensures that when for example
a project is deleted the cache for all branches is flushed.
---
 app/models/repository.rb               | 25 ++++++++++---------
 app/services/git_push_service.rb       |  5 ++--
 spec/models/repository_spec.rb         | 34 ++++++++++++++++++++++++++
 spec/services/git_push_service_spec.rb |  6 ++---
 4 files changed, 54 insertions(+), 16 deletions(-)

diff --git a/app/models/repository.rb b/app/models/repository.rb
index 27bdbac3e52..0e17d2b669a 100644
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -205,12 +205,6 @@ class Repository
        readme version contribution_guide changelog license)
   end
 
-  def branch_cache_keys
-    branches.map do |branch|
-      :"diverging_commit_counts_#{branch.name}"
-    end
-  end
-
   def build_cache
     cache_keys.each do |key|
       unless cache.exist?(key)
@@ -235,17 +229,26 @@ class Repository
     @branches = nil
   end
 
-  def expire_cache
+  def expire_cache(branch_name = nil)
     cache_keys.each do |key|
       cache.expire(key)
     end
 
-    expire_branch_cache
+    expire_branch_cache(branch_name)
   end
 
-  def expire_branch_cache
-    branches.each do |branch|
-      cache.expire(:"diverging_commit_counts_#{branch.name}")
+  def expire_branch_cache(branch_name = nil)
+    # When we push to the root branch we have to flush the cache for all other
+    # branches as their statistics are based on the commits relative to the
+    # root branch.
+    if !branch_name || branch_name == root_ref
+      branches.each do |branch|
+        cache.expire(:"diverging_commit_counts_#{branch.name}")
+      end
+    # In case a commit is pushed to a non-root branch we only have to flush the
+    # cache for said branch.
+    else
+      cache.expire(:"diverging_commit_counts_#{branch_name}")
     end
   end
 
diff --git a/app/services/git_push_service.rb b/app/services/git_push_service.rb
index 0f31756797d..e3bf14966c8 100644
--- a/app/services/git_push_service.rb
+++ b/app/services/git_push_service.rb
@@ -18,7 +18,9 @@ class GitPushService
   def execute(project, user, oldrev, newrev, ref)
     @project, @user = project, user
 
-    project.repository.expire_cache
+    branch_name = Gitlab::Git.ref_name(ref)
+
+    project.repository.expire_cache(branch_name)
 
     if push_remove_branch?(ref, newrev)
       project.repository.expire_has_visible_content_cache
@@ -33,7 +35,6 @@ class GitPushService
         @push_commits = project.repository.commits(newrev)
 
         # Ensure HEAD points to the default branch in case it is not master
-        branch_name = Gitlab::Git.ref_name(ref)
         project.change_head(branch_name)
 
         # Set protection on the default branch if configured
diff --git a/spec/models/repository_spec.rb b/spec/models/repository_spec.rb
index 753012be578..72b4ac6d660 100644
--- a/spec/models/repository_spec.rb
+++ b/spec/models/repository_spec.rb
@@ -291,6 +291,12 @@ describe Repository, models: true do
 
       repository.expire_cache
     end
+
+    it 'expires the caches for a specific branch' do
+      expect(repository).to receive(:expire_branch_cache).with('master')
+
+      repository.expire_cache('master')
+    end
   end
 
   describe '#expire_root_ref_cache' do
@@ -320,4 +326,32 @@ describe Repository, models: true do
       expect(repository.has_visible_content?).to eq(false)
     end
   end
+
+  describe '#expire_branch_ache' do
+    # This method is private but we need it for testing purposes. Sadly there's
+    # no other proper way of testing caching operations.
+    let(:cache) { repository.send(:cache) }
+
+    it 'expires the cache for all branches' do
+      expect(cache).to receive(:expire).
+        at_least(repository.branches.length).
+        times
+
+      repository.expire_branch_cache
+    end
+
+    it 'expires the cache for all branches when the root branch is given' do
+      expect(cache).to receive(:expire).
+        at_least(repository.branches.length).
+        times
+
+      repository.expire_branch_cache(repository.root_ref)
+    end
+
+    it 'expires the cache for a specific branch' do
+      expect(cache).to receive(:expire).once
+
+      repository.expire_branch_cache('foo')
+    end
+  end
 end
diff --git a/spec/services/git_push_service_spec.rb b/spec/services/git_push_service_spec.rb
index 349809743c7..eb3a5fe43f5 100644
--- a/spec/services/git_push_service_spec.rb
+++ b/spec/services/git_push_service_spec.rb
@@ -23,7 +23,7 @@ describe GitPushService, services: true do
       it { is_expected.to be_truthy }
 
       it 'flushes general cached data' do
-        expect(project.repository).to receive(:expire_cache)
+        expect(project.repository).to receive(:expire_cache).with('master')
 
         subject
       end
@@ -43,7 +43,7 @@ describe GitPushService, services: true do
       it { is_expected.to be_truthy }
 
       it 'flushes general cached data' do
-        expect(project.repository).to receive(:expire_cache)
+        expect(project.repository).to receive(:expire_cache).with('master')
 
         subject
       end
@@ -63,7 +63,7 @@ describe GitPushService, services: true do
       end
 
       it 'flushes general cached data' do
-        expect(project.repository).to receive(:expire_cache)
+        expect(project.repository).to receive(:expire_cache).with('master')
 
         subject
       end

From b34963bc125d11af7b9c993d1233258f084e580d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Coutable?= <remy@rymai.me>
Date: Tue, 9 Feb 2016 15:51:06 +0100
Subject: [PATCH 064/134] Validate email addresses using Devise.email_regexp

Also:
- Get rid of legacy :strict_mode
- Get rid of custom :email validator
- Add some shared examples to spec emails validation
---
 CHANGELOG                                    |  1 +
 app/models/application_setting.rb            |  4 +-
 app/models/email.rb                          |  2 +-
 app/models/member.rb                         |  4 +-
 app/models/user.rb                           |  7 +---
 app/validators/email_validator.rb            | 18 --------
 spec/models/application_setting_spec.rb      |  4 ++
 spec/models/email_spec.rb                    | 22 ++++++++++
 spec/models/member_spec.rb                   |  6 ++-
 spec/models/user_spec.rb                     | 38 ++++-------------
 spec/support/email_format_shared_examples.rb | 44 ++++++++++++++++++++
 11 files changed, 91 insertions(+), 59 deletions(-)
 delete mode 100644 app/validators/email_validator.rb
 create mode 100644 spec/models/email_spec.rb
 create mode 100644 spec/support/email_format_shared_examples.rb

diff --git a/CHANGELOG b/CHANGELOG
index 4694421f040..683f415432f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -19,6 +19,7 @@ v 8.5.0 (unreleased)
   - Fix label links for a merge request pointing to issues list
   - Don't vendor minified JS
   - Increase project import timeout to 15 minutes
+  - Be more permissive with email address validation: it only has to contain a single '@'
   - Display 404 error on group not found
   - Track project import failure
   - Support Two-factor Authentication for LDAP users
diff --git a/app/models/application_setting.rb b/app/models/application_setting.rb
index fa48fe5b9e4..ac6653f5d50 100644
--- a/app/models/application_setting.rb
+++ b/app/models/application_setting.rb
@@ -71,8 +71,8 @@ class ApplicationSetting < ActiveRecord::Base
             url: true
 
   validates :admin_notification_email,
-            allow_blank: true,
-            email: true
+            format: { with: Devise.email_regexp },
+            allow_blank: true
 
   validates :two_factor_grace_period,
             numericality: { greater_than_or_equal_to: 0 }
diff --git a/app/models/email.rb b/app/models/email.rb
index 935705e2ed4..daa259ee2d2 100644
--- a/app/models/email.rb
+++ b/app/models/email.rb
@@ -15,7 +15,7 @@ class Email < ActiveRecord::Base
   belongs_to :user
 
   validates :user_id, presence: true
-  validates :email, presence: true, email: { strict_mode: true }, uniqueness: true
+  validates :email, presence: true, uniqueness: true, format: { with: Devise.email_regexp }
   validate :unique_email, if: ->(email) { email.email_changed? }
 
   before_validation :cleanup_email
diff --git a/app/models/member.rb b/app/models/member.rb
index 34efcd0088d..0b6785ddbc5 100644
--- a/app/models/member.rb
+++ b/app/models/member.rb
@@ -38,8 +38,8 @@ class Member < ActiveRecord::Base
     presence: {
       if: :invite?
     },
-    email: {
-      strict_mode: true,
+    format: {
+      with: Devise.email_regexp,
       allow_nil: true
     },
     uniqueness: {
diff --git a/app/models/user.rb b/app/models/user.rb
index 234c1cd89f9..edda0ebef86 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -146,11 +146,8 @@ class User < ActiveRecord::Base
   # Validations
   #
   validates :name, presence: true
-  # Note that a 'uniqueness' and presence check is provided by devise :validatable for email. We do not need to
-  # duplicate that here as the validation framework will have duplicate errors in the event of a failure.
-  validates :email, presence: true, email: { strict_mode: true }
-  validates :notification_email, presence: true, email: { strict_mode: true }
-  validates :public_email, presence: true, email: { strict_mode: true }, allow_blank: true, uniqueness: true
+  validates :notification_email, presence: true, format: { with: Devise.email_regexp }
+  validates :public_email, presence: true, uniqueness: true, format: { with: Devise.email_regexp }, allow_blank: true
   validates :bio, length: { maximum: 255 }, allow_blank: true
   validates :projects_limit, presence: true, numericality: { greater_than_or_equal_to: 0 }
   validates :username,
diff --git a/app/validators/email_validator.rb b/app/validators/email_validator.rb
deleted file mode 100644
index b35af100803..00000000000
--- a/app/validators/email_validator.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-# EmailValidator
-#
-# Based on https://github.com/balexand/email_validator
-#
-# Extended to use only strict mode with following allowed characters:
-# ' - apostrophe
-#
-# See http://www.remote.org/jochen/mail/info/chars.html
-#
-class EmailValidator < ActiveModel::EachValidator
-  PATTERN = /\A\s*([-a-z0-9+._']{1,64})@((?:[-a-z0-9]+\.)+[a-z]{2,})\s*\z/i.freeze
-
-  def validate_each(record, attribute, value)
-    unless value =~ PATTERN
-      record.errors.add(attribute, options[:message] || :invalid)
-    end
-  end
-end
diff --git a/spec/models/application_setting_spec.rb b/spec/models/application_setting_spec.rb
index 161a32c51e6..b1764d7ac09 100644
--- a/spec/models/application_setting_spec.rb
+++ b/spec/models/application_setting_spec.rb
@@ -74,6 +74,10 @@ describe ApplicationSetting, models: true do
         .only_integer
         .is_greater_than(0)
     end
+
+    it_behaves_like 'an object with email-formated attributes', :admin_notification_email do
+      subject { setting }
+    end
   end
 
   context 'restricted signup domains' do
diff --git a/spec/models/email_spec.rb b/spec/models/email_spec.rb
new file mode 100644
index 00000000000..a20a6149649
--- /dev/null
+++ b/spec/models/email_spec.rb
@@ -0,0 +1,22 @@
+# == Schema Information
+#
+# Table name: emails
+#
+#  id         :integer          not null, primary key
+#  user_id    :integer          not null
+#  email      :string(255)      not null
+#  created_at :datetime
+#  updated_at :datetime
+#
+
+require 'spec_helper'
+
+describe Email, models: true do
+
+  describe 'validations' do
+    it_behaves_like 'an object with email-formated attributes', :email do
+      subject { build(:email) }
+    end
+  end
+
+end
diff --git a/spec/models/member_spec.rb b/spec/models/member_spec.rb
index 2aedca20df2..2d8f1cc1ad3 100644
--- a/spec/models/member_spec.rb
+++ b/spec/models/member_spec.rb
@@ -31,6 +31,10 @@ describe Member, models: true do
     it { is_expected.to validate_presence_of(:source) }
     it { is_expected.to validate_inclusion_of(:access_level).in_array(Gitlab::Access.values) }
 
+    it_behaves_like 'an object with email-formated attributes', :invite_email do
+      subject { build(:project_member) }
+    end
+
     context "when an invite email is provided" do
       let(:member) { build(:project_member, invite_email: "user@example.com", user: nil) }
 
@@ -159,7 +163,7 @@ describe Member, models: true do
 
   describe "#generate_invite_token" do
     let!(:member) { create(:project_member, invite_email: "user@example.com", user: nil) }
-    
+
     it "sets the invite token" do
       expect { member.generate_invite_token }.to change { member.invite_token}
     end
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index cee051f5732..47ce409fe4b 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -119,37 +119,15 @@ describe User, models: true do
 
     it { is_expected.to validate_length_of(:bio).is_within(0..255) }
 
+    it_behaves_like 'an object with email-formated attributes', :email do
+      subject { build(:user) }
+    end
+
+    it_behaves_like 'an object with email-formated attributes', :public_email, :notification_email do
+      subject { build(:user).tap { |user| user.emails << build(:email, email: email_value) } }
+    end
+
     describe 'email' do
-      it 'accepts info@example.com' do
-        user = build(:user, email: 'info@example.com')
-        expect(user).to be_valid
-      end
-
-      it 'accepts info+test@example.com' do
-        user = build(:user, email: 'info+test@example.com')
-        expect(user).to be_valid
-      end
-
-      it "accepts o'reilly@example.com" do
-        user = build(:user, email: "o'reilly@example.com")
-        expect(user).to be_valid
-      end
-
-      it 'rejects test@test@example.com' do
-        user = build(:user, email: 'test@test@example.com')
-        expect(user).to be_invalid
-      end
-
-      it 'rejects mailto:test@example.com' do
-        user = build(:user, email: 'mailto:test@example.com')
-        expect(user).to be_invalid
-      end
-
-      it "rejects lol!'+=?><#$%^&*()@gmail.com" do
-        user = build(:user, email: "lol!'+=?><#$%^&*()@gmail.com")
-        expect(user).to be_invalid
-      end
-
       context 'when no signup domains listed' do
         before { allow(current_application_settings).to receive(:restricted_signup_domains).and_return([]) }
         it 'accepts any email' do
diff --git a/spec/support/email_format_shared_examples.rb b/spec/support/email_format_shared_examples.rb
new file mode 100644
index 00000000000..b924a208e71
--- /dev/null
+++ b/spec/support/email_format_shared_examples.rb
@@ -0,0 +1,44 @@
+# Specifications for behavior common to all objects with an email attribute.
+# Takes a list of email-format attributes and requires:
+# - subject { "the object with a attribute= setter"  }
+#   Note: You have access to `email_value` which is the email address value
+#         being currently tested).
+
+shared_examples 'an object with email-formated attributes' do |*attributes|
+  attributes.each do |attribute|
+    describe "specifically its :#{attribute} attribute" do
+      %w[
+        info@example.com
+        info+test@example.com
+        o'reilly@example.com
+        mailto:test@example.com
+        lol!'+=?><#$%^&*()@gmail.com
+      ].each do |valid_email|
+        context "with a value of '#{valid_email}'" do
+          let(:email_value) { valid_email }
+
+          it 'is valid' do
+            subject.send("#{attribute}=", valid_email)
+
+            expect(subject).to be_valid
+          end
+        end
+      end
+
+      %w[
+        foobar
+        test@test@example.com
+      ].each do |invalid_email|
+        context "with a value of '#{invalid_email}'" do
+          let(:email_value) { invalid_email }
+
+          it 'is invalid' do
+            subject.send("#{attribute}=", invalid_email)
+
+            expect(subject).to be_invalid
+          end
+        end
+      end
+    end
+  end
+end

From b3635ee46a1e62d72ce84871e2a5984e6eabfbdf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Coutable?= <remy@rymai.me>
Date: Tue, 9 Feb 2016 17:59:47 +0100
Subject: [PATCH 065/134] Re-add EmailValidator to avoid the repetition of
 format: { with: Devise.email_regexp }

---
 app/models/application_setting.rb | 2 +-
 app/models/email.rb               | 2 +-
 app/models/member.rb              | 3 +--
 app/models/user.rb                | 4 ++--
 app/validators/email_validator.rb | 5 +++++
 5 files changed, 10 insertions(+), 6 deletions(-)
 create mode 100644 app/validators/email_validator.rb

diff --git a/app/models/application_setting.rb b/app/models/application_setting.rb
index ac6653f5d50..269056e0e77 100644
--- a/app/models/application_setting.rb
+++ b/app/models/application_setting.rb
@@ -71,7 +71,7 @@ class ApplicationSetting < ActiveRecord::Base
             url: true
 
   validates :admin_notification_email,
-            format: { with: Devise.email_regexp },
+            email: true,
             allow_blank: true
 
   validates :two_factor_grace_period,
diff --git a/app/models/email.rb b/app/models/email.rb
index daa259ee2d2..b323d1edd10 100644
--- a/app/models/email.rb
+++ b/app/models/email.rb
@@ -15,7 +15,7 @@ class Email < ActiveRecord::Base
   belongs_to :user
 
   validates :user_id, presence: true
-  validates :email, presence: true, uniqueness: true, format: { with: Devise.email_regexp }
+  validates :email, presence: true, uniqueness: true, email: true
   validate :unique_email, if: ->(email) { email.email_changed? }
 
   before_validation :cleanup_email
diff --git a/app/models/member.rb b/app/models/member.rb
index 0b6785ddbc5..ca08007b7eb 100644
--- a/app/models/member.rb
+++ b/app/models/member.rb
@@ -38,8 +38,7 @@ class Member < ActiveRecord::Base
     presence: {
       if: :invite?
     },
-    format: {
-      with: Devise.email_regexp,
+    email: {
       allow_nil: true
     },
     uniqueness: {
diff --git a/app/models/user.rb b/app/models/user.rb
index edda0ebef86..9fe94b13e52 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -146,8 +146,8 @@ class User < ActiveRecord::Base
   # Validations
   #
   validates :name, presence: true
-  validates :notification_email, presence: true, format: { with: Devise.email_regexp }
-  validates :public_email, presence: true, uniqueness: true, format: { with: Devise.email_regexp }, allow_blank: true
+  validates :notification_email, presence: true, email: true
+  validates :public_email, presence: true, uniqueness: true, email: true, allow_blank: true
   validates :bio, length: { maximum: 255 }, allow_blank: true
   validates :projects_limit, presence: true, numericality: { greater_than_or_equal_to: 0 }
   validates :username,
diff --git a/app/validators/email_validator.rb b/app/validators/email_validator.rb
new file mode 100644
index 00000000000..aab07a7ece4
--- /dev/null
+++ b/app/validators/email_validator.rb
@@ -0,0 +1,5 @@
+class EmailValidator < ActiveModel::EachValidator
+  def validate_each(record, attribute, value)
+    record.errors.add(attribute, :invalid) unless value =~ Devise.email_regexp
+  end
+end

From f3324936c3a6406c49b3bc08966a0533282e69e9 Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Tue, 9 Feb 2016 14:59:39 -0500
Subject: [PATCH 066/134] Update CHANGELOG

[ci skip]
---
 CHANGELOG | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 4694421f040..800f9c7918f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -49,6 +49,8 @@ v 8.5.0 (unreleased)
 
 v 8.4.4
   - Update omniauth-saml gem to 1.4.2
+  - Prevent long-running backup tasks from timing out the database connection
+  - Add a Project setting to allow guests to view build logs (defaults to true)
 
 v 8.4.3
   - Increase lfs_objects size column to 8-byte integer to allow files larger

From d1f10c6666c9e27967739fc7cf33c6101de6a22e Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Tue, 9 Feb 2016 17:56:15 -0500
Subject: [PATCH 067/134] Ensure link for README blobs includes the full path

Closes #13254
---
 app/views/projects/tree/_readme.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/projects/tree/_readme.html.haml b/app/views/projects/tree/_readme.html.haml
index 3c5edf4b033..baaa2caa6de 100644
--- a/app/views/projects/tree/_readme.html.haml
+++ b/app/views/projects/tree/_readme.html.haml
@@ -1,7 +1,7 @@
 %article.file-holder.readme-holder
   .file-title
     = blob_icon readme.mode, readme.name
-    = link_to namespace_project_blob_path(@project.namespace, @project, tree_join(@repository.root_ref, readme.name)) do
+    = link_to namespace_project_blob_path(@project.namespace, @project, tree_join(@repository.root_ref, @path, readme.name)) do
       %strong
         = readme.name
   .file-content.wiki

From 929b53c6f256b64b19752d0b1ee6acedf37e164b Mon Sep 17 00:00:00 2001
From: Josh Frye <joshfng@gmail.com>
Date: Tue, 9 Feb 2016 18:01:32 -0500
Subject: [PATCH 068/134] More specific selectors

---
 app/assets/javascripts/dashboard.js.coffee | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/assets/javascripts/dashboard.js.coffee b/app/assets/javascripts/dashboard.js.coffee
index 7e77ed5e7ff..47f86e31751 100644
--- a/app/assets/javascripts/dashboard.js.coffee
+++ b/app/assets/javascripts/dashboard.js.coffee
@@ -1,11 +1,11 @@
 @Dashboard =
   init: ->
-    $("#project-filter-form-field").off('keyup')
+    $("input#project-filter-form-field,.projects-list-filter").off('keyup')
     this.initSearch()
 
   initSearch: ->
     @timer = null
-    $("#project-filter-form-field,.projects-list-filter").on('keyup', ->
+    $("input#project-filter-form-field,.projects-list-filter").on('keyup', ->
       clearTimeout(@timer)
       @timer = setTimeout(Dashboard.filterResults, 500)
     )
@@ -14,8 +14,8 @@
     $('.projects-list-holder').fadeTo(250, 0.5)
 
     form = null
-    form = $("#project-filter-form")
-    search = $("#project-filter-form-field").val()
+    form = $("form#project-filter-form")
+    search = $("input#project-filter-form-field").val()
     project_filter_url = form.attr('action') + '?' + form.serialize()
 
     $.ajax

From cf8a74be5fda908fd5c50a9303c44d1f95fadfa2 Mon Sep 17 00:00:00 2001
From: Josh Frye <joshfng@gmail.com>
Date: Tue, 9 Feb 2016 20:21:47 -0500
Subject: [PATCH 069/134] Cleanup to use one selector

---
 app/assets/javascripts/dashboard.js.coffee     | 8 ++++----
 app/views/dashboard/_projects_head.html.haml   | 2 +-
 app/views/explore/projects/_projects.html.haml | 2 +-
 app/views/groups/_projects.html.haml           | 2 +-
 app/views/projects/forks/index.html.haml       | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/assets/javascripts/dashboard.js.coffee b/app/assets/javascripts/dashboard.js.coffee
index 47f86e31751..62143e66cfe 100644
--- a/app/assets/javascripts/dashboard.js.coffee
+++ b/app/assets/javascripts/dashboard.js.coffee
@@ -1,11 +1,11 @@
 @Dashboard =
   init: ->
-    $("input#project-filter-form-field,.projects-list-filter").off('keyup')
+    $(".projects-list-filter").off('keyup')
     this.initSearch()
 
   initSearch: ->
     @timer = null
-    $("input#project-filter-form-field,.projects-list-filter").on('keyup', ->
+    $(".projects-list-filter").on('keyup', ->
       clearTimeout(@timer)
       @timer = setTimeout(Dashboard.filterResults, 500)
     )
@@ -15,7 +15,7 @@
 
     form = null
     form = $("form#project-filter-form")
-    search = $("input#project-filter-form-field").val()
+    search = $(".projects-list-filter").val()
     project_filter_url = form.attr('action') + '?' + form.serialize()
 
     $.ajax
@@ -25,7 +25,7 @@
       complete: ->
         $('.projects-list-holder').fadeTo(250, 1)
       success: (data) ->
-        $('.projects-list-holder,.public-projects').replaceWith(data.html)
+        $('.projects-list-holder').replaceWith(data.html)
         # Change url so if user reload a page - search results are saved
         history.replaceState {page: project_filter_url}, document.title, project_filter_url
       dataType: "json"
diff --git a/app/views/dashboard/_projects_head.html.haml b/app/views/dashboard/_projects_head.html.haml
index d46998ec1e9..4bc761b3738 100644
--- a/app/views/dashboard/_projects_head.html.haml
+++ b/app/views/dashboard/_projects_head.html.haml
@@ -14,7 +14,7 @@
 
   .nav-controls
     = form_tag request.original_url, method: :get, class: 'project-filter-form', id: 'project-filter-form' do |f|
-      = search_field_tag :filter_projects, params[:filter_projects], placeholder: 'Filter by name...', class: 'project-filter-form-field form-control input-short', spellcheck: false, id: 'project-filter-form-field'
+      = search_field_tag :filter_projects, params[:filter_projects], placeholder: 'Filter by name...', class: 'project-filter-form-field form-control input-short projects-list-filter', spellcheck: false, id: 'project-filter-form-field'
     = render 'explore/projects/dropdown'
     - if current_user.can_create_project?
       = link_to new_project_path, class: 'btn btn-new' do
diff --git a/app/views/explore/projects/_projects.html.haml b/app/views/explore/projects/_projects.html.haml
index 669079e9521..999a933390b 100644
--- a/app/views/explore/projects/_projects.html.haml
+++ b/app/views/explore/projects/_projects.html.haml
@@ -1,5 +1,5 @@
 - if projects.any?
-  .public-projects
+  .projects-list-holder
     = render 'shared/projects/list', projects: projects
 - else
   .nothing-here-block
diff --git a/app/views/groups/_projects.html.haml b/app/views/groups/_projects.html.haml
index 73305efbcb9..9c16ab7e30f 100644
--- a/app/views/groups/_projects.html.haml
+++ b/app/views/groups/_projects.html.haml
@@ -1,7 +1,7 @@
 .top-area
   .nav-controls
     = form_tag request.original_url, method: :get, class: 'project-filter-form', id: 'project-filter-form' do |f|
-      = search_field_tag :filter_projects, params[:filter_projects], placeholder: 'Filter by name...', class: 'input-short project-filter-form-field form-control', spellcheck: false, id: 'project-filter-form-field'
+      = search_field_tag :filter_projects, params[:filter_projects], placeholder: 'Filter by name...', class: 'input-short project-filter-form-field form-control projects-list-filter', spellcheck: false, id: 'project-filter-form-field'
     - if current_user && current_user.can_create_project?
       = link_to new_project_path, class: 'btn btn-new' do
         = icon('plus')
diff --git a/app/views/projects/forks/index.html.haml b/app/views/projects/forks/index.html.haml
index acb2353d3ca..c834bf63b28 100644
--- a/app/views/projects/forks/index.html.haml
+++ b/app/views/projects/forks/index.html.haml
@@ -6,7 +6,7 @@
     == #{pluralize(@all_forks.size, 'fork')}: #{full_count_title}
 
   .nav-controls
-    = search_field_tag :filter_projects, nil, placeholder: 'Search forks', class: 'projects-list-filter form-control input-short',
+    = search_field_tag :filter_projects, nil, placeholder: 'Search forks', class: 'projects-list-filter project-filter-form-field form-control input-short',
       spellcheck: false, data: { 'filter-selector' => 'span.namespace-name' }
 
     .dropdown

From d146d9fd8345afbeb12c2f4184d62213023bc98c Mon Sep 17 00:00:00 2001
From: Bram Daams <b.daams@science.ru.nl>
Date: Sun, 18 Oct 2015 00:11:36 +0200
Subject: [PATCH 070/134] Add assignee data to Issuables' hook_data

---
 CHANGELOG                             |  1 +
 app/models/concerns/issuable.rb       |  5 ++++-
 doc/web_hooks/web_hooks.md            | 26 ++++++++++++++++++++------
 spec/models/concerns/issuable_spec.rb | 10 ++++++++++
 4 files changed, 35 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 800f9c7918f..9801766c669 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -386,6 +386,7 @@ v 8.1.0
   - Improved performance of the trending projects page
   - Remove CI migration task
   - Improved performance of finding projects by their namespace
+  - Add assignee data to Issuables' hook_data (Bram Daams)
   - Fix bug where transferring a project would result in stale commit links (Stan Hu)
   - Fix build trace updating
   - Include full path of source and target branch names in New Merge Request page (Stan Hu)
diff --git a/app/models/concerns/issuable.rb b/app/models/concerns/issuable.rb
index 04650a9e67a..cf6aa592e2a 100644
--- a/app/models/concerns/issuable.rb
+++ b/app/models/concerns/issuable.rb
@@ -126,7 +126,7 @@ module Issuable
   end
 
   def to_hook_data(user)
-    {
+    hook_data = {
       object_kind: self.class.name.underscore,
       user: user.hook_attrs,
       repository: {
@@ -137,6 +137,9 @@ module Issuable
       },
       object_attributes: hook_attrs
     }
+    hook_data.merge!(assignee: assignee.hook_attrs) if assignee
+
+    hook_data
   end
 
   def label_names
diff --git a/doc/web_hooks/web_hooks.md b/doc/web_hooks/web_hooks.md
index c29037e89c2..c556597225c 100644
--- a/doc/web_hooks/web_hooks.md
+++ b/doc/web_hooks/web_hooks.md
@@ -8,8 +8,8 @@ Web hooks can be used to update an external issue tracker, trigger CI builds, up
 
 ## SSL Verification
 
-By default, the SSL certificate of the webhook endpoint is verified based on 
-an internal list of Certificate Authorities, 
+By default, the SSL certificate of the webhook endpoint is verified based on
+an internal list of Certificate Authorities,
 which means the certificate cannot be self-signed.
 
 You can turn this off in the web hook settings in your GitLab projects.
@@ -76,7 +76,6 @@ X-Gitlab-Event: Push Hook
     }
   ],
   "total_commits_count": 4
-  
 }
 ```
 
@@ -158,6 +157,11 @@ X-Gitlab-Event: Issue Hook
     "iid": 23,
     "url": "http://example.com/diaspora/issues/23",
     "action": "open"
+  },
+  "assignee": {
+    "name": "User1",
+    "username": "user1",
+    "avatar_url": "http://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=40\u0026d=identicon"
   }
 }
 ```
@@ -322,7 +326,12 @@ X-Gitlab-Event: Note Hook
         "email": "john@example.com"
       }
     },
-    "work_in_progress": false
+    "work_in_progress": false,
+    "assignee": {
+      "name": "User1",
+      "username": "user1",
+      "avatar_url": "http://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=40\u0026d=identicon"
+    }
   }
 }
 ```
@@ -397,7 +406,7 @@ X-Gitlab-Event: Note Hook
 
 **Request body:**
 
-```
+```json
 {
   "object_kind": "note",
   "user": {
@@ -510,7 +519,12 @@ X-Gitlab-Event: Merge Request Hook
     },
     "work_in_progress": false,
     "url": "http://example.com/diaspora/merge_requests/1",
-    "action": "open"
+    "action": "open",
+    "assignee": {
+      "name": "User1",
+      "username": "user1",
+      "avatar_url": "http://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=40\u0026d=identicon"
+    }
   }
 }
 ```
diff --git a/spec/models/concerns/issuable_spec.rb b/spec/models/concerns/issuable_spec.rb
index 021d62cdf0c..8f09ff03a78 100644
--- a/spec/models/concerns/issuable_spec.rb
+++ b/spec/models/concerns/issuable_spec.rb
@@ -79,6 +79,16 @@ describe Issue, "Issuable" do
       expect(hook_data[:repository][:description]).to eq(issue.project.description)
       expect(hook_data[:repository][:homepage]).to eq(issue.project.web_url)
       expect(hook_data[:object_attributes]).to eq(issue.hook_attrs)
+      expect(hook_data).to_not have_key(:assignee)
+    end
+
+    context "issue is assigned" do
+      before { issue.update_attribute(:assignee, user) }
+
+      it "returns correct hook data" do
+        expect(hook_data[:object_attributes]['assignee_id']).to eq(user.id)
+        expect(hook_data[:assignee]).to eq(user.hook_attrs)
+      end
     end
   end
 

From 3d1d96bb4fc8a2266b8f457d2cd7ad2d7c704930 Mon Sep 17 00:00:00 2001
From: Yorick Peterse <yorickpeterse@gmail.com>
Date: Tue, 9 Feb 2016 12:17:59 +0100
Subject: [PATCH 071/134] Updated install/update guides for 8.5

[ci skip]
---
 doc/install/installation.md |   4 +-
 doc/update/8.4-to-8.5.md    | 106 ++++++++++++++++++++++++++++++++++++
 2 files changed, 108 insertions(+), 2 deletions(-)
 create mode 100644 doc/update/8.4-to-8.5.md

diff --git a/doc/install/installation.md b/doc/install/installation.md
index 3eb9b1767c5..46b27fd7278 100644
--- a/doc/install/installation.md
+++ b/doc/install/installation.md
@@ -238,9 +238,9 @@ sudo usermod -aG redis git
 ### Clone the Source
 
     # Clone GitLab repository
-    sudo -u git -H git clone https://gitlab.com/gitlab-org/gitlab-ce.git -b 8-4-stable gitlab
+    sudo -u git -H git clone https://gitlab.com/gitlab-org/gitlab-ce.git -b 8-5-stable gitlab
 
-**Note:** You can change `8-4-stable` to `master` if you want the *bleeding edge* version, but never install master on a production server!
+**Note:** You can change `8-5-stable` to `master` if you want the *bleeding edge* version, but never install master on a production server!
 
 ### Configure It
 
diff --git a/doc/update/8.4-to-8.5.md b/doc/update/8.4-to-8.5.md
new file mode 100644
index 00000000000..6e035047b24
--- /dev/null
+++ b/doc/update/8.4-to-8.5.md
@@ -0,0 +1,106 @@
+# From 8.4 to 8.5
+
+### 1. Stop server
+
+    sudo service gitlab stop
+
+### 2. Backup
+
+```bash
+cd /home/git/gitlab
+sudo -u git -H bundle exec rake gitlab:backup:create RAILS_ENV=production
+```
+
+### 3. Get latest code
+
+```bash
+sudo -u git -H git fetch --all
+sudo -u git -H git checkout -- db/schema.rb # local changes will be restored automatically
+```
+
+For GitLab Community Edition:
+
+```bash
+sudo -u git -H git checkout 8-5-stable
+```
+
+OR
+
+For GitLab Enterprise Edition:
+
+```bash
+sudo -u git -H git checkout 8-5-stable-ee
+```
+
+### 4. Update gitlab-shell
+
+```bash
+cd /home/git/gitlab-shell
+sudo -u git -H git fetch --all
+sudo -u git -H git checkout v2.6.10
+```
+
+### 5. Update gitlab-workhorse
+
+Install and compile gitlab-workhorse. This requires
+[Go 1.5](https://golang.org/dl) which should already be on your system from
+GitLab 8.1.
+
+```bash
+cd /home/git/gitlab-workhorse
+sudo -u git -H git fetch --all
+sudo -u git -H git checkout 0.6.3
+sudo -u git -H make
+```
+
+### 6. Install libs, migrations, etc.
+
+```bash
+cd /home/git/gitlab
+
+# MySQL installations (note: the line below states '--without postgres')
+sudo -u git -H bundle install --without postgres development test --deployment
+
+# PostgreSQL installations (note: the line below states '--without mysql')
+sudo -u git -H bundle install --without mysql development test --deployment
+
+# Run database migrations
+sudo -u git -H bundle exec rake db:migrate RAILS_ENV=production
+
+# Clean up assets and cache
+sudo -u git -H bundle exec rake assets:clean assets:precompile cache:clear RAILS_ENV=production
+
+```
+
+### 7. Start application
+
+    sudo service gitlab start
+    sudo service nginx restart
+
+### 8. Check application status
+
+Check if GitLab and its environment are configured correctly:
+
+    sudo -u git -H bundle exec rake gitlab:env:info RAILS_ENV=production
+
+To make sure you didn't miss anything run a more thorough check:
+
+    sudo -u git -H bundle exec rake gitlab:check RAILS_ENV=production
+
+If all items are green, then congratulations, the upgrade is complete!
+
+## Things went south? Revert to previous version (8.4)
+
+### 1. Revert the code to the previous version
+
+Follow the [upgrade guide from 8.3 to 8.4](8.3-to-8.4.md), except for the
+database migration (the backup is already migrated to the previous version).
+
+### 2. Restore from the backup
+
+```bash
+cd /home/git/gitlab
+sudo -u git -H bundle exec rake gitlab:backup:restore RAILS_ENV=production
+```
+
+If you have more than one backup `*.tar` file(s) please add `BACKUP=timestamp_of_backup` to the command above.

From 464cea7d4892e76bcb39f0a3eaf848369178293a Mon Sep 17 00:00:00 2001
From: Achilleas Pipinellis <axilleas@axilleas.me>
Date: Wed, 10 Feb 2016 12:43:19 +0200
Subject: [PATCH 072/134] Fix typos and grammar

[ci skip]
---
 config/application.rb       |  3 ++-
 config/gitlab.yml.example   |  3 ++-
 config/unicorn.rb.example   |  3 ++-
 doc/install/installation.md |  2 +-
 doc/install/relative_url.md | 15 +++++++--------
 5 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/config/application.rb b/config/application.rb
index 17574d8c992..ece8b3ff342 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -53,7 +53,8 @@ module Gitlab
     config.action_view.sanitized_allowed_protocols = %w(smb)
 
     # Relative URL support
-    # WARNING: We recommend using an FQDN to host GitLab in a root path instead of this.
+    # WARNING: We recommend using an FQDN to host GitLab in a root path instead
+    # of using a relative URL.
     # Documentation: http://doc.gitlab.com/ce/install/relative_url.html
     # Uncomment and customize the following line to run in a non-root path
     #
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
index 667e32dd671..faf05ecd466 100644
--- a/config/gitlab.yml.example
+++ b/config/gitlab.yml.example
@@ -39,7 +39,8 @@ production: &base
     # ssh_host: ssh.host_example.com
 
     # Relative URL support
-    # WARNING: We recommend using an FQDN to host GitLab in a root path instead of this.
+    # WARNING: We recommend using an FQDN to host GitLab in a root path instead
+    # of using a relative URL.
     # Documentation: http://doc.gitlab.com/ce/install/relative_url.html
     # Uncomment and customize the following line to run in a non-root path
     #
diff --git a/config/unicorn.rb.example b/config/unicorn.rb.example
index 02b251f1847..e5058cebce8 100644
--- a/config/unicorn.rb.example
+++ b/config/unicorn.rb.example
@@ -12,7 +12,8 @@
 # Merge Request on https://gitlab.com/gitlab-org/omnibus-gitlab/merge_requests
 
 # Relative URL support
-# WARNING: We recommend using an FQDN to host GitLab in a root path instead of this.
+# WARNING: We recommend using an FQDN to host GitLab in a root path instead
+# of using a relative URL.
 # Documentation: http://doc.gitlab.com/ce/install/relative_url.html
 # Uncomment and customize the following line to run in a non-root path
 #
diff --git a/doc/install/installation.md b/doc/install/installation.md
index 86d37d64edd..0bfd33da057 100644
--- a/doc/install/installation.md
+++ b/doc/install/installation.md
@@ -487,7 +487,7 @@ You can use `sudo service gitlab start` and `sudo service gitlab stop` to start
 ### Relative URL support
 
 See the [Relative URL documentation](relative_url.md) for more information on
-how to set this up.
+how to configure GitLab with a relative URL.
 
 ### Using HTTPS
 
diff --git a/doc/install/relative_url.md b/doc/install/relative_url.md
index 24dde42b310..b341b6311c6 100644
--- a/doc/install/relative_url.md
+++ b/doc/install/relative_url.md
@@ -9,15 +9,15 @@ first time._
 
 ---
 
-While it is recommended to install GitLab in its own (sub)domain, sometimes
+While it is recommended to install GitLab on its own (sub)domain, sometimes
 this is not possible due to a variety of reasons. In that case, GitLab can also
 be installed under a relative URL, for example `https://example.com/gitlab`.
 
-There is no limit as to how much deeply nested the relative URL can be. For
-example you could serve GitLab under `/foo/bar/gitlab/git` without any issues.
+There is no limit to how deeply nested the relative URL can be. For example you
+could serve GitLab under `/foo/bar/gitlab/git` without any issues.
 
 Note that by changing the URL on an existing GitLab installation, all remote
-URLS will change, so you'll have to manually edit them in any local repository
+URLs will change, so you'll have to manually edit them in any local repository
 that points to your GitLab instance.
 
 ---
@@ -47,8 +47,7 @@ See the [requirements](requirements.md) document for more information.
 
 _**Note:**
 Do not make any changes to your web server configuration file regarding
-relative URL. The relative URL support is basically implemented by GitLab
-Workhorse._
+relative URL. The relative URL support is implemented by GitLab Workhorse._
 
 ---
 
@@ -109,7 +108,7 @@ Make sure to follow all steps below:
     gitlab-workhorse setting as needed.
 
 1.  After all the above changes recompile the assets. This is an important task
-    and will take some time to complete depending on the server resources.
+    and will take some time to complete depending on the server resources:
 
     ```
     cd /home/git/gitlab
@@ -121,7 +120,7 @@ Make sure to follow all steps below:
 ### Disable relative URL in GitLab
 
 To disable the relative URL, follow the same steps as above and set up the
-GitLab URL to a one that doesn't contain a relative path.
+GitLab URL to one that doesn't contain a relative path.
 
 [omnibus-rel]: http://doc.gitlab.com/omnibus/settings/configuration.html#configuring-a-relative-url-for-gitlab "How to setup relative URL in Omnibus GitLab"
 [restart gitlab]: ../administration/restart_gitlab.md#installations-from-source "How to restart GitLab"

From 1353cff5fed083fd7192dddff5062ac383b1f8a0 Mon Sep 17 00:00:00 2001
From: Douglas Barbosa Alexandre <dbalexandre@gmail.com>
Date: Mon, 1 Feb 2016 21:43:51 -0200
Subject: [PATCH 073/134] Replaces "Create merge request" link with one to the
 MR when one exists

---
 CHANGELOG                                     |  1 +
 .../projects/commits_controller.rb            |  3 +
 .../projects/compare_controller.rb            | 23 ++++++--
 app/models/merge_request.rb                   |  1 +
 app/views/projects/commits/show.html.haml     |  5 +-
 app/views/projects/compare/_form.html.haml    |  5 +-
 features/project/commits/commits.feature      | 36 ++++++++++++
 features/steps/project/commits/commits.rb     | 57 +++++++++++++++++++
 8 files changed, 122 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 800f9c7918f..94873b4e35c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -51,6 +51,7 @@ v 8.4.4
   - Update omniauth-saml gem to 1.4.2
   - Prevent long-running backup tasks from timing out the database connection
   - Add a Project setting to allow guests to view build logs (defaults to true)
+  - Replaces "Create merge request" link with one to the "Merge Request" when one exists
 
 v 8.4.3
   - Increase lfs_objects size column to 8-byte integer to allow files larger
diff --git a/app/controllers/projects/commits_controller.rb b/app/controllers/projects/commits_controller.rb
index bf5b54c8cb7..1420b96840c 100644
--- a/app/controllers/projects/commits_controller.rb
+++ b/app/controllers/projects/commits_controller.rb
@@ -21,6 +21,9 @@ class Projects::CommitsController < Projects::ApplicationController
     @note_counts = project.notes.where(commit_id: @commits.map(&:id)).
       group(:commit_id).count
 
+    @merge_request = @project.merge_requests.opened.
+      find_by(source_project: @project, source_branch: @ref, target_branch: @repository.root_ref)
+
     respond_to do |format|
       format.html
       format.json { pager_json("projects/commits/_commits", @commits.size) }
diff --git a/app/controllers/projects/compare_controller.rb b/app/controllers/projects/compare_controller.rb
index 7bbe75b3974..dc5d217f3e4 100644
--- a/app/controllers/projects/compare_controller.rb
+++ b/app/controllers/projects/compare_controller.rb
@@ -4,24 +4,23 @@ class Projects::CompareController < Projects::ApplicationController
   # Authorize
   before_action :require_non_empty_project
   before_action :authorize_download_code!
+  before_action :assign_ref_vars, only: [:index, :show]
+  before_action :merge_request, only: [:index, :show]
 
   def index
-    @ref = Addressable::URI.unescape(params[:to])
   end
 
   def show
-    base_ref = Addressable::URI.unescape(params[:from])
-    @ref = head_ref = Addressable::URI.unescape(params[:to])
     diff_options = { ignore_whitespace_change: true } if params[:w] == '1'
 
     compare_result = CompareService.new.
-      execute(@project, head_ref, @project, base_ref, diff_options)
+      execute(@project, @head_ref, @project, @base_ref, diff_options)
 
     if compare_result
       @commits = Commit.decorate(compare_result.commits, @project)
       @diffs = compare_result.diffs
-      @commit = @project.commit(head_ref)
-      @base_commit = @project.merge_base_commit(base_ref, head_ref)
+      @commit = @project.commit(@head_ref)
+      @base_commit = @project.merge_base_commit(@base_ref, @head_ref)
       @diff_refs = [@base_commit, @commit]
       @line_notes = []
     end
@@ -31,4 +30,16 @@ class Projects::CompareController < Projects::ApplicationController
     redirect_to namespace_project_compare_path(@project.namespace, @project,
                                                params[:from], params[:to])
   end
+
+  private
+
+  def assign_ref_vars
+    @base_ref = Addressable::URI.unescape(params[:from])
+    @ref = @head_ref = Addressable::URI.unescape(params[:to])
+  end
+
+  def merge_request
+    @merge_request ||= @project.merge_requests.opened.
+      find_by(source_project: @project, source_branch: @head_ref, target_branch: @base_ref)
+  end
 end
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index ddc476447ca..345b9a26d4e 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -137,6 +137,7 @@ class MergeRequest < ActiveRecord::Base
   scope :by_milestone, ->(milestone) { where(milestone_id: milestone) }
   scope :in_projects, ->(project_ids) { where("source_project_id in (:project_ids) OR target_project_id in (:project_ids)", project_ids: project_ids) }
   scope :of_projects, ->(ids) { where(target_project_id: ids) }
+  scope :opened, -> { with_state(:opened) }
   scope :merged, -> { with_state(:merged) }
   scope :closed, -> { with_state(:closed) }
   scope :closed_and_merged, -> { with_states(:closed, :merged) }
diff --git a/app/views/projects/commits/show.html.haml b/app/views/projects/commits/show.html.haml
index ede64d47ab3..89e091203a3 100644
--- a/app/views/projects/commits/show.html.haml
+++ b/app/views/projects/commits/show.html.haml
@@ -11,7 +11,10 @@
     = render 'shared/ref_switcher', destination: 'commits'
 
   .block-controls.hidden-xs.hidden-sm
-    - if create_mr_button?(@repository.root_ref, @ref)
+    - if @merge_request.present?
+      .control
+        = link_to "View #{@merge_request.to_reference}", namespace_project_merge_request_path(@project.namespace, @project, @merge_request), class: 'btn btn-success'
+    - elsif create_mr_button?(@repository.root_ref, @ref)
       .control
         = link_to create_mr_path(@repository.root_ref, @ref), class: 'btn btn-success' do
           = icon('plus')
diff --git a/app/views/projects/compare/_form.html.haml b/app/views/projects/compare/_form.html.haml
index efc25eda26b..bdaa39055ad 100644
--- a/app/views/projects/compare/_form.html.haml
+++ b/app/views/projects/compare/_form.html.haml
@@ -13,12 +13,13 @@
         = text_field_tag :to, params[:to], class: "form-control", required: true
     &nbsp;
     = button_tag "Compare", class: "btn btn-create commits-compare-btn"
-    - if create_mr_button?
+    - if @merge_request.present?
+      = link_to "View #{@merge_request.to_reference}", namespace_project_merge_request_path(@project.namespace, @project, @merge_request), class: 'prepend-left-10 btn'
+    - elsif create_mr_button?
       = link_to create_mr_path, class: 'prepend-left-10 btn' do
         = icon("plus")
         Create Merge Request
 
-
 :javascript
   var availableTags = #{@project.repository.ref_names.to_json};
 
diff --git a/features/project/commits/commits.feature b/features/project/commits/commits.feature
index 01c10721312..a95df038357 100644
--- a/features/project/commits/commits.feature
+++ b/features/project/commits/commits.feature
@@ -7,6 +7,26 @@ Feature: Project Commits
 
   Scenario: I browse commits list for master branch
     Then I see project commits
+    And I should not see button to create a new merge request
+    Then I click the "Compare" tab
+    And I should not see button to create a new merge request
+
+  Scenario: I browse commits list for feature branch without a merge request
+    Given I visit commits list page for feature branch
+    Then I see feature branch commits
+    And I see button to create a new merge request
+    Then I click the "Compare" tab
+    And I see button to create a new merge request
+
+  Scenario: I browse commits list for feature branch with an open merge request
+    Given project have an open merge request
+    And I visit commits list page for feature branch
+    Then I see feature branch commits
+    And I should not see button to create a new merge request
+    And I should see button to the merge request
+    Then I click the "Compare" tab
+    And I should not see button to create a new merge request
+    And I should see button to the merge request
 
   Scenario: I browse atom feed of commits list for master branch
     Given I click atom feed link
@@ -30,6 +50,22 @@ Feature: Project Commits
     And I click side-by-side diff button
     Then I see inline diff button
 
+  @javascript
+  Scenario: I compare branches without a merge request
+    Given I visit compare refs page
+    And I fill compare fields with branches
+    Then I see compared branches
+    And I see button to create a new merge request
+
+  @javascript
+  Scenario: I compare branches with an open merge request
+    Given project have an open merge request
+    And I visit compare refs page
+    And I fill compare fields with branches
+    Then I see compared branches
+    And I should not see button to create a new merge request
+    And I should see button to the merge request
+
   @javascript
   Scenario: I compare refs
     Given I visit compare refs page
diff --git a/features/steps/project/commits/commits.rb b/features/steps/project/commits/commits.rb
index daf6cdaaac8..23814c2ee25 100644
--- a/features/steps/project/commits/commits.rb
+++ b/features/steps/project/commits/commits.rb
@@ -33,6 +33,13 @@ class Spinach::Features::ProjectCommits < Spinach::FeatureSteps
     expect(page).to have_content "Showing #{sample_commit.files_changed_count} changed files"
   end
 
+  step 'I fill compare fields with branches' do
+    fill_in 'from', with: 'feature'
+    fill_in 'to',   with: 'master'
+
+    click_button 'Compare'
+  end
+
   step 'I fill compare fields with refs' do
     fill_in "from", with: sample_commit.parent_id
     fill_in "to",   with: sample_commit.id
@@ -56,6 +63,56 @@ class Spinach::Features::ProjectCommits < Spinach::FeatureSteps
     expect(page).to have_content "Showing 2 changed files"
   end
 
+  step 'I visit commits list page for feature branch' do
+    visit namespace_project_commits_path(@project.namespace, @project, 'feature', { limit: 5 })
+  end
+
+  step 'I see feature branch commits' do
+    commit = @project.repository.commit('0b4bc9a')
+    expect(page).to have_content(@project.name)
+    expect(page).to have_content(commit.message[0..12])
+    expect(page).to have_content(commit.short_id)
+  end
+
+  step 'project have an open merge request' do
+    create(:merge_request,
+           title: 'Feature',
+           source_project: @project,
+           source_branch: 'feature',
+           target_branch: 'master',
+           author: @project.users.first
+          )
+  end
+
+  step 'I click the "Compare" tab' do
+    click_link('Compare')
+  end
+
+  step 'I fill compare fields with branches' do
+    fill_in 'from', with: 'master'
+    fill_in 'to',   with: 'feature'
+
+    click_button 'Compare'
+  end
+
+  step 'I see compared branches' do
+    expect(page).to have_content 'Commits (1)'
+    expect(page).to have_content 'Showing 1 changed file with 5 additions and 0 deletions'
+  end
+
+  step 'I see button to create a new merge request' do
+    expect(page).to have_link 'Create Merge Request'
+  end
+
+  step 'I should not see button to create a new merge request' do
+    expect(page).to_not have_link 'Create Merge Request'
+  end
+
+  step 'I should see button to the merge request' do
+    merge_request = MergeRequest.find_by(title: 'Feature')
+    expect(page).to have_link "View #{merge_request.to_reference}", href: namespace_project_merge_request_path(@project.namespace, @project, merge_request)
+  end
+
   step 'I see breadcrumb links' do
     expect(page).to have_selector('ul.breadcrumb')
     expect(page).to have_selector('ul.breadcrumb a', count: 4)

From 202bf71da8e8f5ab0da0bc12b62084ed814ae1d9 Mon Sep 17 00:00:00 2001
From: Douglas Barbosa Alexandre <dbalexandre@gmail.com>
Date: Wed, 10 Feb 2016 10:47:59 -0200
Subject: [PATCH 074/134] Change MR link to "View Open Merge Request"

---
 app/views/projects/commits/show.html.haml  | 2 +-
 app/views/projects/compare/_form.html.haml | 2 +-
 features/steps/project/commits/commits.rb  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/views/projects/commits/show.html.haml b/app/views/projects/commits/show.html.haml
index 89e091203a3..c52cf25d40a 100644
--- a/app/views/projects/commits/show.html.haml
+++ b/app/views/projects/commits/show.html.haml
@@ -13,7 +13,7 @@
   .block-controls.hidden-xs.hidden-sm
     - if @merge_request.present?
       .control
-        = link_to "View #{@merge_request.to_reference}", namespace_project_merge_request_path(@project.namespace, @project, @merge_request), class: 'btn btn-success'
+        = link_to "View Open Merge Request", namespace_project_merge_request_path(@project.namespace, @project, @merge_request), class: 'btn'
     - elsif create_mr_button?(@repository.root_ref, @ref)
       .control
         = link_to create_mr_path(@repository.root_ref, @ref), class: 'btn btn-success' do
diff --git a/app/views/projects/compare/_form.html.haml b/app/views/projects/compare/_form.html.haml
index bdaa39055ad..4ab81f3635c 100644
--- a/app/views/projects/compare/_form.html.haml
+++ b/app/views/projects/compare/_form.html.haml
@@ -14,7 +14,7 @@
     &nbsp;
     = button_tag "Compare", class: "btn btn-create commits-compare-btn"
     - if @merge_request.present?
-      = link_to "View #{@merge_request.to_reference}", namespace_project_merge_request_path(@project.namespace, @project, @merge_request), class: 'prepend-left-10 btn'
+      = link_to "View Open Merge Request", namespace_project_merge_request_path(@project.namespace, @project, @merge_request), class: 'prepend-left-10 btn'
     - elsif create_mr_button?
       = link_to create_mr_path, class: 'prepend-left-10 btn' do
         = icon("plus")
diff --git a/features/steps/project/commits/commits.rb b/features/steps/project/commits/commits.rb
index 23814c2ee25..f9fd7332464 100644
--- a/features/steps/project/commits/commits.rb
+++ b/features/steps/project/commits/commits.rb
@@ -110,7 +110,7 @@ class Spinach::Features::ProjectCommits < Spinach::FeatureSteps
 
   step 'I should see button to the merge request' do
     merge_request = MergeRequest.find_by(title: 'Feature')
-    expect(page).to have_link "View #{merge_request.to_reference}", href: namespace_project_merge_request_path(@project.namespace, @project, merge_request)
+    expect(page).to have_link "View Open Merge Request", href: namespace_project_merge_request_path(@project.namespace, @project, merge_request)
   end
 
   step 'I see breadcrumb links' do

From efedf983a117c5e5c75d7b2109475800345ff804 Mon Sep 17 00:00:00 2001
From: Tomasz Maczukin <tomasz@maczukin.pl>
Date: Wed, 10 Feb 2016 14:31:30 +0100
Subject: [PATCH 075/134] Fix builds API formatting

[ci skip]
---
 doc/api/builds.md | 64 ++++++++++++++++-------------------------------
 1 file changed, 22 insertions(+), 42 deletions(-)

diff --git a/doc/api/builds.md b/doc/api/builds.md
index 6e64d096644..baf357a1075 100644
--- a/doc/api/builds.md
+++ b/doc/api/builds.md
@@ -8,20 +8,16 @@ Get a list of builds in a project.
 GET /projects/:id/builds
 ```
 
-### Parameters
-
 | Attribute | Type    | required | Description         |
 |-----------|---------|----------|---------------------|
-| id        | integer | yes      | The ID of a project |
-| scope     | string|array of strings | no | The scope of builds to show, one or array of: `pending`, `running`, `failed`, `success`, `canceled`; showing all builds if none provided |
-
-### Example of request
+| `id`      | integer | yes      | The ID of a project |
+| `scope`   | string|array of strings | no | The scope of builds to show, one or array of: `pending`, `running`, `failed`, `success`, `canceled`; showing all builds if none provided |
 
 ```
 curl -H "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" "https://gitlab.example.com/api/v3/projects/1/builds"
 ```
 
-### Example of response
+Example of response
 
 ```json
 [
@@ -112,21 +108,17 @@ Get a list of builds for specific commit in a project.
 GET /projects/:id/repository/commits/:sha/builds
 ```
 
-### Parameters
-
 | Attribute | Type    | required | Description         |
 |-----------|---------|----------|---------------------|
-| id        | integer | yes      | The ID of a project |
-| sha       | string  | yes      | The SHA id of a commit |
-| scope     | string|array of strings | no | The scope of builds to show, one or array of: `pending`, `running`, `failed`, `success`, `canceled`; showing all builds if none provided |
-
-### Example of request
+| `id`      | integer | yes      | The ID of a project |
+| `sha`     | string  | yes      | The SHA id of a commit |
+| `scope`   | string|array of strings | no | The scope of builds to show, one or array of: `pending`, `running`, `failed`, `success`, `canceled`; showing all builds if none provided |
 
 ```
 curl -H "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" "https://gitlab.example.com/api/v3/projects/1/repository/commits/0ff3ae198f8601a285adcf5c0fff204ee6fba5fd/builds"
 ```
 
-### Example of response
+Example of response
 
 ```json
 [
@@ -203,20 +195,16 @@ Get a single build of a project
 GET /projects/:id/builds/:build_id
 ```
 
-### Parameters
-
-| Attribute | Type    | required | Description         |
-|-----------|---------|----------|---------------------|
-| id        | integer | yes      | The ID of a project |
-| build\_id  | integer | yes      | The ID of a build   |
-
-### Example of request
+| Attribute  | Type    | required | Description         |
+|------------|---------|----------|---------------------|
+| `id`       | integer | yes      | The ID of a project |
+| `build_id` | integer | yes      | The ID of a build   |
 
 ```
 curl -H "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" "https://gitlab.example.com/api/v3/projects/1/builds/8"
 ```
 
-### Example of response
+Example of response
 
 ```json
 {
@@ -267,20 +255,16 @@ Cancel a single build of a project
 POST /projects/:id/builds/:build_id/cancel
 ```
 
-### Parameters
-
-| Attribute | Type    | required | Description         |
-|-----------|---------|----------|---------------------|
-| id        | integer | yes      | The ID of a project |
-| build\_id | integer | yes      | The ID of a build   |
-
-### Example of request
+| Attribute  | Type    | required | Description         |
+|------------|---------|----------|---------------------|
+| `id`       | integer | yes      | The ID of a project |
+| `build_id` | integer | yes      | The ID of a build   |
 
 ```
 curl -X POST -H "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" "https://gitlab.example.com/api/v3/projects/1/builds/1/cancel"
 ```
 
-### Example of response
+Example of response
 
 ```json
 {
@@ -317,20 +301,16 @@ Retry a single build of a project
 POST /projects/:id/builds/:build_id/retry
 ```
 
-### Parameters
-
-| Attribute | Type    | required | Description         |
-|-----------|---------|----------|---------------------|
-| id        | integer | yes      | The ID of a project |
-| build\_id | integer | yes      | The ID of a build   |
-
-### Example of request
+| Attribute  | Type    | required | Description         |
+|------------|---------|----------|---------------------|
+| `id`       | integer | yes      | The ID of a project |
+| `build_id` | integer | yes      | The ID of a build   |
 
 ```
 curl -X POST -H "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" "https://gitlab.example.com/api/v3/projects/1/builds/1/retry"
 ```
 
-### Example of response
+Example of response
 
 ```json
 {

From ba1f6de8a518c7b279200058fcc68064d6cf37f8 Mon Sep 17 00:00:00 2001
From: Tomasz Maczukin <tomasz@maczukin.pl>
Date: Wed, 10 Feb 2016 15:07:11 +0100
Subject: [PATCH 076/134] Add some fixes

[ci skip]
---
 doc/api/builds.md | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/doc/api/builds.md b/doc/api/builds.md
index baf357a1075..4dd4ee8b4bb 100644
--- a/doc/api/builds.md
+++ b/doc/api/builds.md
@@ -8,10 +8,10 @@ Get a list of builds in a project.
 GET /projects/:id/builds
 ```
 
-| Attribute | Type    | required | Description         |
+| Attribute | Type    | Required | Description         |
 |-----------|---------|----------|---------------------|
 | `id`      | integer | yes      | The ID of a project |
-| `scope`   | string|array of strings | no | The scope of builds to show, one or array of: `pending`, `running`, `failed`, `success`, `canceled`; showing all builds if none provided |
+| `scope`   | string **or** array of strings | no | The scope of builds to show, one or array of: `pending`, `running`, `failed`, `success`, `canceled`; showing all builds if none provided |
 
 ```
 curl -H "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" "https://gitlab.example.com/api/v3/projects/1/builds"
@@ -108,11 +108,11 @@ Get a list of builds for specific commit in a project.
 GET /projects/:id/repository/commits/:sha/builds
 ```
 
-| Attribute | Type    | required | Description         |
+| Attribute | Type    | Required | Description         |
 |-----------|---------|----------|---------------------|
 | `id`      | integer | yes      | The ID of a project |
 | `sha`     | string  | yes      | The SHA id of a commit |
-| `scope`   | string|array of strings | no | The scope of builds to show, one or array of: `pending`, `running`, `failed`, `success`, `canceled`; showing all builds if none provided |
+| `scope`   | stringi **or** array of strings | no | The scope of builds to show, one or array of: `pending`, `running`, `failed`, `success`, `canceled`; showing all builds if none provided |
 
 ```
 curl -H "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" "https://gitlab.example.com/api/v3/projects/1/repository/commits/0ff3ae198f8601a285adcf5c0fff204ee6fba5fd/builds"
@@ -195,7 +195,7 @@ Get a single build of a project
 GET /projects/:id/builds/:build_id
 ```
 
-| Attribute  | Type    | required | Description         |
+| Attribute  | Type    | Required | Description         |
 |------------|---------|----------|---------------------|
 | `id`       | integer | yes      | The ID of a project |
 | `build_id` | integer | yes      | The ID of a build   |
@@ -255,7 +255,7 @@ Cancel a single build of a project
 POST /projects/:id/builds/:build_id/cancel
 ```
 
-| Attribute  | Type    | required | Description         |
+| Attribute  | Type    | Required | Description         |
 |------------|---------|----------|---------------------|
 | `id`       | integer | yes      | The ID of a project |
 | `build_id` | integer | yes      | The ID of a build   |
@@ -301,7 +301,7 @@ Retry a single build of a project
 POST /projects/:id/builds/:build_id/retry
 ```
 
-| Attribute  | Type    | required | Description         |
+| Attribute  | Type    | Required | Description         |
 |------------|---------|----------|---------------------|
 | `id`       | integer | yes      | The ID of a project |
 | `build_id` | integer | yes      | The ID of a build   |

From f8036ec9107d64cb27f0e5cb0ed0dfd9c88ca833 Mon Sep 17 00:00:00 2001
From: Achilleas Pipinellis <axilleas@axilleas.me>
Date: Wed, 10 Feb 2016 16:54:15 +0200
Subject: [PATCH 077/134] Remove sqlite check in raketask

---
 lib/tasks/gitlab/check.rake | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/lib/tasks/gitlab/check.rake b/lib/tasks/gitlab/check.rake
index 2dc2953e328..54d95cd62a5 100644
--- a/lib/tasks/gitlab/check.rake
+++ b/lib/tasks/gitlab/check.rake
@@ -90,24 +90,6 @@ namespace :gitlab do
       end
     end
 
-    def check_database_is_not_sqlite
-      print "Database is SQLite ... "
-
-      database_config_file = Rails.root.join("config", "database.yml")
-
-      unless File.read(database_config_file) =~ /adapter:\s+sqlite/
-        puts "no".green
-      else
-        puts "yes".red
-        puts "Please fix this by removing the SQLite entry from the database.yml".blue
-        for_more_information(
-          "https://github.com/gitlabhq/gitlabhq/wiki/Migrate-from-SQLite-to-MySQL",
-          see_database_guide
-        )
-        fix_and_rerun
-      end
-    end
-
     def check_gitlab_config_exists
       print "GitLab config exists? ... "
 

From c9371eab1304a331718dd1e3b33ebb20f44b22e3 Mon Sep 17 00:00:00 2001
From: Kamil Trzcinski <ayufan@ayufan.eu>
Date: Sun, 7 Feb 2016 01:57:04 +0100
Subject: [PATCH 078/134] Use caching, instead of haxxy /cache

---
 .gitlab-ci.yml           | 46 ++++++++++++++++++++++++++++++++++++++++
 scripts/prepare_build.sh | 12 +++++------
 2 files changed, 52 insertions(+), 6 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5dfeb8a1f90..1c4d98ea3f6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,6 +5,11 @@ services:
   - postgres:latest
   - redis:latest
 
+cache:
+  key: "ruby22"
+  paths:
+  - vendor
+
 variables:
   MYSQL_ALLOW_EMPTY_PASSWORD: "1"
 
@@ -144,6 +149,10 @@ spec:feature:ruby21:
   script:
     - RAILS_ENV=test bundle exec rake assets:precompile 2>/dev/null
     - RAILS_ENV=test SIMPLECOV=true bundle exec rake spec:feature
+  cache:
+    key: "ruby21"
+    paths:
+    - vendor
   tags:
     - ruby
     - mysql
@@ -154,6 +163,10 @@ spec:api:ruby21:
   - master
   script:
     - RAILS_ENV=test SIMPLECOV=true bundle exec rake spec:api
+  cache:
+    key: "ruby21"
+    paths:
+    - vendor
   tags:
     - ruby
     - mysql
@@ -164,6 +177,10 @@ spec:models:ruby21:
   - master
   script:
     - RAILS_ENV=test SIMPLECOV=true bundle exec rake spec:models
+  cache:
+    key: "ruby21"
+    paths:
+    - vendor
   tags:
     - ruby
     - mysql
@@ -174,6 +191,10 @@ spec:lib:ruby21:
   - master
   script:
     - RAILS_ENV=test SIMPLECOV=true bundle exec rake spec:lib
+  cache:
+    key: "ruby21"
+    paths:
+    - vendor
   tags:
     - ruby
     - mysql
@@ -184,6 +205,10 @@ spec:services:ruby21:
   - master
   script:
     - RAILS_ENV=test SIMPLECOV=true bundle exec rake spec:services
+  cache:
+    key: "ruby21"
+    paths:
+    - vendor
   tags:
     - ruby
     - mysql
@@ -194,6 +219,10 @@ spec:benchmark:ruby21:
   - master
   script:
     - RAILS_ENV=test bundle exec rake spec:benchmark
+  cache:
+    key: "ruby21"
+    paths:
+    - vendor
   tags:
     - ruby
     - mysql
@@ -205,6 +234,10 @@ spec:other:ruby21:
   - master
   script:
     - RAILS_ENV=test SIMPLECOV=true bundle exec rake spec:other
+  cache:
+    key: "ruby21"
+    paths:
+    - vendor
   tags:
     - ruby
     - mysql
@@ -215,6 +248,10 @@ spinach:project:half:ruby21:
   - master
   script:
     - RAILS_ENV=test SIMPLECOV=true bundle exec rake spinach:project:half
+  cache:
+    key: "ruby21"
+    paths:
+    - vendor
   tags:
     - ruby
     - mysql
@@ -225,6 +262,10 @@ spinach:project:rest:ruby21:
   - master
   script:
     - RAILS_ENV=test SIMPLECOV=true bundle exec rake spinach:project:rest
+  cache:
+    key: "ruby21"
+    paths:
+    - vendor
   tags:
     - ruby
     - mysql
@@ -235,6 +276,11 @@ spinach:other:ruby21:
   - master
   script:
     - RAILS_ENV=test SIMPLECOV=true bundle exec rake spinach:other
+  cache:
+    key: "ruby21"
+    paths:
+    - vendor
   tags:
     - ruby
     - mysql
+
diff --git a/scripts/prepare_build.sh b/scripts/prepare_build.sh
index 5987988dc8e..b6f076a90c3 100755
--- a/scripts/prepare_build.sh
+++ b/scripts/prepare_build.sh
@@ -1,15 +1,15 @@
 #!/bin/bash
 
 if [ -f /.dockerinit ]; then
-    # Docker runners use `/cache` folder which is persisted every build
-    if [ ! -e /cache/phantomjs_1.9.8-0jessie_amd64.deb ]; then
+    mkdir -p vendor
+    if [ ! -e vendor/phantomjs_1.9.8-0jessie_amd64.deb ]; then
         wget -q https://gitlab.com/axil/phantomjs-debian/raw/master/phantomjs_1.9.8-0jessie_amd64.deb
-        mv phantomjs_1.9.8-0jessie_amd64.deb /cache
+        mv phantomjs_1.9.8-0jessie_amd64.deb vendor/
     fi
-    dpkg -i /cache/phantomjs_1.9.8-0jessie_amd64.deb
+    dpkg -i vendor/phantomjs_1.9.8-0jessie_amd64.deb
 
     apt-get update -qq
-    apt-get -o dir::cache::archives="/cache/apt" install -y -qq --force-yes \
+    apt-get -o dir::cache::archives="vendor/apt" install -y -qq --force-yes \
         libicu-dev libkrb5-dev cmake nodejs postgresql-client mysql-client unzip
 
     cp config/database.yml.mysql config/database.yml
@@ -20,7 +20,7 @@ if [ -f /.dockerinit ]; then
     cp config/resque.yml.example config/resque.yml
     sed -i 's/localhost/redis/g' config/resque.yml
 
-    export FLAGS=(--path /cache)
+    export FLAGS=(--path vendor)
 else
     export PATH=$HOME/bin:/usr/local/bin:/usr/bin:/bin
     cp config/database.yml.mysql config/database.yml

From a7567ca15203f63b59a736d5d391054ebc20d73d Mon Sep 17 00:00:00 2001
From: Oliver Rogers <oliver.rogers@bluefinsolutions.com>
Date: Sat, 23 Jan 2016 22:31:46 +0000
Subject: [PATCH 079/134] Fix milestone order in project and issue edit lists
 to due_date

---
 CHANGELOG                                         |  1 +
 app/controllers/projects/milestones_controller.rb | 11 ++++++-----
 app/helpers/issues_helper.rb                      |  6 +++---
 app/helpers/projects_helper.rb                    |  4 ----
 4 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 800f9c7918f..3aae914481e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -51,6 +51,7 @@ v 8.4.4
   - Update omniauth-saml gem to 1.4.2
   - Prevent long-running backup tasks from timing out the database connection
   - Add a Project setting to allow guests to view build logs (defaults to true)
+  - Sort project milestones by due date including issue editor (Oliver Rogers / Orih)
 
 v 8.4.3
   - Increase lfs_objects size column to 8-byte integer to allow files larger
diff --git a/app/controllers/projects/milestones_controller.rb b/app/controllers/projects/milestones_controller.rb
index 15506bd677a..a5c4ef1c7c7 100644
--- a/app/controllers/projects/milestones_controller.rb
+++ b/app/controllers/projects/milestones_controller.rb
@@ -11,11 +11,12 @@ class Projects::MilestonesController < Projects::ApplicationController
   respond_to :html
 
   def index
-    @milestones = case params[:state]
-                  when 'all'; @project.milestones.order("state, due_date DESC")
-                  when 'closed'; @project.milestones.closed.order("due_date DESC")
-                  else @project.milestones.active.order("due_date ASC")
-                  end
+    @milestones =
+      case params[:state]
+      when 'all' then @project.milestones.reorder(due_date: :desc, title: :asc)
+      when 'closed' then @project.milestones.closed.reorder(due_date: :desc, title: :asc)
+      else @project.milestones.active.reorder(due_date: :asc, title: :asc)
+      end
 
     @milestones = @milestones.includes(:project)
     @milestones = @milestones.page(params[:page]).per(PER_PAGE)
diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb
index 43262d579e9..ae4ebc0854a 100644
--- a/app/helpers/issues_helper.rb
+++ b/app/helpers/issues_helper.rb
@@ -44,14 +44,14 @@ module IssuesHelper
   end
 
   def bulk_update_milestone_options
-    milestones = project_active_milestones.to_a
+    milestones = @project.milestones.active.reorder(due_date: :asc, title: :asc).to_a
     milestones.unshift(Milestone::None)
 
     options_from_collection_for_select(milestones, 'id', 'title', params[:milestone_id])
   end
 
   def milestone_options(object)
-    milestones = object.project.milestones.active.to_a
+    milestones = object.project.milestones.active.reorder(due_date: :asc, title: :asc).to_a
     milestones.unshift(Milestone::None)
 
     options_from_collection_for_select(milestones, 'id', 'title', object.milestone_id)
@@ -69,7 +69,7 @@ module IssuesHelper
     end
   end
 
-  def issue_button_visibility(issue, closed)    
+  def issue_button_visibility(issue, closed)
     return 'hidden' if issue.closed? == closed
   end
 
diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb
index cc1c61e9ec0..d6fb629b0c2 100644
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -98,10 +98,6 @@ module ProjectsHelper
     project_nav_tabs.include? name
   end
 
-  def project_active_milestones
-    @project.milestones.active.order("due_date, title ASC")
-  end
-
   def project_for_deploy_key(deploy_key)
     if deploy_key.projects.include?(@project)
       @project

From 5f07e13b7d04aad6e9a84c964a9239de0604b20a Mon Sep 17 00:00:00 2001
From: Sytse Sijbrandij <sytse@gitlab.com>
Date: Wed, 10 Feb 2016 17:36:23 +0000
Subject: [PATCH 080/134] Add notice about MR target for stable fixes

---
 CONTRIBUTING.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 263f98b1e57..c4522998f42 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -364,6 +364,7 @@ corresponding merge request should be updated to have the following:
 
 This makes it easier for release managers to keep track of what still has to be
 merged and where changes have to be merged into.
+Like all merge requests the target should be master so all bugfixes are in master.
 
 ## Definition of done
 

From c1541fdf1ebe15cd6321b0f27337bbcc17891ac8 Mon Sep 17 00:00:00 2001
From: Douglas Barbosa Alexandre <dbalexandre@gmail.com>
Date: Wed, 10 Feb 2016 19:52:34 -0200
Subject: [PATCH 081/134] [ci skip] Update CHANGELOG

---
 CHANGELOG | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 94873b4e35c..bdfd4f83405 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -46,12 +46,12 @@ v 8.5.0 (unreleased)
   - Faster snippet search
   - Title for milestones should be unique (Zeger-Jan van de Weg)
   - Validate correctness of maximum attachment size application setting
+  - Replaces "Create merge request" link with one to the "Merge Request" when one exists
 
 v 8.4.4
   - Update omniauth-saml gem to 1.4.2
   - Prevent long-running backup tasks from timing out the database connection
   - Add a Project setting to allow guests to view build logs (defaults to true)
-  - Replaces "Create merge request" link with one to the "Merge Request" when one exists
 
 v 8.4.3
   - Increase lfs_objects size column to 8-byte integer to allow files larger

From 8172d5ca54f908d5ce9975dd18fb9bea0c992dbb Mon Sep 17 00:00:00 2001
From: Nemanja Boric <4burgos@gmail.com>
Date: Wed, 10 Feb 2016 23:52:39 +0100
Subject: [PATCH 082/134] Don't try to mark broken MR as mergable

In case merge request is broken, we shouldn't check if the sha
is mergable, as it will be null, and there's no point, as we know
that it's not mergable.
---
 app/models/merge_request.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index 345b9a26d4e..1be8061e53d 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -241,7 +241,7 @@ class MergeRequest < ActiveRecord::Base
     return unless unchecked?
 
     can_be_merged =
-      project.repository.can_be_merged?(source_sha, target_branch)
+      !broken? && project.repository.can_be_merged?(source_sha, target_branch)
 
     if can_be_merged
       mark_as_mergeable

From 78e36780be31257a59cb3076ba5402e380ca240f Mon Sep 17 00:00:00 2001
From: Gal Schlezinger <galstar@spitfire.co.il>
Date: Sun, 31 Jan 2016 11:05:47 +0200
Subject: [PATCH 083/134] Added
 '/api/v3/projects/:id/merge_requests/:merge_request_id/closes_issues' route
 in the API

Added some documentation for it

Added to changelog

Added curl example and an attribute table

Moved the api route definition from "lib/api/issues.rb" to "lib/api/merge_requests.rb"

Fixed the attributes and changed the documentation to be at "merge_requests.md" too

Changed generic titles to more specific titles

added an underscore

added tests. it depends on a newer version of gitlab-test project
I'm doing a  since I need to add a branch to the `gitlab-test` repo

removed the before

using 'iid' instead of 'id' in the description to reference the issues. that makes the tests pass

Removed the 'closes-issues' key from test_env. so it should pass the tests

Moved the two initializations to the describe block

Changed the changelog
---
 CHANGELOG                                |  1 +
 doc/api/merge_requests.md                | 62 ++++++++++++++++++++++++
 lib/api/merge_requests.rb                | 13 +++++
 spec/factories/merge_requests.rb         |  6 +++
 spec/requests/api/merge_requests_spec.rb | 26 ++++++++++
 5 files changed, 108 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 50b27e25492..8f5a861d23e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -11,6 +11,7 @@ v 8.5.0 (unreleased)
   - New UI for pagination
   - Don't prevent sign out when 2FA enforcement is enabled and user hasn't yet
     set it up
+  - API: Added "merge_requests/:merge_request_id/closes_issues" (Gal Schlezinger)
   - Fix diff comments loaded by AJAX to load comment with diff in discussion tab
   - Whitelist raw "abbr" elements when parsing Markdown (Benedict Etzel)
   - Fix label links for a merge request pointing to issues list
diff --git a/doc/api/merge_requests.md b/doc/api/merge_requests.md
index 85ed31320b9..2df244f3935 100644
--- a/doc/api/merge_requests.md
+++ b/doc/api/merge_requests.md
@@ -412,3 +412,65 @@ Parameters:
 ## Comments on merge requets
 
 Comments are done via the [notes](notes.md) resource.
+
+## List issues that will close on merge
+
+Get all the issues that would be closed by merging the provided merge request.
+
+```
+GET /projects/:id/merge_requests/:merge_request_id/closes_issues
+```
+
+| Attribute | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `id`      | integer | yes   | The ID of a project |
+| `merge_request_id` | integer | yes   | The ID of the merge request |
+
+```bash
+curl -H "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" https://gitlab.example.com/api/v3/projects/76/merge_requests/1/closes_issues
+```
+
+Example response:
+
+```json
+[
+   {
+      "state" : "opened",
+      "description" : "Ratione dolores corrupti mollitia soluta quia.",
+      "author" : {
+         "state" : "active",
+         "id" : 18,
+         "web_url" : "https://gitlab.example.com/u/eileen.lowe",
+         "name" : "Alexandra Bashirian",
+         "avatar_url" : null,
+         "username" : "eileen.lowe"
+      },
+      "milestone" : {
+         "project_id" : 1,
+         "description" : "Ducimus nam enim ex consequatur cumque ratione.",
+         "state" : "closed",
+         "due_date" : null,
+         "iid" : 2,
+         "created_at" : "2016-01-04T15:31:39.996Z",
+         "title" : "v4.0",
+         "id" : 17,
+         "updated_at" : "2016-01-04T15:31:39.996Z"
+      },
+      "project_id" : 1,
+      "assignee" : {
+         "state" : "active",
+         "id" : 1,
+         "name" : "Administrator",
+         "web_url" : "https://gitlab.example.com/u/root",
+         "avatar_url" : null,
+         "username" : "root"
+      },
+      "updated_at" : "2016-01-04T15:31:51.081Z",
+      "id" : 76,
+      "title" : "Consequatur vero maxime deserunt laboriosam est voluptas dolorem.",
+      "created_at" : "2016-01-04T15:31:51.081Z",
+      "iid" : 6,
+      "labels" : []
+   },
+]
+```
diff --git a/lib/api/merge_requests.rb b/lib/api/merge_requests.rb
index dd7f24f3279..004ff52c1d3 100644
--- a/lib/api/merge_requests.rb
+++ b/lib/api/merge_requests.rb
@@ -300,6 +300,19 @@ module API
             render_api_error!("Failed to save note #{note.errors.messages}", 400)
           end
         end
+
+        # List issues that will close on merge
+        #
+        # Parameters:
+        #   id (required)               - The ID of a project
+        #   merge_request_id (required) - ID of MR
+        # Examples:
+        #   GET /projects/:id/merge_requests/:merge_request_id/closes_issues
+        get "#{path}/closes_issues" do
+          merge_request = user_project.merge_requests.find(params[:merge_request_id])
+          issues = ::Kaminari.paginate_array(merge_request.closes_issues)
+          present paginate(issues), with: Entities::Issue
+        end
       end
     end
   end
diff --git a/spec/factories/merge_requests.rb b/spec/factories/merge_requests.rb
index 0c6a881f868..777bdb95008 100644
--- a/spec/factories/merge_requests.rb
+++ b/spec/factories/merge_requests.rb
@@ -73,6 +73,12 @@ FactoryGirl.define do
       merge_user author
     end
 
+    trait :with_closes_issues do
+      source_branch "markdown"
+      target_branch "master"
+      state :opened
+    end
+
     factory :closed_merge_request, traits: [:closed]
     factory :reopened_merge_request, traits: [:reopened]
     factory :merge_request_with_diffs, traits: [:with_diffs]
diff --git a/spec/requests/api/merge_requests_spec.rb b/spec/requests/api/merge_requests_spec.rb
index d7bfa17b0b1..90faf82fc01 100644
--- a/spec/requests/api/merge_requests_spec.rb
+++ b/spec/requests/api/merge_requests_spec.rb
@@ -448,6 +448,32 @@ describe API::API, api: true  do
     end
   end
 
+  describe "GET :id/merge_requests/:merge_request_id/closes_issues" do
+    let(:merge_request_with_closes_issues) { create(:merge_request, :with_closes_issues, author: user, assignee: user, source_project: project, target_project: project, title: "Closed ##{issue.id}", created_at: base_time + 3.seconds, description: "This should close ##{issue.iid}") }
+    let(:issue) do
+      create :issue,
+        author: user,
+        assignee: user,
+        project: project,
+        milestone: nil
+    end
+
+    it "should return the issues that will be closed on merge" do
+      get api("/projects/#{project.id}/merge_requests/#{merge_request_with_closes_issues.id}/closes_issues", user)
+      expect(response.status).to eq(200)
+      expect(json_response).to be_an Array
+      expect(json_response.length).to eq(1)
+      expect(json_response.first['id']).to eq(issue.id)
+    end
+
+    it "should return an empty array when there are no issues to be closed" do
+      get api("/projects/#{project.id}/merge_requests/#{merge_request.id}/closes_issues", user)
+      expect(response.status).to eq(200)
+      expect(json_response).to be_an Array
+      expect(json_response.length).to eq(0)
+    end
+  end
+
   def mr_with_later_created_and_updated_at_time
     merge_request
     merge_request.created_at += 1.hour

From b91d1890a8f33566d52c653e9ae083a3a3329590 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Coutable?= <remy@rymai.me>
Date: Wed, 10 Feb 2016 17:11:23 +0100
Subject: [PATCH 084/134] Pass current_user to merge_request.closes_issues in
 API ans streamline MR API specs

---
 lib/api/merge_requests.rb                |  2 +-
 spec/factories/merge_requests.rb         |  6 ------
 spec/requests/api/merge_requests_spec.rb | 20 ++++++++------------
 3 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/lib/api/merge_requests.rb b/lib/api/merge_requests.rb
index 004ff52c1d3..4230c68abb2 100644
--- a/lib/api/merge_requests.rb
+++ b/lib/api/merge_requests.rb
@@ -310,7 +310,7 @@ module API
         #   GET /projects/:id/merge_requests/:merge_request_id/closes_issues
         get "#{path}/closes_issues" do
           merge_request = user_project.merge_requests.find(params[:merge_request_id])
-          issues = ::Kaminari.paginate_array(merge_request.closes_issues)
+          issues = ::Kaminari.paginate_array(merge_request.closes_issues(current_user))
           present paginate(issues), with: Entities::Issue
         end
       end
diff --git a/spec/factories/merge_requests.rb b/spec/factories/merge_requests.rb
index 777bdb95008..0c6a881f868 100644
--- a/spec/factories/merge_requests.rb
+++ b/spec/factories/merge_requests.rb
@@ -73,12 +73,6 @@ FactoryGirl.define do
       merge_user author
     end
 
-    trait :with_closes_issues do
-      source_branch "markdown"
-      target_branch "master"
-      state :opened
-    end
-
     factory :closed_merge_request, traits: [:closed]
     factory :reopened_merge_request, traits: [:reopened]
     factory :merge_request_with_diffs, traits: [:with_diffs]
diff --git a/spec/requests/api/merge_requests_spec.rb b/spec/requests/api/merge_requests_spec.rb
index 90faf82fc01..7a722777d59 100644
--- a/spec/requests/api/merge_requests_spec.rb
+++ b/spec/requests/api/merge_requests_spec.rb
@@ -448,25 +448,21 @@ describe API::API, api: true  do
     end
   end
 
-  describe "GET :id/merge_requests/:merge_request_id/closes_issues" do
-    let(:merge_request_with_closes_issues) { create(:merge_request, :with_closes_issues, author: user, assignee: user, source_project: project, target_project: project, title: "Closed ##{issue.id}", created_at: base_time + 3.seconds, description: "This should close ##{issue.iid}") }
-    let(:issue) do
-      create :issue,
-        author: user,
-        assignee: user,
-        project: project,
-        milestone: nil
-    end
+  describe 'GET :id/merge_requests/:merge_request_id/closes_issues' do
+    it 'returns the issue that will be closed on merge' do
+      issue = create(:issue, project: project)
+      mr = merge_request.tap do |mr|
+        mr.update_attribute(:description, "Closes #{issue.to_reference(mr.project)}")
+      end
 
-    it "should return the issues that will be closed on merge" do
-      get api("/projects/#{project.id}/merge_requests/#{merge_request_with_closes_issues.id}/closes_issues", user)
+      get api("/projects/#{project.id}/merge_requests/#{mr.id}/closes_issues", user)
       expect(response.status).to eq(200)
       expect(json_response).to be_an Array
       expect(json_response.length).to eq(1)
       expect(json_response.first['id']).to eq(issue.id)
     end
 
-    it "should return an empty array when there are no issues to be closed" do
+    it 'returns an empty array when there are no issues to be closed' do
       get api("/projects/#{project.id}/merge_requests/#{merge_request.id}/closes_issues", user)
       expect(response.status).to eq(200)
       expect(json_response).to be_an Array

From a2f61368f9d62cded366a3b8813969f66c4be4dd Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Fri, 5 Feb 2016 08:54:23 +0100
Subject: [PATCH 085/134] Add deprecation warning for old CI status badge
 action

We keep this only for backwards compatibility with projects that have
been migrated from GitLab CI. New project badge will go elsewhere.
---
 app/controllers/ci/projects_controller.rb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/controllers/ci/projects_controller.rb b/app/controllers/ci/projects_controller.rb
index 711c2847d5e..7838994433e 100644
--- a/app/controllers/ci/projects_controller.rb
+++ b/app/controllers/ci/projects_controller.rb
@@ -12,9 +12,12 @@ module Ci
 
     # Project status badge
     # Image with build status for sha or ref
+    #
+    # This action in DEPRECATED, this is here only for backwards compatibility
+    # with projects migrated from GitLab CI.
+    #
     def badge
       image = Ci::ImageForBuildService.new.execute(@project, params)
-
       send_file image.path, filename: image.name, disposition: 'inline', type:"image/svg+xml"
     end
 

From 01a406f5b02a7c8f5133012931b56696c3d21fe8 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Fri, 5 Feb 2016 08:55:25 +0100
Subject: [PATCH 086/134] Render 404 if there is no project for old CI status
 badge

---
 app/controllers/ci/projects_controller.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/controllers/ci/projects_controller.rb b/app/controllers/ci/projects_controller.rb
index 7838994433e..d1824b481d7 100644
--- a/app/controllers/ci/projects_controller.rb
+++ b/app/controllers/ci/projects_controller.rb
@@ -17,6 +17,7 @@ module Ci
     # with projects migrated from GitLab CI.
     #
     def badge
+      return render_404 unless @project
       image = Ci::ImageForBuildService.new.execute(@project, params)
       send_file image.path, filename: image.name, disposition: 'inline', type:"image/svg+xml"
     end

From 14f928b73005300f419adb839cfd7bb06435abb8 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Fri, 5 Feb 2016 12:38:10 +0100
Subject: [PATCH 087/134] Add CI status badge implementation to commit
 controller

---
 app/controllers/projects/commit_controller.rb | 6 ++++++
 config/routes.rb                              | 7 +++++++
 2 files changed, 13 insertions(+)

diff --git a/app/controllers/projects/commit_controller.rb b/app/controllers/projects/commit_controller.rb
index 21f4d9f44ec..637a911177c 100644
--- a/app/controllers/projects/commit_controller.rb
+++ b/app/controllers/projects/commit_controller.rb
@@ -57,6 +57,12 @@ class Projects::CommitController < Projects::ApplicationController
     render layout: false
   end
 
+  def status
+    status_sha = ci_commit.sha if ci_commit
+    image = Ci::ImageForBuildService.new.execute(@project, sha: status_sha)
+    send_file(image.path, filename: image.name, disposition: 'inline', type: 'image/svg+xml')
+  end
+
   private
 
   def commit
diff --git a/config/routes.rb b/config/routes.rb
index 3f6561a1fe0..30e42e197f4 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -493,6 +493,13 @@ Rails.application.routes.draw do
             constraints: { id: /(?:[^.]|\.(?!atom$))+/, format: /atom/ },
             as: :commits
           )
+
+          get(
+            '/status/*id/badge',
+            to: 'commit#status',
+            constraints: { format: /png/ },
+            as: :commit_status
+          )
         end
 
         resource  :avatar, only: [:show, :destroy]

From 28c4c949a5965f0328bb94d7ab1a318c9e226ff7 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Fri, 5 Feb 2016 14:22:58 +0100
Subject: [PATCH 088/134] Improve CI status badge implementation

---
 app/controllers/projects/commit_controller.rb |  5 ++---
 app/services/ci/image_for_build_service.rb    | 19 +++++++------------
 config/routes.rb                              |  4 ++--
 3 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/app/controllers/projects/commit_controller.rb b/app/controllers/projects/commit_controller.rb
index 637a911177c..36fef1740e2 100644
--- a/app/controllers/projects/commit_controller.rb
+++ b/app/controllers/projects/commit_controller.rb
@@ -57,9 +57,8 @@ class Projects::CommitController < Projects::ApplicationController
     render layout: false
   end
 
-  def status
-    status_sha = ci_commit.sha if ci_commit
-    image = Ci::ImageForBuildService.new.execute(@project, sha: status_sha)
+  def badge
+    image = Ci::ImageForBuildService.new.execute(@project, ref: params[:id])
     send_file(image.path, filename: image.name, disposition: 'inline', type: 'image/svg+xml')
   end
 
diff --git a/app/services/ci/image_for_build_service.rb b/app/services/ci/image_for_build_service.rb
index f469b13e902..005a5c4661c 100644
--- a/app/services/ci/image_for_build_service.rb
+++ b/app/services/ci/image_for_build_service.rb
@@ -1,28 +1,23 @@
 module Ci
   class ImageForBuildService
-    def execute(project, params)
-      sha = params[:sha]
-      sha ||=
-        if params[:ref]
-          project.commit(params[:ref]).try(:sha)
-        end
+    def execute(project, opts)
+      sha = opts[:sha] || ref_sha(project, opts[:ref])
 
       commit = project.ci_commits.ordered.find_by(sha: sha)
       image_name = image_for_commit(commit)
 
       image_path = Rails.root.join('public/ci', image_name)
-
-      OpenStruct.new(
-        path: image_path,
-        name: image_name
-      )
+      OpenStruct.new(path: image_path, name: image_name)
     end
 
     private
 
+    def ref_sha(project, ref)
+      project.commit(ref).try(:sha) if ref
+    end
+
     def image_for_commit(commit)
       return 'build-unknown.svg' unless commit
-
       'build-' + commit.status + ".svg"
     end
   end
diff --git a/config/routes.rb b/config/routes.rb
index 30e42e197f4..152a04061f2 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -496,9 +496,9 @@ Rails.application.routes.draw do
 
           get(
             '/status/*id/badge',
-            to: 'commit#status',
+            to: 'commit#badge',
             constraints: { format: /png/ },
-            as: :commit_status
+            as: :commit_badge
           )
         end
 

From 442a49db2bc5e3f6cea827879fa4f5c532a5f6f1 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Fri, 5 Feb 2016 14:42:01 +0100
Subject: [PATCH 089/134] Skip authentication when requesting commit status
 badge

---
 app/controllers/projects/commit_controller.rb | 8 +++++++-
 config/routes.rb                              | 2 +-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/controllers/projects/commit_controller.rb b/app/controllers/projects/commit_controller.rb
index 36fef1740e2..493cd332d9f 100644
--- a/app/controllers/projects/commit_controller.rb
+++ b/app/controllers/projects/commit_controller.rb
@@ -10,6 +10,11 @@ class Projects::CommitController < Projects::ApplicationController
   before_action :commit
   before_action :define_show_vars, only: [:show, :builds]
 
+  # Skip authentication for status badge only
+  skip_before_action :authenticate_user!, :reject_blocked!, :project,
+    :repository, :require_non_empty_project, :authorize_download_code!,
+    :commit, only: [:badge]
+
   def show
     return git_not_found! unless @commit
 
@@ -58,7 +63,8 @@ class Projects::CommitController < Projects::ApplicationController
   end
 
   def badge
-    image = Ci::ImageForBuildService.new.execute(@project, ref: params[:id])
+    project = Project.find_with_namespace("#{params[:namespace_id]}/#{params[:project_id]}")
+    image = Ci::ImageForBuildService.new.execute(project, ref: params[:id])
     send_file(image.path, filename: image.name, disposition: 'inline', type: 'image/svg+xml')
   end
 
diff --git a/config/routes.rb b/config/routes.rb
index 152a04061f2..6b710bc45ea 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -498,7 +498,7 @@ Rails.application.routes.draw do
             '/status/*id/badge',
             to: 'commit#badge',
             constraints: { format: /png/ },
-            as: :commit_badge
+            as: :build_badge
           )
         end
 

From 52352dccc377a2f9f89c1e749f21b9ebd986f7c3 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Mon, 8 Feb 2016 08:51:10 +0100
Subject: [PATCH 090/134] Move badge implementation to builds controller

---
 app/controllers/projects/builds_controller.rb | 15 ++++++++++-----
 app/controllers/projects/commit_controller.rb | 11 -----------
 config/routes.rb                              | 11 +++--------
 3 files changed, 13 insertions(+), 24 deletions(-)

diff --git a/app/controllers/projects/builds_controller.rb b/app/controllers/projects/builds_controller.rb
index 9e89296e71d..8ca6e02dab8 100644
--- a/app/controllers/projects/builds_controller.rb
+++ b/app/controllers/projects/builds_controller.rb
@@ -1,10 +1,12 @@
 class Projects::BuildsController < Projects::ApplicationController
   before_action :build, except: [:index, :cancel_all]
-
   before_action :authorize_read_build!, except: [:cancel, :cancel_all, :retry]
   before_action :authorize_update_build!, except: [:index, :show, :status]
+  layout 'project'
 
-  layout "project"
+  # Skip authentication for status badge only
+  skip_before_action :authenticate_user!, :reject_blocked!, :project,
+    :repository, :authorize_manage_builds!, :build, only: [:badge]
 
   def index
     @scope = params[:scope]
@@ -24,7 +26,6 @@ class Projects::BuildsController < Projects::ApplicationController
 
   def cancel_all
     @project.builds.running_or_pending.each(&:cancel)
-
     redirect_to namespace_project_builds_path(project.namespace, project)
   end
 
@@ -47,7 +48,6 @@ class Projects::BuildsController < Projects::ApplicationController
     end
 
     build = Ci::Build.retry(@build)
-
     redirect_to build_path(build)
   end
 
@@ -57,10 +57,15 @@ class Projects::BuildsController < Projects::ApplicationController
 
   def cancel
     @build.cancel
-
     redirect_to build_path(@build)
   end
 
+  def badge
+    project = Project.find_with_namespace("#{params[:namespace_id]}/#{params[:project_id]}")
+    image = Ci::ImageForBuildService.new.execute(project, ref: params[:ref])
+    send_file(image.path, filename: image.name, disposition: 'inline', type: 'image/svg+xml')
+  end
+
   private
 
   def build
diff --git a/app/controllers/projects/commit_controller.rb b/app/controllers/projects/commit_controller.rb
index 493cd332d9f..21f4d9f44ec 100644
--- a/app/controllers/projects/commit_controller.rb
+++ b/app/controllers/projects/commit_controller.rb
@@ -10,11 +10,6 @@ class Projects::CommitController < Projects::ApplicationController
   before_action :commit
   before_action :define_show_vars, only: [:show, :builds]
 
-  # Skip authentication for status badge only
-  skip_before_action :authenticate_user!, :reject_blocked!, :project,
-    :repository, :require_non_empty_project, :authorize_download_code!,
-    :commit, only: [:badge]
-
   def show
     return git_not_found! unless @commit
 
@@ -62,12 +57,6 @@ class Projects::CommitController < Projects::ApplicationController
     render layout: false
   end
 
-  def badge
-    project = Project.find_with_namespace("#{params[:namespace_id]}/#{params[:project_id]}")
-    image = Ci::ImageForBuildService.new.execute(project, ref: params[:id])
-    send_file(image.path, filename: image.name, disposition: 'inline', type: 'image/svg+xml')
-  end
-
   private
 
   def commit
diff --git a/config/routes.rb b/config/routes.rb
index 6b710bc45ea..ea14ba38198 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -493,13 +493,6 @@ Rails.application.routes.draw do
             constraints: { id: /(?:[^.]|\.(?!atom$))+/, format: /atom/ },
             as: :commits
           )
-
-          get(
-            '/status/*id/badge',
-            to: 'commit#badge',
-            constraints: { format: /png/ },
-            as: :build_badge
-          )
         end
 
         resource  :avatar, only: [:show, :destroy]
@@ -615,9 +608,11 @@ Rails.application.routes.draw do
         resource :variables, only: [:show, :update]
         resources :triggers, only: [:index, :create, :destroy]
 
-        resources :builds, only: [:index, :show] do
+        resources :builds, only: [:index, :show], constraints: { id: /\d+/ } do
           collection do
             post :cancel_all
+            get :badge, path: 'status/*ref/badge',
+                constraints: { ref: Gitlab::Regex.git_reference_regex, format: /svg/ }
           end
 
           member do

From 479d412e09bb8ce9550aef83af42aa60766ea812 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Mon, 8 Feb 2016 08:57:09 +0100
Subject: [PATCH 091/134] Respond to proper format for build badge request

---
 app/controllers/projects/builds_controller.rb | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/controllers/projects/builds_controller.rb b/app/controllers/projects/builds_controller.rb
index 8ca6e02dab8..9d419b07e53 100644
--- a/app/controllers/projects/builds_controller.rb
+++ b/app/controllers/projects/builds_controller.rb
@@ -62,8 +62,14 @@ class Projects::BuildsController < Projects::ApplicationController
 
   def badge
     project = Project.find_with_namespace("#{params[:namespace_id]}/#{params[:project_id]}")
-    image = Ci::ImageForBuildService.new.execute(project, ref: params[:ref])
-    send_file(image.path, filename: image.name, disposition: 'inline', type: 'image/svg+xml')
+
+    respond_to do |format|
+      format.html { render_404 }
+      format.svg do
+        image = Ci::ImageForBuildService.new.execute(project, ref: params[:ref])
+        send_file(image.path, filename: image.name, disposition: 'inline', type: 'image/svg+xml')
+      end
+    end
   end
 
   private

From eb7721e183337784de9fcaf219a64d443b6b3f0c Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Mon, 8 Feb 2016 10:34:19 +0100
Subject: [PATCH 092/134] Add second build for each commit in build seeds

---
 db/fixtures/development/14_builds.rb | 39 ++++++++++++++++++----------
 1 file changed, 25 insertions(+), 14 deletions(-)

diff --git a/db/fixtures/development/14_builds.rb b/db/fixtures/development/14_builds.rb
index 03a12323845..e3ca2b4eea3 100644
--- a/db/fixtures/development/14_builds.rb
+++ b/db/fixtures/development/14_builds.rb
@@ -1,24 +1,13 @@
 class Gitlab::Seeder::Builds
-  BUILD_STATUSES = %w(running pending success failed canceled)
-
   def initialize(project)
     @project = project
   end
 
   def seed!
     ci_commits.each do |ci_commit|
-      build = Ci::Build.new(build_attributes_for(ci_commit))
-
-      artifacts_cache_file(artifacts_archive_path) do |file|
-        build.artifacts_file = file
-      end
-
-      artifacts_cache_file(artifacts_metadata_path) do |file|
-        build.artifacts_metadata = file
-      end
-
       begin
-        build.save!
+        build_create!(ci_commit, name: 'test build 1')
+        build_create!(ci_commit, status: 'success', name: 'test build 2')
         print '.'
       rescue ActiveRecord::RecordInvalid
         print 'F'
@@ -36,6 +25,28 @@ class Gitlab::Seeder::Builds
     []
   end
 
+  def build_create!(ci_commit, opts = {})
+    attributes = build_attributes_for(ci_commit).merge(opts)
+    build = Ci::Build.new(attributes)
+
+    if %w(success failed).include?(build.status)
+      artifacts_cache_file(artifacts_archive_path) do |file|
+        build.artifacts_file = file
+      end
+
+      artifacts_cache_file(artifacts_metadata_path) do |file|
+        build.artifacts_metadata = file
+      end
+    end
+
+    build.save!
+
+    if %w(running success failed).include?(build.status)
+      # We need to set build trace after saving a build (id required)
+      build.trace = FFaker::Lorem.paragraphs(6).join("\n\n")
+    end
+  end
+
   def build_attributes_for(ci_commit)
     { name: 'test build', commands: "$ build command",
       stage: 'test', stage_idx: 1, ref: 'master',
@@ -49,7 +60,7 @@ class Gitlab::Seeder::Builds
   end
 
   def build_status
-    BUILD_STATUSES.sample
+    Ci::Build::AVAILABLE_STATUSES.sample
   end
 
   def artifacts_archive_path

From cf0eab504772c05b067ca60f78bc76779342c912 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Mon, 8 Feb 2016 12:23:56 +0100
Subject: [PATCH 093/134] Add feature tests for builds status badge

---
 features/project/builds/badge.feature  | 17 +++++++++++++++++
 features/steps/project/builds/badge.rb | 25 +++++++++++++++++++++++++
 features/steps/shared/builds.rb        | 12 ++++++++++--
 3 files changed, 52 insertions(+), 2 deletions(-)
 create mode 100644 features/project/builds/badge.feature
 create mode 100644 features/steps/project/builds/badge.rb

diff --git a/features/project/builds/badge.feature b/features/project/builds/badge.feature
new file mode 100644
index 00000000000..4a198488f3d
--- /dev/null
+++ b/features/project/builds/badge.feature
@@ -0,0 +1,17 @@
+Feature: Project Builds Badge
+  Background:
+    Given project exists in some group namespace
+    And project has CI enabled
+    And project has a recent build
+
+  Scenario: I want to see a badge for successfully built project
+    Given recent build is successfull
+    When I display builds badge for a master branch
+    Then I should see a build success badge
+    And build badge is a svg image
+
+  Scenario: I want to see a badge for project with filed builds
+    Given recent build failed
+    When I display builds badge for a master branch
+    Then I should see a build failed badge
+    And build badge is a svg image
diff --git a/features/steps/project/builds/badge.rb b/features/steps/project/builds/badge.rb
new file mode 100644
index 00000000000..3cf1e2cab5e
--- /dev/null
+++ b/features/steps/project/builds/badge.rb
@@ -0,0 +1,25 @@
+class Spinach::Features::ProjectBuildsBadge < Spinach::FeatureSteps
+  include SharedProject
+  include SharedBuilds
+  include RepoHelpers
+
+  step 'I display builds badge for a master branch' do
+    visit badge_namespace_project_builds_path(@project.namespace, @project, ref: :master, format: :svg)
+  end
+
+  step 'I should see a build success badge' do
+    expect(svg.at('text:contains("success")')).to be_truthy
+  end
+
+  step 'I should see a build failed badge' do
+    expect(svg.at('text:contains("failed")')).to be_truthy
+  end
+
+  step 'build badge is a svg image' do
+    expect(page.response_headers).to include('Content-Type' => 'image/svg+xml')
+  end
+
+  def svg
+    Nokogiri::HTML.parse(page.body)
+  end
+end
diff --git a/features/steps/shared/builds.rb b/features/steps/shared/builds.rb
index 726e2e814ad..055ebe1c815 100644
--- a/features/steps/shared/builds.rb
+++ b/features/steps/shared/builds.rb
@@ -6,8 +6,16 @@ module SharedBuilds
   end
 
   step 'project has a recent build' do
-    ci_commit = create :ci_commit, project: @project, sha: sample_commit.id
-    @build = create :ci_build, commit: ci_commit
+    @ci_commit = create(:ci_commit, project: @project, sha: @project.commit.sha)
+    @build = create(:ci_build, commit: @ci_commit)
+  end
+
+  step 'recent build is successfull' do
+    @build.update_column(:status, 'success')
+  end
+
+  step 'recent build failed' do
+    @build.update_column(:status, 'failed')
   end
 
   step 'I visit recent build details page' do

From 29f2600ab6b04d95c7ef4fbfea7c4c9ecf638e97 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Mon, 8 Feb 2016 12:42:35 +0100
Subject: [PATCH 094/134] Improve build badge tests, add another test case

---
 features/project/builds/badge.feature  |  8 ++++++--
 features/steps/project/builds/badge.rb | 13 +++++++++----
 features/steps/shared/builds.rb        |  4 ++++
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/features/project/builds/badge.feature b/features/project/builds/badge.feature
index 4a198488f3d..64263b2f538 100644
--- a/features/project/builds/badge.feature
+++ b/features/project/builds/badge.feature
@@ -8,10 +8,14 @@ Feature: Project Builds Badge
     Given recent build is successfull
     When I display builds badge for a master branch
     Then I should see a build success badge
-    And build badge is a svg image
 
   Scenario: I want to see a badge for project with filed builds
     Given recent build failed
     When I display builds badge for a master branch
     Then I should see a build failed badge
-    And build badge is a svg image
+
+  Scenario: I want to see a badge for project with running builds
+    Given recent build is successfull
+    And project has an another build that is running
+    When I display builds badge for a master branch
+    Then I should see a build running badge
diff --git a/features/steps/project/builds/badge.rb b/features/steps/project/builds/badge.rb
index 3cf1e2cab5e..0ceb4ddcd25 100644
--- a/features/steps/project/builds/badge.rb
+++ b/features/steps/project/builds/badge.rb
@@ -8,18 +8,23 @@ class Spinach::Features::ProjectBuildsBadge < Spinach::FeatureSteps
   end
 
   step 'I should see a build success badge' do
-    expect(svg.at('text:contains("success")')).to be_truthy
+    expect_badge('success')
   end
 
   step 'I should see a build failed badge' do
-    expect(svg.at('text:contains("failed")')).to be_truthy
+    expect_badge('failed')
   end
 
-  step 'build badge is a svg image' do
-    expect(page.response_headers).to include('Content-Type' => 'image/svg+xml')
+  step 'I should see a build running badge' do
+    expect_badge('running')
   end
 
   def svg
     Nokogiri::HTML.parse(page.body)
   end
+
+  def expect_badge(status)
+    expect(page.response_headers).to include('Content-Type' => 'image/svg+xml')
+    expect(svg.at(%Q{text:contains("#{status}")})).to be_truthy
+  end
 end
diff --git a/features/steps/shared/builds.rb b/features/steps/shared/builds.rb
index 055ebe1c815..7e1d9bb4056 100644
--- a/features/steps/shared/builds.rb
+++ b/features/steps/shared/builds.rb
@@ -18,6 +18,10 @@ module SharedBuilds
     @build.update_column(:status, 'failed')
   end
 
+  step 'project has an another build that is running' do
+    create(:ci_build, commit: @ci_commit, name: 'second build', status: 'running')
+  end
+
   step 'I visit recent build details page' do
     visit namespace_project_build_path(@project.namespace, @project, @build)
   end

From 418e761ad132351b9d4ab2d7ae3e0742169ddc60 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Mon, 8 Feb 2016 13:17:29 +0100
Subject: [PATCH 095/134] Add short builds badge documentation

---
 doc/ci/quick_start/README.md | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/doc/ci/quick_start/README.md b/doc/ci/quick_start/README.md
index a9b36139de9..85f46469f81 100644
--- a/doc/ci/quick_start/README.md
+++ b/doc/ci/quick_start/README.md
@@ -184,6 +184,16 @@ you expected.
 You are also able to view the status of any commit in the various pages in
 GitLab, such as **Commits** and **Merge Requests**.
 
+## Builds badge
+
+You can access a builds badge image using following link:
+
+```
+http://example.gitlab.com/namespace/project/builds/status/branch/badge.svg
+```
+
+Build badge is available for everyone, even if your project is private or internal.
+
 ## Next steps
 
 Awesome! You started using CI in GitLab!

From 7e1453f2f01d40f53d927ff43aae1baae3b4b272 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Mon, 8 Feb 2016 13:18:37 +0100
Subject: [PATCH 096/134] Fix rubocop offence in routes for build badge

---
 config/routes.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/routes.rb b/config/routes.rb
index ea14ba38198..081ff428406 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -612,7 +612,7 @@ Rails.application.routes.draw do
           collection do
             post :cancel_all
             get :badge, path: 'status/*ref/badge',
-                constraints: { ref: Gitlab::Regex.git_reference_regex, format: /svg/ }
+                        constraints: { ref: Gitlab::Regex.git_reference_regex, format: /svg/ }
           end
 
           member do

From d51e8e1b77d78dd80a9fb9d362219b8b47b83904 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Mon, 8 Feb 2016 13:53:30 +0100
Subject: [PATCH 097/134] Inherit build badge access permissions from project

---
 app/controllers/projects/builds_controller.rb | 14 ++++----------
 doc/ci/quick_start/README.md                  |  2 --
 features/project/builds/badge.feature         |  3 ++-
 features/steps/project/builds/badge.rb        |  1 +
 4 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/app/controllers/projects/builds_controller.rb b/app/controllers/projects/builds_controller.rb
index 9d419b07e53..0aef477811f 100644
--- a/app/controllers/projects/builds_controller.rb
+++ b/app/controllers/projects/builds_controller.rb
@@ -4,10 +4,6 @@ class Projects::BuildsController < Projects::ApplicationController
   before_action :authorize_update_build!, except: [:index, :show, :status]
   layout 'project'
 
-  # Skip authentication for status badge only
-  skip_before_action :authenticate_user!, :reject_blocked!, :project,
-    :repository, :authorize_manage_builds!, :build, only: [:badge]
-
   def index
     @scope = params[:scope]
     @all_builds = project.builds
@@ -51,18 +47,16 @@ class Projects::BuildsController < Projects::ApplicationController
     redirect_to build_path(build)
   end
 
-  def status
-    render json: @build.to_json(only: [:status, :id, :sha, :coverage], methods: :sha)
-  end
-
   def cancel
     @build.cancel
     redirect_to build_path(@build)
   end
 
-  def badge
-    project = Project.find_with_namespace("#{params[:namespace_id]}/#{params[:project_id]}")
+  def status
+    render json: @build.to_json(only: [:status, :id, :sha, :coverage], methods: :sha)
+  end
 
+  def badge
     respond_to do |format|
       format.html { render_404 }
       format.svg do
diff --git a/doc/ci/quick_start/README.md b/doc/ci/quick_start/README.md
index 85f46469f81..6598843049e 100644
--- a/doc/ci/quick_start/README.md
+++ b/doc/ci/quick_start/README.md
@@ -192,8 +192,6 @@ You can access a builds badge image using following link:
 http://example.gitlab.com/namespace/project/builds/status/branch/badge.svg
 ```
 
-Build badge is available for everyone, even if your project is private or internal.
-
 ## Next steps
 
 Awesome! You started using CI in GitLab!
diff --git a/features/project/builds/badge.feature b/features/project/builds/badge.feature
index 64263b2f538..9eb34475e68 100644
--- a/features/project/builds/badge.feature
+++ b/features/project/builds/badge.feature
@@ -1,6 +1,7 @@
 Feature: Project Builds Badge
   Background:
-    Given project exists in some group namespace
+    Given I sign in as a user
+    And I own a project
     And project has CI enabled
     And project has a recent build
 
diff --git a/features/steps/project/builds/badge.rb b/features/steps/project/builds/badge.rb
index 0ceb4ddcd25..65f5e0f766f 100644
--- a/features/steps/project/builds/badge.rb
+++ b/features/steps/project/builds/badge.rb
@@ -1,4 +1,5 @@
 class Spinach::Features::ProjectBuildsBadge < Spinach::FeatureSteps
+  include SharedAuthentication
   include SharedProject
   include SharedBuilds
   include RepoHelpers

From ee1bee5834929f893ec560ddbd3947ef7caaadae Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Mon, 8 Feb 2016 14:00:59 +0100
Subject: [PATCH 098/134] Add Changelog entry for changes in builds badge

---
 CHANGELOG | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG b/CHANGELOG
index ceb5c17cae9..e2a501fb826 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -48,6 +48,7 @@ v 8.5.0 (unreleased)
   - Title for milestones should be unique (Zeger-Jan van de Weg)
   - Validate correctness of maximum attachment size application setting
   - Replaces "Create merge request" link with one to the "Merge Request" when one exists
+  - Fix CI builds badge, add a new link to builds badge, deprecate the old one
 
 v 8.4.4
   - Update omniauth-saml gem to 1.4.2

From 28b11963b1613f420aecbee6718d753a6f9733a9 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Tue, 9 Feb 2016 13:10:16 +0100
Subject: [PATCH 099/134] Move builds badge implementation to new badges
 controller

---
 app/controllers/projects/badges_controller.rb | 11 +++++++++++
 app/controllers/projects/builds_controller.rb | 10 ----------
 config/routes.rb                              |  8 ++++++--
 doc/ci/quick_start/README.md                  |  2 +-
 features/steps/project/builds/badge.rb        |  2 +-
 5 files changed, 19 insertions(+), 14 deletions(-)
 create mode 100644 app/controllers/projects/badges_controller.rb

diff --git a/app/controllers/projects/badges_controller.rb b/app/controllers/projects/badges_controller.rb
new file mode 100644
index 00000000000..a4dd94b941c
--- /dev/null
+++ b/app/controllers/projects/badges_controller.rb
@@ -0,0 +1,11 @@
+class Projects::BadgesController < Projects::ApplicationController
+  def build
+    respond_to do |format|
+      format.html { render_404 }
+      format.svg do
+        image = Ci::ImageForBuildService.new.execute(project, ref: params[:ref])
+        send_file(image.path, filename: image.name, disposition: 'inline', type: 'image/svg+xml')
+      end
+    end
+  end
+end
diff --git a/app/controllers/projects/builds_controller.rb b/app/controllers/projects/builds_controller.rb
index 0aef477811f..ec379c53b8f 100644
--- a/app/controllers/projects/builds_controller.rb
+++ b/app/controllers/projects/builds_controller.rb
@@ -56,16 +56,6 @@ class Projects::BuildsController < Projects::ApplicationController
     render json: @build.to_json(only: [:status, :id, :sha, :coverage], methods: :sha)
   end
 
-  def badge
-    respond_to do |format|
-      format.html { render_404 }
-      format.svg do
-        image = Ci::ImageForBuildService.new.execute(project, ref: params[:ref])
-        send_file(image.path, filename: image.name, disposition: 'inline', type: 'image/svg+xml')
-      end
-    end
-  end
-
   private
 
   def build
diff --git a/config/routes.rb b/config/routes.rb
index 081ff428406..507bcbc53d7 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -611,8 +611,6 @@ Rails.application.routes.draw do
         resources :builds, only: [:index, :show], constraints: { id: /\d+/ } do
           collection do
             post :cancel_all
-            get :badge, path: 'status/*ref/badge',
-                        constraints: { ref: Gitlab::Regex.git_reference_regex, format: /svg/ }
           end
 
           member do
@@ -699,6 +697,12 @@ Rails.application.routes.draw do
         end
 
         resources :runner_projects, only: [:create, :destroy]
+        resources :badges, only: [], path: 'badges/*ref',
+                           constraints: { ref: Gitlab::Regex.git_reference_regex } do
+          collection do
+            get :build, constraints: { format: /svg/ }
+          end
+        end
       end
     end
   end
diff --git a/doc/ci/quick_start/README.md b/doc/ci/quick_start/README.md
index 6598843049e..ae7b760fa67 100644
--- a/doc/ci/quick_start/README.md
+++ b/doc/ci/quick_start/README.md
@@ -189,7 +189,7 @@ GitLab, such as **Commits** and **Merge Requests**.
 You can access a builds badge image using following link:
 
 ```
-http://example.gitlab.com/namespace/project/builds/status/branch/badge.svg
+http://example.gitlab.com/namespace/project/badges/branch/build.svg
 ```
 
 ## Next steps
diff --git a/features/steps/project/builds/badge.rb b/features/steps/project/builds/badge.rb
index 65f5e0f766f..52ef3b4484e 100644
--- a/features/steps/project/builds/badge.rb
+++ b/features/steps/project/builds/badge.rb
@@ -5,7 +5,7 @@ class Spinach::Features::ProjectBuildsBadge < Spinach::FeatureSteps
   include RepoHelpers
 
   step 'I display builds badge for a master branch' do
-    visit badge_namespace_project_builds_path(@project.namespace, @project, ref: :master, format: :svg)
+    visit build_namespace_project_badges_path(@project.namespace, @project, ref: :master, format: :svg)
   end
 
   step 'I should see a build success badge' do

From debaa813294f81d127e92bc75a3ae0751af7a316 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Wed, 10 Feb 2016 12:20:01 +0100
Subject: [PATCH 100/134] Move build badge specs to badges directory

---
 .../project/{builds/badge.feature => badges/build.feature} | 2 +-
 .../steps/project/{builds/badge.rb => badges/build.rb}     | 7 ++-----
 2 files changed, 3 insertions(+), 6 deletions(-)
 rename features/project/{builds/badge.feature => badges/build.feature} (96%)
 rename features/steps/project/{builds/badge.rb => badges/build.rb} (85%)

diff --git a/features/project/builds/badge.feature b/features/project/badges/build.feature
similarity index 96%
rename from features/project/builds/badge.feature
rename to features/project/badges/build.feature
index 9eb34475e68..bdd934651e6 100644
--- a/features/project/builds/badge.feature
+++ b/features/project/badges/build.feature
@@ -1,4 +1,4 @@
-Feature: Project Builds Badge
+Feature: Project Badges Build
   Background:
     Given I sign in as a user
     And I own a project
diff --git a/features/steps/project/builds/badge.rb b/features/steps/project/badges/build.rb
similarity index 85%
rename from features/steps/project/builds/badge.rb
rename to features/steps/project/badges/build.rb
index 52ef3b4484e..10b27d61fdd 100644
--- a/features/steps/project/builds/badge.rb
+++ b/features/steps/project/badges/build.rb
@@ -1,4 +1,4 @@
-class Spinach::Features::ProjectBuildsBadge < Spinach::FeatureSteps
+class Spinach::Features::ProjectBadgesBuild < Spinach::FeatureSteps
   include SharedAuthentication
   include SharedProject
   include SharedBuilds
@@ -20,11 +20,8 @@ class Spinach::Features::ProjectBuildsBadge < Spinach::FeatureSteps
     expect_badge('running')
   end
 
-  def svg
-    Nokogiri::HTML.parse(page.body)
-  end
-
   def expect_badge(status)
+    svg = Nokogiri::HTML.parse(page.body)
     expect(page.response_headers).to include('Content-Type' => 'image/svg+xml')
     expect(svg.at(%Q{text:contains("#{status}")})).to be_truthy
   end

From 9e6190485b2213c9dfdd3d5b22853fc6e2263c2a Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Thu, 11 Feb 2016 10:27:53 +0100
Subject: [PATCH 101/134] Parse XML instead of HTML in tests for a SVG build
 badge

---
 features/project/badges/build.feature  | 8 ++++----
 features/steps/project/badges/build.rb | 2 +-
 features/steps/shared/builds.rb        | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/features/project/badges/build.feature b/features/project/badges/build.feature
index bdd934651e6..9417f62d680 100644
--- a/features/project/badges/build.feature
+++ b/features/project/badges/build.feature
@@ -6,17 +6,17 @@ Feature: Project Badges Build
     And project has a recent build
 
   Scenario: I want to see a badge for successfully built project
-    Given recent build is successfull
+    Given recent build is successful
     When I display builds badge for a master branch
     Then I should see a build success badge
 
-  Scenario: I want to see a badge for project with filed builds
+  Scenario: I want to see a badge for project with failed builds
     Given recent build failed
     When I display builds badge for a master branch
     Then I should see a build failed badge
 
   Scenario: I want to see a badge for project with running builds
-    Given recent build is successfull
-    And project has an another build that is running
+    Given recent build is successful
+    And project has another build that is running
     When I display builds badge for a master branch
     Then I should see a build running badge
diff --git a/features/steps/project/badges/build.rb b/features/steps/project/badges/build.rb
index 10b27d61fdd..cbfc35bed65 100644
--- a/features/steps/project/badges/build.rb
+++ b/features/steps/project/badges/build.rb
@@ -21,7 +21,7 @@ class Spinach::Features::ProjectBadgesBuild < Spinach::FeatureSteps
   end
 
   def expect_badge(status)
-    svg = Nokogiri::HTML.parse(page.body)
+    svg = Nokogiri::XML.parse(page.body)
     expect(page.response_headers).to include('Content-Type' => 'image/svg+xml')
     expect(svg.at(%Q{text:contains("#{status}")})).to be_truthy
   end
diff --git a/features/steps/shared/builds.rb b/features/steps/shared/builds.rb
index 7e1d9bb4056..fa54c93df0f 100644
--- a/features/steps/shared/builds.rb
+++ b/features/steps/shared/builds.rb
@@ -10,7 +10,7 @@ module SharedBuilds
     @build = create(:ci_build, commit: @ci_commit)
   end
 
-  step 'recent build is successfull' do
+  step 'recent build is successful' do
     @build.update_column(:status, 'success')
   end
 
@@ -18,7 +18,7 @@ module SharedBuilds
     @build.update_column(:status, 'failed')
   end
 
-  step 'project has an another build that is running' do
+  step 'project has another build that is running' do
     create(:ci_build, commit: @ci_commit, name: 'second build', status: 'running')
   end
 

From 0008dc2f2b014a4090dbdb5be2d53a9f3de61010 Mon Sep 17 00:00:00 2001
From: Denis Meiswinkel <denis.meiswinkel@gmail.com>
Date: Thu, 11 Feb 2016 15:10:35 +0000
Subject: [PATCH 102/134] Fixed "Docker Fundamentals" link.

---
 doc/ci/docker/using_docker_images.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/ci/docker/using_docker_images.md b/doc/ci/docker/using_docker_images.md
index 63fe840b369..16a2ab8a83c 100644
--- a/doc/ci/docker/using_docker_images.md
+++ b/doc/ci/docker/using_docker_images.md
@@ -270,7 +270,7 @@ This will forcefully (`-f`) remove the `build` container, the two service
 containers as well as all volumes (`-v`) that were created with the container
 creation.
 
-[Docker Fundamentals]: https://docs.docker.com/engine/introduction/understanding-docker/
+[Docker Fundamentals]: https://docs.docker.com/
 [hub]: https://hub.docker.com/
 [linking-containers]: https://docs.docker.com/engine/userguide/networking/default_network/dockerlinks/
 [tutum/wordpress]: https://registry.hub.docker.com/u/tutum/wordpress/

From 7e904ab37bede9c20d4cd89637cc32b1a42c2b6a Mon Sep 17 00:00:00 2001
From: Denis Meiswinkel <denis.meiswinkel@gmail.com>
Date: Thu, 11 Feb 2016 16:03:31 +0000
Subject: [PATCH 103/134] Updated Docker Fundamentals link as suggested by
 @axil

---
 doc/ci/docker/using_docker_images.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/ci/docker/using_docker_images.md b/doc/ci/docker/using_docker_images.md
index 16a2ab8a83c..bd748f1b986 100644
--- a/doc/ci/docker/using_docker_images.md
+++ b/doc/ci/docker/using_docker_images.md
@@ -270,7 +270,7 @@ This will forcefully (`-f`) remove the `build` container, the two service
 containers as well as all volumes (`-v`) that were created with the container
 creation.
 
-[Docker Fundamentals]: https://docs.docker.com/
+[Docker Fundamentals]: https://docs.docker.com/engine/understanding-docker/
 [hub]: https://hub.docker.com/
 [linking-containers]: https://docs.docker.com/engine/userguide/networking/default_network/dockerlinks/
 [tutum/wordpress]: https://registry.hub.docker.com/u/tutum/wordpress/

From 20e47eadaeae36f8bb34c8d8480e21ddcd3d5478 Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Thu, 11 Feb 2016 11:17:45 -0500
Subject: [PATCH 104/134] Correct indentation for `issues/merge_requests`
 partial render

Prior, it would only be shown if the issue had been edited.
---
 app/views/projects/issues/show.html.haml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/views/projects/issues/show.html.haml b/app/views/projects/issues/show.html.haml
index 121c775560f..fe977fd700c 100644
--- a/app/views/projects/issues/show.html.haml
+++ b/app/views/projects/issues/show.html.haml
@@ -46,8 +46,8 @@
           Edited
           = time_ago_with_tooltip(@issue.updated_at, placement: 'bottom', html_class: 'issue_edited_ago')
 
-        .merge-requests
-          = render 'merge_requests'
+      .merge-requests
+        = render 'merge_requests'
 
     .content-block
       = render 'votes/votes_block', votable: @issue
@@ -57,4 +57,4 @@
         .issuable-discussion
           = render 'projects/issues/discussion'
 
-= render 'shared/issuable/sidebar', issuable: @issue
\ No newline at end of file
+= render 'shared/issuable/sidebar', issuable: @issue

From b123171d3da752c084ef7bfa82dbed962b3e5168 Mon Sep 17 00:00:00 2001
From: Kirill Zaitsev <kirik910@gmail.com>
Date: Sat, 6 Feb 2016 17:20:21 +0300
Subject: [PATCH 105/134] Add new data to project in push, issue, merge-request
 and note webhooks data

- Add `avatar_url`, `description`, `git_ssh_url`, `git_http_url`,
  `path_with_namespace` and `default_branch` in `project` in push, issue,
  merge-request and note webhooks data
- Deprecate the `ssh_url` in favor of `git_ssh_url` and `http_url` in
  favor of `git_http_url` in `project` for push, issue, merge-request and
  note webhooks data
- Deprecate the `repository` key in push, issue, merge-request and
  note webhooks data, use `project` instead
---
 CHANGELOG                                     |   5 +
 app/models/concerns/issuable.rb               |  11 +-
 app/models/project.rb                         |  15 +-
 doc/web_hooks/web_hooks.md                    | 240 ++++++++++++++----
 lib/gitlab/note_data_builder.rb               |  11 +-
 lib/gitlab/push_data_builder.rb               |  16 +-
 spec/lib/gitlab/note_data_builder_spec.rb     |  30 ++-
 spec/lib/gitlab/push_data_builder_spec.rb     |   6 +-
 spec/models/concerns/issuable_spec.rb         |  23 +-
 spec/models/merge_request_spec.rb             |  21 +-
 .../project_hook_data_shared_example.rb       |  27 ++
 11 files changed, 308 insertions(+), 97 deletions(-)
 create mode 100644 spec/support/project_hook_data_shared_example.rb

diff --git a/CHANGELOG b/CHANGELOG
index e2a501fb826..881c950ebc3 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -29,6 +29,11 @@ v 8.5.0 (unreleased)
   - Update the ExternalIssue regex pattern (Blake Hitchcock)
   - Remember user's inline/side-by-side diff view preference in a cookie (Kirill Katsnelson)
   - Optimized performance of finding issues to be closed by a merge request
+  - Add `avatar_url`, `description`, `git_ssh_url`, `git_http_url`, `path_with_namespace`
+    and `default_branch` in `project` in push, issue, merge-request and note webhooks data (Kirill Zaitsev)
+  - Deprecate the `ssh_url` in favor of `git_ssh_url` and `http_url` in favor of `git_http_url`
+    in `project` for push, issue, merge-request and note webhooks data (Kirill Zaitsev)
+  - Deprecate the `repository` key in push, issue, merge-request and note webhooks data, use `project` instead (Kirill Zaitsev)
   - API: Expose MergeRequest#merge_status (Andrei Dziahel)
   - Revert "Add IP check against DNSBLs at account sign-up"
   - Actually use the `skip_merges` option in Repository#commits (Tony Chu)
diff --git a/app/models/concerns/issuable.rb b/app/models/concerns/issuable.rb
index cf6aa592e2a..5136d0196a5 100644
--- a/app/models/concerns/issuable.rb
+++ b/app/models/concerns/issuable.rb
@@ -129,13 +129,10 @@ module Issuable
     hook_data = {
       object_kind: self.class.name.underscore,
       user: user.hook_attrs,
-      repository: {
-          name: project.name,
-          url: project.url_to_repo,
-          description: project.description,
-          homepage: project.web_url
-      },
-      object_attributes: hook_attrs
+      project: project.hook_attrs,
+      object_attributes: hook_attrs,
+      # DEPRECATED
+      repository: project.hook_attrs.slice(:name, :url, :description, :homepage)
     }
     hook_data.merge!(assignee: assignee.hook_attrs) if assignee
 
diff --git a/app/models/project.rb b/app/models/project.rb
index f11c6d7c6be..649e331b7a9 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -738,11 +738,20 @@ class Project < ActiveRecord::Base
   def hook_attrs
     {
       name: name,
-      ssh_url: ssh_url_to_repo,
-      http_url: http_url_to_repo,
+      description: description,
       web_url: web_url,
+      avatar_url: avatar_url,
+      git_ssh_url: ssh_url_to_repo,
+      git_http_url: http_url_to_repo,
       namespace: namespace.name,
-      visibility_level: visibility_level
+      visibility_level: visibility_level,
+      path_with_namespace: path_with_namespace,
+      default_branch: default_branch,
+      # Backward compatibility
+      homepage: web_url,
+      url: url_to_repo,
+      ssh_url: ssh_url_to_repo,
+      http_url: http_url_to_repo
     }
   end
 
diff --git a/doc/web_hooks/web_hooks.md b/doc/web_hooks/web_hooks.md
index c556597225c..b82306bd1da 100644
--- a/doc/web_hooks/web_hooks.md
+++ b/doc/web_hooks/web_hooks.md
@@ -1,5 +1,12 @@
 # Web hooks
 
+_**Note:**
+Starting from GitLab 8.5:_
+
+- _the `repository` key is deprecated in favor of the `project` key_
+- _the `project.ssh_url` key is deprecated in favor of the `project.git_ssh_url` key_
+- _the `project.http_url` key is deprecated in favor of the `project.git_http_url` key_
+
 Project web hooks allow you to trigger an URL if new code is pushed or a new issue is created.
 
 You can configure web hooks to listen for specific events like pushes, issues or merge requests. GitLab will send a POST request with data to the web hook URL.
@@ -37,8 +44,25 @@ X-Gitlab-Event: Push Hook
   "user_id": 4,
   "user_name": "John Smith",
   "user_email": "john@example.com",
+  "user_avatar": "https://s.gravatar.com/avatar/d4c74594d841139328695756648b6bd6?s=8://s.gravatar.com/avatar/d4c74594d841139328695756648b6bd6?s=80",
   "project_id": 15,
-  "repository": {
+  "project":{
+    "name":"Diaspora",
+    "description":"",
+    "web_url":"http://example.com/mike/diaspora",
+    "avatar_url":null,
+    "git_ssh_url":"git@example.com:mike/diaspora.git",
+    "git_http_url":"http://example.com/mike/diaspora.git",
+    "namespace":"Mike",
+    "visibility_level":0,
+    "path_with_namespace":"mike/diaspora",
+    "default_branch":"master",
+    "homepage":"http://example.com/mike/diaspora",
+    "url":"git@example.com:mike/diasporadiaspora.git",
+    "ssh_url":"git@example.com:mike/diaspora.git",
+    "http_url":"http://example.com/mike/diaspora.git"
+  },
+  "repository":{
     "name": "Diaspora",
     "url": "git@example.com:mike/diasporadiaspora.git",
     "description": "",
@@ -100,8 +124,25 @@ X-Gitlab-Event: Tag Push Hook
   "after": "82b3d5ae55f7080f1e6022629cdb57bfae7cccc7",
   "user_id": 1,
   "user_name": "John Smith",
+  "user_avatar": "https://s.gravatar.com/avatar/d4c74594d841139328695756648b6bd6?s=8://s.gravatar.com/avatar/d4c74594d841139328695756648b6bd6?s=80",
   "project_id": 1,
-  "repository": {
+  "project":{
+    "name":"Example",
+    "description":"",
+    "web_url":"http://example.com/jsmith/example",
+    "avatar_url":null,
+    "git_ssh_url":"git@example.com:jsmith/example.git",
+    "git_http_url":"http://example.com/jsmith/example.git",
+    "namespace":"Jsmith",
+    "visibility_level":0,
+    "path_with_namespace":"jsmith/example",
+    "default_branch":"master",
+    "homepage":"http://example.com/jsmith/example",
+    "url":"git@example.com:jsmith/example.git",
+    "ssh_url":"git@example.com:jsmith/example.git",
+    "http_url":"http://example.com/jsmith/example.git"
+  },
+  "repository":{
     "name": "jsmith",
     "url": "ssh://git@example.com/jsmith/example.git",
     "description": "",
@@ -135,7 +176,23 @@ X-Gitlab-Event: Issue Hook
     "username": "root",
     "avatar_url": "http://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=40\u0026d=identicon"
   },
-  "repository": {
+  "project":{
+    "name":"Gitlab Test",
+    "description":"Aut reprehenderit ut est.",
+    "web_url":"http://example.com/gitlabhq/gitlab-test",
+    "avatar_url":null,
+    "git_ssh_url":"git@example.com:gitlabhq/gitlab-test.git",
+    "git_http_url":"http://example.com/gitlabhq/gitlab-test.git",
+    "namespace":"GitlabHQ",
+    "visibility_level":20,
+    "path_with_namespace":"gitlabhq/gitlab-test",
+    "default_branch":"master",
+    "homepage":"http://example.com/gitlabhq/gitlab-test",
+    "url":"http://example.com/gitlabhq/gitlab-test.git",
+    "ssh_url":"git@example.com:gitlabhq/gitlab-test.git",
+    "http_url":"http://example.com/gitlabhq/gitlab-test.git"
+  },
+  "repository":{
     "name": "Gitlab Test",
     "url": "http://example.com/gitlabhq/gitlab-test.git",
     "description": "Aut reprehenderit ut est.",
@@ -197,9 +254,25 @@ X-Gitlab-Event: Note Hook
     "avatar_url": "http://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=40\u0026d=identicon"
   },
   "project_id": 5,
-  "repository": {
+  "project":{
+    "name":"Gitlab Test",
+    "description":"Aut reprehenderit ut est.",
+    "web_url":"http://example.com/gitlabhq/gitlab-test",
+    "avatar_url":null,
+    "git_ssh_url":"git@example.com:gitlabhq/gitlab-test.git",
+    "git_http_url":"http://example.com/gitlabhq/gitlab-test.git",
+    "namespace":"GitlabHQ",
+    "visibility_level":20,
+    "path_with_namespace":"gitlabhq/gitlab-test",
+    "default_branch":"master",
+    "homepage":"http://example.com/gitlabhq/gitlab-test",
+    "url":"http://example.com/gitlabhq/gitlab-test.git",
+    "ssh_url":"git@example.com:gitlabhq/gitlab-test.git",
+    "http_url":"http://example.com/gitlabhq/gitlab-test.git"
+  },
+  "repository":{
     "name": "Gitlab Test",
-    "url": "http://localhost/gitlab-org/gitlab-test.git",
+    "url": "http://example.com/gitlab-org/gitlab-test.git",
     "description": "Aut reprehenderit ut est.",
     "homepage": "http://example.com/gitlab-org/gitlab-test"
   },
@@ -260,9 +333,25 @@ X-Gitlab-Event: Note Hook
     "avatar_url": "http://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=40\u0026d=identicon"
   },
   "project_id": 5,
-  "repository": {
+  "project":{
+    "name":"Gitlab Test",
+    "description":"Aut reprehenderit ut est.",
+    "web_url":"http://example.com/gitlab-org/gitlab-test",
+    "avatar_url":null,
+    "git_ssh_url":"git@example.com:gitlab-org/gitlab-test.git",
+    "git_http_url":"http://example.com/gitlab-org/gitlab-test.git",
+    "namespace":"Gitlab Org",
+    "visibility_level":10,
+    "path_with_namespace":"gitlab-org/gitlab-test",
+    "default_branch":"master",
+    "homepage":"http://example.com/gitlab-org/gitlab-test",
+    "url":"http://example.com/gitlab-org/gitlab-test.git",
+    "ssh_url":"git@example.com:gitlab-org/gitlab-test.git",
+    "http_url":"http://example.com/gitlab-org/gitlab-test.git"
+  },
+  "repository":{
     "name": "Gitlab Test",
-    "url": "http://example.com/gitlab-org/gitlab-test.git",
+    "url": "http://localhost/gitlab-org/gitlab-test.git",
     "description": "Aut reprehenderit ut est.",
     "homepage": "http://example.com/gitlab-org/gitlab-test"
   },
@@ -300,21 +389,37 @@ X-Gitlab-Event: Note Hook
     "description": "Et voluptas corrupti assumenda temporibus. Architecto cum animi eveniet amet asperiores. Vitae numquam voluptate est natus sit et ad id.",
     "position": 0,
     "locked_at": null,
-    "source": {
-      "name": "Gitlab Test",
-      "ssh_url": "git@example.com:gitlab-org/gitlab-test.git",
-      "http_url": "http://example.com/gitlab-org/gitlab-test.git",
-      "web_url": "http://example.com/gitlab-org/gitlab-test",
-      "namespace": "Gitlab Org",
-      "visibility_level": 10
+    "source":{
+      "name":"Gitlab Test",
+      "description":"Aut reprehenderit ut est.",
+      "web_url":"http://example.com/gitlab-org/gitlab-test",
+      "avatar_url":null,
+      "git_ssh_url":"git@example.com:gitlab-org/gitlab-test.git",
+      "git_http_url":"http://example.com/gitlab-org/gitlab-test.git",
+      "namespace":"Gitlab Org",
+      "visibility_level":10,
+      "path_with_namespace":"gitlab-org/gitlab-test",
+      "default_branch":"master",
+      "homepage":"http://example.com/gitlab-org/gitlab-test",
+      "url":"http://example.com/gitlab-org/gitlab-test.git",
+      "ssh_url":"git@example.com:gitlab-org/gitlab-test.git",
+      "http_url":"http://example.com/gitlab-org/gitlab-test.git"
     },
     "target": {
-      "name": "Gitlab Test",
-      "ssh_url": "git@example.com:gitlab-org/gitlab-test.git",
-      "http_url": "http://example.com/gitlab-org/gitlab-test.git",
-      "web_url": "http://example.com/gitlab-org/gitlab-test",
-      "namespace": "Gitlab Org",
-      "visibility_level": 10
+      "name":"Gitlab Test",
+      "description":"Aut reprehenderit ut est.",
+      "web_url":"http://example.com/gitlab-org/gitlab-test",
+      "avatar_url":null,
+      "git_ssh_url":"git@example.com:gitlab-org/gitlab-test.git",
+      "git_http_url":"http://example.com/gitlab-org/gitlab-test.git",
+      "namespace":"Gitlab Org",
+      "visibility_level":10,
+      "path_with_namespace":"gitlab-org/gitlab-test",
+      "default_branch":"master",
+      "homepage":"http://example.com/gitlab-org/gitlab-test",
+      "url":"http://example.com/gitlab-org/gitlab-test.git",
+      "ssh_url":"git@example.com:gitlab-org/gitlab-test.git",
+      "http_url":"http://example.com/gitlab-org/gitlab-test.git"
     },
     "last_commit": {
       "id": "562e173be03b8ff2efb05345d12df18815438a4b",
@@ -355,11 +460,27 @@ X-Gitlab-Event: Note Hook
     "avatar_url": "http://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=40\u0026d=identicon"
   },
   "project_id": 5,
-  "repository": {
-    "name": "Gitlab Test",
-    "url": "http://example.com/gitlab-org/gitlab-test.git",
-    "description": "Aut reprehenderit ut est.",
-    "homepage": "http://example.com/gitlab-org/gitlab-test"
+  "project":{
+    "name":"Gitlab Test",
+    "description":"Aut reprehenderit ut est.",
+    "web_url":"http://example.com/gitlab-org/gitlab-test",
+    "avatar_url":null,
+    "git_ssh_url":"git@example.com:gitlab-org/gitlab-test.git",
+    "git_http_url":"http://example.com/gitlab-org/gitlab-test.git",
+    "namespace":"Gitlab Org",
+    "visibility_level":10,
+    "path_with_namespace":"gitlab-org/gitlab-test",
+    "default_branch":"master",
+    "homepage":"http://example.com/gitlab-org/gitlab-test",
+    "url":"http://example.com/gitlab-org/gitlab-test.git",
+    "ssh_url":"git@example.com:gitlab-org/gitlab-test.git",
+    "http_url":"http://example.com/gitlab-org/gitlab-test.git"
+  },
+  "repository":{
+    "name":"diaspora",
+    "url":"git@example.com:mike/diasporadiaspora.git",
+    "description":"",
+    "homepage":"http://example.com/mike/diaspora"
   },
   "object_attributes": {
     "id": 1241,
@@ -397,7 +518,6 @@ X-Gitlab-Event: Note Hook
 
 ### Comment on code snippet
 
-
 **Request header**:
 
 ```
@@ -415,11 +535,27 @@ X-Gitlab-Event: Note Hook
     "avatar_url": "http://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=40\u0026d=identicon"
   },
   "project_id": 5,
-  "repository": {
-    "name": "Gitlab Test",
-    "url": "http://example.com/gitlab-org/gitlab-test.git",
-    "description": "Aut reprehenderit ut est.",
-    "homepage": "http://example.com/gitlab-org/gitlab-test"
+  "project":{
+    "name":"Gitlab Test",
+    "description":"Aut reprehenderit ut est.",
+    "web_url":"http://example.com/gitlab-org/gitlab-test",
+    "avatar_url":null,
+    "git_ssh_url":"git@example.com:gitlab-org/gitlab-test.git",
+    "git_http_url":"http://example.com/gitlab-org/gitlab-test.git",
+    "namespace":"Gitlab Org",
+    "visibility_level":10,
+    "path_with_namespace":"gitlab-org/gitlab-test",
+    "default_branch":"master",
+    "homepage":"http://example.com/gitlab-org/gitlab-test",
+    "url":"http://example.com/gitlab-org/gitlab-test.git",
+    "ssh_url":"git@example.com:gitlab-org/gitlab-test.git",
+    "http_url":"http://example.com/gitlab-org/gitlab-test.git"
+  },
+  "repository":{
+    "name":"Gitlab Test",
+    "url":"http://example.com/gitlab-org/gitlab-test.git",
+    "description":"Aut reprehenderit ut est.",
+    "homepage":"http://example.com/gitlab-org/gitlab-test"
   },
   "object_attributes": {
     "id": 1245,
@@ -491,21 +627,37 @@ X-Gitlab-Event: Merge Request Hook
     "target_project_id": 14,
     "iid": 1,
     "description": "",
-    "source": {
-      "name": "awesome_project",
-      "ssh_url": "ssh://git@example.com/awesome_space/awesome_project.git",
-      "http_url": "http://example.com/awesome_space/awesome_project.git",
-      "web_url": "http://example.com/awesome_space/awesome_project",
-      "visibility_level": 20,
-      "namespace": "awesome_space"
+    "source":{
+      "name":"Awesome Project",
+      "description":"Aut reprehenderit ut est.",
+      "web_url":"http://example.com/awesome_space/awesome_project",
+      "avatar_url":null,
+      "git_ssh_url":"git@example.com:awesome_space/awesome_project.git",
+      "git_http_url":"http://example.com/awesome_space/awesome_project.git",
+      "namespace":"Awesome Space",
+      "visibility_level":20,
+      "path_with_namespace":"awesome_space/awesome_project",
+      "default_branch":"master",
+      "homepage":"http://example.com/awesome_space/awesome_project",
+      "url":"http://example.com/awesome_space/awesome_project.git",
+      "ssh_url":"git@example.com:awesome_space/awesome_project.git",
+      "http_url":"http://example.com/awesome_space/awesome_project.git"
     },
     "target": {
-      "name": "awesome_project",
-      "ssh_url": "ssh://git@example.com/awesome_space/awesome_project.git",
-      "http_url": "http://example.com/awesome_space/awesome_project.git",
-      "web_url": "http://example.com/awesome_space/awesome_project",
-      "visibility_level": 20,
-      "namespace": "awesome_space"
+      "name":"Awesome Project",
+      "description":"Aut reprehenderit ut est.",
+      "web_url":"http://example.com/awesome_space/awesome_project",
+      "avatar_url":null,
+      "git_ssh_url":"git@example.com:awesome_space/awesome_project.git",
+      "git_http_url":"http://example.com/awesome_space/awesome_project.git",
+      "namespace":"Awesome Space",
+      "visibility_level":20,
+      "path_with_namespace":"awesome_space/awesome_project",
+      "default_branch":"master",
+      "homepage":"http://example.com/awesome_space/awesome_project",
+      "url":"http://example.com/awesome_space/awesome_project.git",
+      "ssh_url":"git@example.com:awesome_space/awesome_project.git",
+      "http_url":"http://example.com/awesome_space/awesome_project.git"
     },
     "last_commit": {
       "id": "da1560886d4f094c3e6c9ef40349f7d38b5d27d7",
diff --git a/lib/gitlab/note_data_builder.rb b/lib/gitlab/note_data_builder.rb
index ea6b0ee796d..71cf6a0d886 100644
--- a/lib/gitlab/note_data_builder.rb
+++ b/lib/gitlab/note_data_builder.rb
@@ -53,13 +53,10 @@ module Gitlab
           object_kind: "note",
           user: user.hook_attrs,
           project_id: project.id,
-          repository: {
-            name: project.name,
-            url: project.url_to_repo,
-            description: project.description,
-            homepage: project.web_url,
-          },
-          object_attributes: note.hook_attrs
+          project: project.hook_attrs,
+          object_attributes: note.hook_attrs,
+          # DEPRECATED
+          repository: project.hook_attrs.slice(:name, :url, :description, :homepage)
         }
 
         base_data[:object_attributes][:url] =
diff --git a/lib/gitlab/push_data_builder.rb b/lib/gitlab/push_data_builder.rb
index 4f9cdef3869..1dad621aa00 100644
--- a/lib/gitlab/push_data_builder.rb
+++ b/lib/gitlab/push_data_builder.rb
@@ -47,18 +47,14 @@ module Gitlab
           user_id: user.id,
           user_name: user.name,
           user_email: user.email,
+          user_avatar: user.avatar_url,
           project_id: project.id,
-          repository: {
-            name: project.name,
-            url: project.url_to_repo,
-            description: project.description,
-            homepage: project.web_url,
-            git_http_url: project.http_url_to_repo,
-            git_ssh_url: project.ssh_url_to_repo,
-            visibility_level: project.visibility_level
-          },
+          project: project.hook_attrs,
           commits: commit_attrs,
-          total_commits_count: commits_count
+          total_commits_count: commits_count,
+          # DEPRECATED
+          repository: project.hook_attrs.slice(:name, :url, :description, :homepage,
+                                               :git_http_url, :git_ssh_url, :visibility_level)
         }
 
         data
diff --git a/spec/lib/gitlab/note_data_builder_spec.rb b/spec/lib/gitlab/note_data_builder_spec.rb
index 691f36e6cb7..da652677443 100644
--- a/spec/lib/gitlab/note_data_builder_spec.rb
+++ b/spec/lib/gitlab/note_data_builder_spec.rb
@@ -16,62 +16,80 @@ describe 'Gitlab::NoteDataBuilder', lib: true do
   end
 
   describe 'When asking for a note on commit' do
-    let(:note) { create(:note_on_commit) }
+    let(:note) { create(:note_on_commit, project: project) }
 
     it 'returns the note and commit-specific data' do
       expect(data).to have_key(:commit)
     end
+
+    include_examples 'project hook data'
+    include_examples 'deprecated repository hook data'
   end
 
   describe 'When asking for a note on commit diff' do
-    let(:note) { create(:note_on_commit_diff) }
+    let(:note) { create(:note_on_commit_diff, project: project) }
 
     it 'returns the note and commit-specific data' do
       expect(data).to have_key(:commit)
     end
+
+    include_examples 'project hook data'
+    include_examples 'deprecated repository hook data'
   end
 
   describe 'When asking for a note on issue' do
     let(:issue) { create(:issue, created_at: fixed_time, updated_at: fixed_time) }
-    let(:note) { create(:note_on_issue, noteable_id: issue.id) }
+    let(:note) { create(:note_on_issue, noteable_id: issue.id, project: project) }
 
     it 'returns the note and issue-specific data' do
       expect(data).to have_key(:issue)
       expect(data[:issue].except('updated_at')).to eq(issue.hook_attrs.except('updated_at'))
       expect(data[:issue]['updated_at']).to be > issue.hook_attrs['updated_at']
     end
+
+    include_examples 'project hook data'
+    include_examples 'deprecated repository hook data'
   end
 
   describe 'When asking for a note on merge request' do
     let(:merge_request) { create(:merge_request, created_at: fixed_time, updated_at: fixed_time) }
-    let(:note) { create(:note_on_merge_request, noteable_id: merge_request.id) }
+    let(:note) { create(:note_on_merge_request, noteable_id: merge_request.id, project: project) }
 
     it 'returns the note and merge request data' do
       expect(data).to have_key(:merge_request)
       expect(data[:merge_request].except('updated_at')).to eq(merge_request.hook_attrs.except('updated_at'))
       expect(data[:merge_request]['updated_at']).to be > merge_request.hook_attrs['updated_at']
     end
+
+    include_examples 'project hook data'
+    include_examples 'deprecated repository hook data'
   end
 
   describe 'When asking for a note on merge request diff' do
     let(:merge_request) { create(:merge_request, created_at: fixed_time, updated_at: fixed_time) }
-    let(:note) { create(:note_on_merge_request_diff, noteable_id: merge_request.id) }
+    let(:note) { create(:note_on_merge_request_diff, noteable_id: merge_request.id, project: project) }
 
     it 'returns the note and merge request diff data' do
       expect(data).to have_key(:merge_request)
       expect(data[:merge_request].except('updated_at')).to eq(merge_request.hook_attrs.except('updated_at'))
       expect(data[:merge_request]['updated_at']).to be > merge_request.hook_attrs['updated_at']
     end
+
+    include_examples 'project hook data'
+    include_examples 'deprecated repository hook data'
   end
 
   describe 'When asking for a note on project snippet' do
     let!(:snippet) { create(:project_snippet, created_at: fixed_time, updated_at: fixed_time) }
-    let!(:note) { create(:note_on_project_snippet, noteable_id: snippet.id) }
+    let!(:note) { create(:note_on_project_snippet, noteable_id: snippet.id, project: project) }
 
     it 'returns the note and project snippet data' do
       expect(data).to have_key(:snippet)
       expect(data[:snippet].except('updated_at')).to eq(snippet.hook_attrs.except('updated_at'))
       expect(data[:snippet]['updated_at']).to be > snippet.hook_attrs['updated_at']
     end
+
+    include_examples 'project hook data'
+    include_examples 'deprecated repository hook data'
   end
 end
diff --git a/spec/lib/gitlab/push_data_builder_spec.rb b/spec/lib/gitlab/push_data_builder_spec.rb
index 3ef61685398..257e4a38435 100644
--- a/spec/lib/gitlab/push_data_builder_spec.rb
+++ b/spec/lib/gitlab/push_data_builder_spec.rb
@@ -13,13 +13,13 @@ describe 'Gitlab::PushDataBuilder', lib: true do
     it { expect(data[:after]).to eq('5937ac0a7beb003549fc5fd26fc247adbce4a52e') }
     it { expect(data[:ref]).to eq('refs/heads/master') }
     it { expect(data[:commits].size).to eq(3) }
-    it { expect(data[:repository][:git_http_url]).to eq(project.http_url_to_repo) }
-    it { expect(data[:repository][:git_ssh_url]).to eq(project.ssh_url_to_repo) }
-    it { expect(data[:repository][:visibility_level]).to eq(project.visibility_level) }
     it { expect(data[:total_commits_count]).to eq(3) }
     it { expect(data[:commits].first[:added]).to eq(["gitlab-grack"]) }
     it { expect(data[:commits].first[:modified]).to eq([".gitmodules"]) }
     it { expect(data[:commits].first[:removed]).to eq([]) }
+
+    include_examples 'project hook data'
+    include_examples 'deprecated repository hook data'
   end
 
   describe :build do
diff --git a/spec/models/concerns/issuable_spec.rb b/spec/models/concerns/issuable_spec.rb
index 8f09ff03a78..600089802b2 100644
--- a/spec/models/concerns/issuable_spec.rb
+++ b/spec/models/concerns/issuable_spec.rb
@@ -69,27 +69,28 @@ describe Issue, "Issuable" do
   end
 
   describe "#to_hook_data" do
-    let(:hook_data) { issue.to_hook_data(user) }
+    let(:data) { issue.to_hook_data(user) }
+    let(:project) { issue.project }
+
 
     it "returns correct hook data" do
-      expect(hook_data[:object_kind]).to eq("issue")
-      expect(hook_data[:user]).to eq(user.hook_attrs)
-      expect(hook_data[:repository][:name]).to eq(issue.project.name)
-      expect(hook_data[:repository][:url]).to eq(issue.project.url_to_repo)
-      expect(hook_data[:repository][:description]).to eq(issue.project.description)
-      expect(hook_data[:repository][:homepage]).to eq(issue.project.web_url)
-      expect(hook_data[:object_attributes]).to eq(issue.hook_attrs)
-      expect(hook_data).to_not have_key(:assignee)
+      expect(data[:object_kind]).to eq("issue")
+      expect(data[:user]).to eq(user.hook_attrs)
+      expect(data[:object_attributes]).to eq(issue.hook_attrs)
+      expect(data).to_not have_key(:assignee)
     end
 
     context "issue is assigned" do
       before { issue.update_attribute(:assignee, user) }
 
       it "returns correct hook data" do
-        expect(hook_data[:object_attributes]['assignee_id']).to eq(user.id)
-        expect(hook_data[:assignee]).to eq(user.hook_attrs)
+        expect(data[:object_attributes]['assignee_id']).to eq(user.id)
+        expect(data[:assignee]).to eq(user.hook_attrs)
       end
     end
+
+    include_examples 'project hook data'
+    include_examples 'deprecated repository hook data'
   end
 
   describe '#card_attributes' do
diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb
index c61ddf01118..f35b48601ad 100644
--- a/spec/models/merge_request_spec.rb
+++ b/spec/models/merge_request_spec.rb
@@ -254,13 +254,22 @@ describe MergeRequest, models: true do
   end
 
   describe "#hook_attrs" do
+    let(:attrs_hash) { subject.hook_attrs.to_h }
+
+    [:source, :target].each do |key|
+      describe "#{key} key" do
+        include_examples 'project hook data', project_key: key do
+          let(:data)    { attrs_hash }
+          let(:project) { subject.send("#{key}_project") }
+        end
+      end
+    end
+
     it "has all the required keys" do
-      attrs = subject.hook_attrs
-      attrs = attrs.to_h
-      expect(attrs).to include(:source)
-      expect(attrs).to include(:target)
-      expect(attrs).to include(:last_commit)
-      expect(attrs).to include(:work_in_progress)
+      expect(attrs_hash).to include(:source)
+      expect(attrs_hash).to include(:target)
+      expect(attrs_hash).to include(:last_commit)
+      expect(attrs_hash).to include(:work_in_progress)
     end
   end
 
diff --git a/spec/support/project_hook_data_shared_example.rb b/spec/support/project_hook_data_shared_example.rb
new file mode 100644
index 00000000000..422083875d7
--- /dev/null
+++ b/spec/support/project_hook_data_shared_example.rb
@@ -0,0 +1,27 @@
+RSpec.shared_examples 'project hook data' do |project_key: :project|
+  it 'contains project data' do
+    expect(data[project_key][:name]).to eq(project.name)
+    expect(data[project_key][:description]).to eq(project.description)
+    expect(data[project_key][:web_url]).to eq(project.web_url)
+    expect(data[project_key][:avatar_url]).to eq(project.avatar_url)
+    expect(data[project_key][:git_http_url]).to eq(project.http_url_to_repo)
+    expect(data[project_key][:git_ssh_url]).to eq(project.ssh_url_to_repo)
+    expect(data[project_key][:namespace]).to eq(project.namespace.name)
+    expect(data[project_key][:visibility_level]).to eq(project.visibility_level)
+    expect(data[project_key][:path_with_namespace]).to eq(project.path_with_namespace)
+    expect(data[project_key][:default_branch]).to eq(project.default_branch)
+    expect(data[project_key][:homepage]).to eq(project.web_url)
+    expect(data[project_key][:url]).to eq(project.url_to_repo)
+    expect(data[project_key][:ssh_url]).to eq(project.ssh_url_to_repo)
+    expect(data[project_key][:http_url]).to eq(project.http_url_to_repo)
+  end
+end
+
+RSpec.shared_examples 'deprecated repository hook data' do |project_key: :project|
+  it 'contains deprecated repository data' do
+    expect(data[:repository][:name]).to eq(project.name)
+    expect(data[:repository][:description]).to eq(project.description)
+    expect(data[:repository][:url]).to eq(project.url_to_repo)
+    expect(data[:repository][:homepage]).to eq(project.web_url)
+  end
+end

From db868e4bfe362872e8440faf6c5d6b28f5609c8f Mon Sep 17 00:00:00 2001
From: Achilleas Pipinellis <axilleas@axilleas.me>
Date: Thu, 11 Feb 2016 20:37:20 +0200
Subject: [PATCH 106/134] Add a new image in the markdown help page

Previously we were linking directly from the public/
directory. While this worked for the GitLab help page,
it was not working for doc.gitlab.com. Adding an image
in a relative directory and linking from there serves
both ends.

[ci skip]
---
 doc/markdown/img/logo.png | Bin 0 -> 11097 bytes
 doc/markdown/markdown.md  |   8 ++++----
 2 files changed, 4 insertions(+), 4 deletions(-)
 create mode 100644 doc/markdown/img/logo.png

diff --git a/doc/markdown/img/logo.png b/doc/markdown/img/logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..7da5f23ed9bfa713c51b275987e464f15570fe40
GIT binary patch
literal 11097
zcmZ{KWl$YFwC%y&4({&m?sjl@cXx`rJ3VM|w?ZjiptyS}4#l<j!72Lq-psxKZZb(`
zl0R9Kz1LoACh_X3@@U9J$N&HUO#vjM`LWLZHxS`JX7QXtDF6VO-9cJfT|ru!!rjx&
z*1_2Z004~^Wcg}qFXP4j>h=vNndX=y3`l3=2)kvYAcfT+u!Sd>01Tq4ILB2>$Y5bX
z$$l;lgDNWl)x}v-GE|#mfH2i9ITEU?t>u;!gZ%w34-OtiySLWtF1;RB1B+VO05odk
zZ0vAZ&=fiJ+Xw*y^Lo+pvyHC+c)u{HN&tt!aZQipMZW|MJ3oFv=NQsU;wCB-=%vTz
z@3C4{<h$BjopuiZFlIJ%=&UNFH1v;3bpoe6;hdYQa)c&<P%b`)T~U3=(=x?qzoIA@
zZ&hRJ%$m$-Xg6PLb=;ZrA<i!_<}<bBko*uFp|NUZoLizkx5Aex+$$pwXRg>BbU*@4
z8;U@kA68!6mmv&vZ>%d%fO~m6yTBm|o_iDQu5?Fvx$RAd#}#xZn^LN)qsw%0peI+l
z0CaeXczWj8e)BOK<9Lm-DIXxw?u~`e!{xY?$|%>+$dD+PFegN#`n~g!pZ4OMsvG%n
zojY#nA@=<Hi{=Tyd@8}Q`4q!wDg+?Z22J7nj*)jr380Y;cIv$v_P5{lkH<&UbV*9)
z=H^arC&>c07x$iq3ca8OUx`v*`SfPTUQEQ>Ag9B6du-@4DlkfkiHc^9@6MvViwwOB
zK)&DT6OF|mKm<iJWUB2a+Pefae)>Dthvf~FdHKKB#J_W#sTt-wff??K0K5~3pp9ba
z{UfokQcNhIzxw*!*7IQ`2Hb8Qex*>Oz(Wz->vO$({3CcK`I+PhNT6(o^p7ynY1av9
zHVi-mg*yg=TMXqLPRRkI+lMCr&EEk17;cV<z66aIhcF(7!6nJIf{HAGwE}k^p{NdX
zB1vrzMK6IMfW{U!xh>R=bP<MN4x1EtWDeg2b%P0OLCGZ(zE7zGLg5OVqJX!?=#Ugs
zr@%p%mG;2I07`Yt;#DIuMKhHcR%1Qk3Bj3!)l0$5irVAkMubFf4k9W?)HHC_p%D+F
zt{~mVMDFmqljOr6_5FjWwnNuPruLsh;2wp75Xi!d2AdHj;t<g^q*1ZpcOxDtu|O;X
z@_ZE0AVJO8777y(yC({vWF^>_0W~3_v<y|FjX_NtF(Fz}+C>7lj7dXY<Gh+|fpvkw
z5&jNIMUJ@yZI;iT{g%m_L<rj?j7^@u_|I(itncjJUw#7An3&)F`W7ObJ6~X@gp@fC
z0hPF3WZYqdgHx7``u=rLOX#PuHkNQJ&}SiMoM(b(6h0)+c=AIvyHoBL?T928*|E%{
zygM_y@E+Lh{#`hxC~lDtgUwf~kH8?&9+XfR@suKZ5Vkj>Pn5Y7v;}ub#H>`ij33BP
zmIk;Ozcd7(%5IO>mlRR$k|Lq)p&tKytH4$cO8eZB?j7Y_=$(3-piJkKPCAZd4dqYY
z0S*Gce0kB0pt7LZq3zFFVbGxc&Bn=aB?V-!p*^PQ(B+bEGQKX~M;muw?8<1%NW{@{
zjMUCtV63sIF>pv|sc9+lZt`yQPQTSTRv@fPYD>yPHKH>+Y?zYG;Y61DUEHp&pTU|D
zFhM&ZfGfRN5}<)yExX`W{klMCK)7ntRMKS7q|;<)EpLygl6NSpRGK-fIvZnuna#lN
zVK`vWWTh~f)=%r@nc$h?Nzx(Jq1z$sd3kVr?Rp)5{qsP0pPaE6=N1<lhYJ^-$yoD?
zZaLE$Qxgsft{TIpUPR_?CUoW!BdP9*R<4e&#=W|#&gS<Z4S&Pv%H8U;V$DiVT^q&B
zQpfKTI;>ivRZmH5O1`D^znTAv-V*ZC@~ZKc7=APCUF+&h35W|Q45)pgMvH)#rq(S}
zE;F){)6$vO<JN07xaq+&O)SCv-l|rs=cH;RFRUDx=M#Hho|2!Et(v0RJR@z=R3GV@
z>soN(BAP@d&8~47wy6@Vza=GZ+N<~;1LbV)(8nua&e4F=y%50Y=CCnmA)Qu|ZV_YA
zyi<)eJvPelt9tNnbYrDQ)RpU=>7E)L9-RW+9UX?Ujk4aC!yKQSH^)l15w2RUpDwC=
zzWiJEn+|WDIsIHSO_7rqhUzRqtZfF~MnNqtP5VY|`l<#FhO$OFMrhpCsG)M4dkMU2
zYpVfecMhk%d|7<ZdDwitD@1E_YkaG!Y|92S2By71Q>q&&4th@fmTEsz+r+KKcZ(1E
zysN$ZcB^;Be4O3$-RHa%-GvTs2Udr2F4qr5jx6_@HV?X(cTaW<|E^uq?cwd}9^bE+
zY>3WuuLh3{4p<e8`m426{Wx;{Wx;O4o~2i|JcV3~d#ZQqm);fG#oS%=`1ctS+!<uC
zh1(MtL|(sOIBvAMgYeSza{nlLy?mv1^DYL!-X>Sah49SsaPT+q#{qG07jSOrRs`E=
z9wp;k<2cHNwYhk>S~$Jgrg-akoUJpjzTVZ=$1+EG4GL2?V3lB@VKvuo=w6zLk~v@*
zU<$U#*{Lk$);i%X(R~xerX?Is5+Y1aK~Ho|c<Z~hTH>^`>azT5WvkCt7hHGbEbl`Y
zm|!)^c%VGAHk>u0I<h)^9-o)s8^@knblB<6+`*15g6#-A1ik`OY1n9@X<O;`(#q1+
zuB`pyy9#kKGwL$JwIdfI7Qj4tE!_^>L2e<^LK!`D-C7d3ugZ5wpQ4ST%LwlYbqL+K
zrMcB?73{8>o|^8OeXZ5@+mC{}(OXkm>xK1LeZ4OJ22|a(5*MR!5_j@DI!|p0^o(20
z|DKMTj?W7n;~r<84(z6NR?_S7e5-tE{6=P!heCt=2sil0`NyKOyvvd6<(5T{)q9Fs
z^x1%uES>CuEO~;#@Ny5=>(|}d=z>P!XC)RT^oxPB-E*R~^M+^p8gB>H;}x<k(Q}*I
zrh%sAz_NQ&Rx@4G=F|qYcDM3@s#34s!#9&>aqSVk%^J^o$8Wk{H#J0k!-CBr#e4l(
zL<hO0xeu}Ju@_4L3vJ5|%bDaOBr^gpEn+P_4^AV?$!N%EvS{R~kd!16G?BG=`^A-&
z@&)ZVRDP7asuWqWpZ}6i`3qQMSX;lfES2tUw?iJA-O74Ng?55VpK122Cw&dKbbe^8
zA^$14KfBLKc}xM%KxV?Vm{mXduKKhFyWPHm=N+qRXT}N{1(gKyLVb3OXF67IYL2Sd
zhfD}gQ%*wMJr;-mh(d|JW_Pihbex6!v;3}g*}?3ir)t*P5pY7ZXE^$4^7K3yFW5y~
z|7CW`ZFMVT@I>xN<uuO(W)firT?o~*{UG4<+U5J7<;%J*ZVntSZ(jjVzkRmni~a8M
zK=w<!^`g**W6CFs9qJnSgVap2<=5&5tJAoHu^f%%-#zq_YGg@`BZco7Z}YKNFID?h
z2iRY+lhbX}tE$$kT*ZuDonQP<ZvGud6jg-Qhm<_;{xl;AJ<c=W<$g<h_uN_D)w}+l
z(q($z8MqXBf0eh-f8!PHcCbYjJnFanEOz!f6m*Di7MqY7K>kzAKQy5Ib5{d|_#x`%
zc}lp;`9nd%TPn%R0N(%W#obluA3I3yAOo)tvAO);fRbX!^ZVFD@K#WfMc9JJM(5+@
zxA6ElqW~z#NNW47od+9u8|wsIJX{7lYG&H5X4!<>IQb|viR>a#hr2k_SrI?6HPFm;
zbf*QT-$F7VpzoR4rl&nTP6riUffbDo?UWC;ojF1qNGmb$xxWdlYG~BbuA&ec8m()-
z-WMU@j-;0p&D6bihb!5wJipJp-M`UGNdI4LPxUh~`H8k~kb`0M1}qz8Y1!x9qlcFh
z2(73|Gse-+-A2ywUbQJ!3L>l0UZcmnK{rRL=`gU0QqQj`@$P@C1VN@u9ToR?g9xn-
z(_|!<jy36;F9>~!Zk&b#Y8U^e!ABdnbptNUzt3rMt%avmQ0|u37j5isaz!~{UoZbC
zzyhWoo58WWM!ew4u(Xp<<yJ-DtO(VNSoO41R-N33iu?kZ&1jQ4dCmp-Liv6oG#BCR
z#;mxs$Ihdz)i6{RULINzxpwc8!anvfu*=^76g$QgiPju!oB<+zrXlHJinXIW;0pqQ
zM&`sKokAQl=LOqCx1i09b<|?3$}KFvY`VE=ngA&1DK(qBzH%Q2ts8#LG#_g_fm_IS
zTMSU8998wg%>brYXtL;Xw~Dg0;~)M|#`!20PA;NIX}q^pCRRrs*G&xj=(3~N4ZW(f
zgDI@J%~H8ne3w@~2o<wW*z3tsa#FZgis8ySB^H>PzcGhZa3@1_;c9?h%*KCzrFAw3
zp-YA?VOUPJ*5Jxq=Q@p-k=k$UR6ie+zRFxXd5PYcp5~=6%@cme&-P_op|<fg^hL<L
zJubk|qrS2h<5MUeh5x}DWy=bV`O(q_Wj~b|qO9gLd4rEEAi#h|1C#f0qW@b9?&WS*
zYvZb7?d2uBgq75b@K)k2=B%#ED+5%H9OzHm(shF(RkM#R0re(XNuQ5O?v(@@{lU{3
zHmkdB!vhY2W_#%?_FNHI<~@z0nX`;V$~N${)H15&lXlzNkGb~@BV!6mJy?%j<fOs^
zGqSU42UPLNrc!?iK$R$l*q{mLBa?eYf#~^pS>dgs1)~<OXHGdh(2tUh4Vzq-FyjS&
zaC|-%m(u5ZF*oYwlXu%qyqg{dknv5okqC8r#egWZ%(9}gd`*Y#Wn5t}`K|^}K#yO}
zWr#M{jR*UPxWA7--Ol`MQqAd!U=djCwr;(QmvLBgcnT)0RdY+&s-2!QA}}x_hU&i!
zqM|*^_HDzCkFWDnP~;M?QJFW|F5QiV8k*V?+GaGvcCc3(H3mEwHD6k?UUtdRoYMR&
z)ymr|=%LjFsW>CB2p?^^@9r%9TNCLHA5<HSgcWgJywh3Rgm4<g53$q*2}&{sNaa=Y
zt9ydUq17EXY)Rf|=Bzoz+gdcgX8Dq(eOjX5Yb^|7=o#{rnZUV0(GSYIm^V?;SyMJq
zEgffYnZ$@at2?(K20I(FCS`DtEmxknS|<eQu1Oe#VmY`QNh5tBYm06uKPdQPVFp$+
z6q>_zgP?)AWM7=eYwXPDf2$-awRUuBFR94c{ds6icdT-Yv%aB}V2Il;TeIGXSN8bj
z--fkJH)p6?-fSdPirUm#$HF{!JyYRc+<wF)JTS^auUYA52A*ziT|`^t=e^J;W%y%@
zWNRp`X~2HTLZ2o*{G2c{f9$g6y%9ZLTBz;x%w!+wwWLXf=IVrqH3qg-?-XlCu_^G9
z6<tPibFIH(0S_$0EX9N?r;euhE=ITh>r`A5l%;{f`y;AEgO@_LJ{*PUwsd%ko_~_U
z4p-J+^PJwagvUy)Nr!6vGd*3tT<vllx+>A1tK@X5Ek>}ATC-B$tYYxy$17z1s+iA8
zukScDSD7v{H82IVpCW{8GmJlPvKCVyTN!r*tSX9RMMZ6h0=@9i5D2exe5BW;aO_SN
zRpAG97%VPQf4stR-cd}y6-1RjvDT^mYn+`#)Ld#n42Vssp;pKyf1`MMl@L{YMfX=9
z*AJ0Yoom%E@5K~829-?Glfp;EKJ91WWMW&msU3x&^x=PJ7%(}73SE(A?$UX`R;y2q
zv&r!YvAd@4WIRg+%<%Lf|H8ALTXg;;DlfF2j%+0CtIfyn%XswEA=V!hoR8t0)8LD(
zl~Fr6QP<OIRx)f+`KmHsTKcMf4b>?KtQ8s-Fl-ubm1+9PV3tx%{6Qo2(|^dU6F#|q
zVWq*R6ECPez(!)dbS6F>w=Ad^-L@FnvyDm3xi8J(z|4N|I;d)i{}o{HfHtAXwj;TW
zr9g2W{XKXOlC{L=a=2vK^p&l1{VjiD=;KmxLubjhW*KvzE?LYT(vRuQgLO=>byY+h
zbRWMk$`BnV@MF#%$15xeDlQRM`;N4qc=;cOEMtz>Qw7nLygp`C;<;QbZU3ztu0Zvp
z<6dQXFJ+XuHpI{a;|aHn8$~L6%zTa|^Uo&Sv4S(Bz=m&9RKh^(OCJ`jjeX$#{wW`%
zpewxH8V5C!ke-)|=hV!PZ}-DnMsnq(ThwIdy55`$JZim>d}Lda$Dfx}p1Xqlv-Tuc
zisp=kC#a5s%4R@fDKHH*dp+|Ky_sh<(Ki5|o@OSYP6N&P^yT@Bq1H8aJ{>v_T-A4S
zaFgAf+-MnIcqV}$K3eQh6>68t#L8Hk$`Xxsdh^gOf^Jkc3Fn`j7)v=jenDRJ`BFp{
z)-8m=T*LR}RrKUt9{&-BO60)j_|naby9f0#v&{n)nizJ=CF>8uSk`7h&7sP-DKyhT
zX*lkR^Y)Yu6yyxjC@wTOV!&lP4dRZu3K|@}rb<JsAP+|<4Qwu-i_B>VO%9T~bO6B}
z5Etbu6AQagr>R+Q@FP~Y1So4!iRV8x*}#Mcwfvg;)#gQ~S;>E@D^3U_dBkwgEvYu>
zX7xj)2-27z&r_%<3Qe(FTVfU9_dy)-m9i;=_t3Cd=eK_X!4oE%2l=D~Nj1EV`C_+!
zwll}Jo9X#m(H#P;Q@t)LYRkjD05ks*K=AC-CX4&mZ~@==N=HiF_NZOAc}hcwy7pl=
z|5<|Sf8UOg;i4?|xMz?<mOZ0*KFvvDDTpfkA|Y**S*sW=%QJvzrtB4OB~f9Pqf@%8
z%u_#KI=08120!Skc!$As8CQ5sqK|o`W~^q!Hl|z-hZL>KYP4sFFTRXj4`S~?VLAri
zY2HB473uX>j9(KCu;a}V5uijotl;WK4B3Y1Lx@K8D-<0PtYdeX^6wT=WZh9we&3(_
z#9kitCg|m<mM{37NUjsX1B-3z<z~f+Rj9)%WZLT;xVQ&2bdK^|z(c%422kxCZfWXr
z_d8Yw*vA(=c)3dF0vJ+r^u*Kp<uasmJUI$W7KqS2l)zCB%m|{3$9F+%1Z!EEknTx<
z`|>otQi~V$>k@k;(YJy2$_dn_`ZTqFhc*`#!H8BHIPYu2-)->4vT(tgRln9TiXA5~
z{0YUw90UH~oBhFLr;ONSR*6*i2nc7_E!7N)a5UvF5G?<$CSpMZj%!9N>4+6pk17)*
z*h*063@ttO^o5o7PKqPyey0+UpEgb=jQrl5?#m5~Hw%;C`_zr3!4e)dr1L%1qb{vg
z++m_oV^C}bg}#RL2&~e;YQf#x*4|=HRY8=y3_W&1pk9oA{)h^De>=)FzzUel<?{u9
zqIE1hqBWs@&7xgv4nDYz3Tkn87!{P0L+~KSYg#U7^^zJ^6t;7V#2P|G`ti`03$=L5
zmw7<6#M9h`J@17mBXRM&+si>TbI*!B)z<?zxTeM{c3<?+K^A`)^I~TmC7;9PK$P@%
zSA53$pDyUWfgmx{^*BRVkCEnUwz^y>Hzn<6EVdoROSY=^fo~iV|6q;0G;&AU4pqvb
zu{Xa~7qCg050nwlotP(KI6Wy#5d|57QUbl%2wem;zhL_Z`16Z`5#jEPZN^>JqkKh}
zZJ69OwCsVu6;b=0rhz^EQk$t17t9c*)El$KXfL|CN2O^}01@&VL54Xs-nNRGVovqf
z<!e`<tj$C^;gEJpDrfdowHmpSl9ktt4A3@<+B6IoN4gh*R?>xH0H(P>W?&nI>Uqx+
z-^JS_hFBv}gscD36+^2^S6PL|!cij;@rNcXe9!fo@gtiFMG<H9HZ{ah$0Qudu`2Nk
zT?;FQ^RIGj8+n?|`IQM&FaE3{lnyi`z=Re#FL?#Z{wprajp;9H*8yRcj_Li$tcv=o
zpUre>z=m=zRJcauyG_p}<nT_3C_5Jo9E<HHj`l$<43kLy8d&0Q8qbb;_j4(%XDsRp
z#2WDrqO>kd9*%85M#FmaL1~>&j4>e#mKD*@hom_zrN{9@z4q01<~bE7tz>sNBXN3k
zqwEea|B9>ErAa5yf`-50Kw-8)*mP>N?D(fZG_>O>heikXgAA}EB3GHzj;K){K}+L8
z@wIcpO{yNmKnhd)4$*bl&5aJK)rFu$xZI9KVc_@n2(_7>#W)NoG6V35zc^guMCH%(
zZG6{*8P@myK)fv!oHMAI!c~p+R6`QTfCyahXR*(tZ)3!-;mlWJOb%tqzQ&)wx*2fO
zf^qiK8-!8I;cMFo<c-<AU=5RteeXZfbzSljQY=pjAzQ)TRmYyI^t)yH{-_7d+(Myg
zF)LbZr~RRyK6QZYpwJwM1^E1U2brU~5WuOszV{Fc=k%I*yJE&aw9Ozi^p{Z9l%NYi
zdHU))mdi}%##lEh`gHH*8(oQ^@CbW(Ezp`d7=$2zaWvIddPO#Gjp5nlVSWbm$^fsF
zAK=U)5tnUd52`-33P@<IU;Y)i`f+{n2N#LW{?b&HSR?vjorSJc=MBR$Iip&-*yw9Y
zrxPvH2-d=ij}-rOBt+{6X1tlhSLoSu<i($H#8|e=x?dTYG<w`Xc;CD|z{)V$)wmT6
zOUJnz39ybNp&b>k@ZdRz5E9$yT>N_GiRyy-^kNM?HU;>#=zjblmQy-tN*}ukSV|RA
zZ)k~Rr!z|GORl*T<3)rFB$f3M@{WZi>z4e~$4t<UrWmYL4KsOtI7UPNq{*GdbcPjX
z&aQ9XI)9mds-dr3g8XF1*ms$PEM`3>sHy&+4D`#N5UkaSd*>FY=9ZIP+?@zOXx|Qj
zJ|?~r7RAy8?Pt;k*~n2lJ<#-&`9oAZeHFaa+PQ5gh$6eT6_P4E2r;J#pJBO<;d-PP
z64c_inal{0h$_&NVBB38IbznB;(i~Vtm0Ph@R7i+FH%w&#uRVG;nXUcc@%)#c1`Gb
zI)YeJQQ#h`u(U91e}@Iv@A`&iBa`!>wi}edQnPWd7zU7PT==}tYG`9_Czq`wd*6_B
z9njHcC~!mIB4l3(5f@$k$=G%xt9M#A2}IwdI3U8QQ?129DO#}gHAR?=H=tZez9v`n
zpSI+RP@NL2)ln$<^#;IW(SGIceztA#6AiG8z>Ck?;S`?`p~P=Bcipj;f9@M-uFs4D
zzTVA1ezVIqxNQdmzWdvb&>FU*v4ORXaTsrUx=`>+$YFg6T(NtRU}{Bqf}U;EcFAD@
zAk|RvFkerX0sYv(#n8?jjf4pU{{m2>;z2^3PhsQ_bz7%Or;>Jx=od09eE{H&RFpm0
z8$Y~z-niDVt_mnXCWnLQiGWofm;>5jSQcbUp&}?1N*V0eE?n171@lb0t_53T@{99`
zdU?wjA7(1wQgvwvhz(6w%g*k+P)M<8mWnW6CUL-{IQd#a)6{zs)5J}5Nm2#KA}`{d
z2zy%XbVR@2MwVPj{OZHVS<vl+;r))}Rb9~I-ieT2JCANF;gR{Y?(s9}riy~)y3air
zZCkL+&7A)Zbz`@y=ah@+FX59fV|oF_Tjnzcc{`fQZClwj+t9hprgJr3Jfj^3;fXzY
z^!VKy6|`7dai*M`<*$vmU`0{IUu5F+z8J35v#9_YlaIRe0{BWwgI&U-JyqzmNrL*D
z6VcJ#d1b;K)62hmGFE{Tg6(1Otzt8rvAN9dWM#C;ce^T~fvitMulGW9T~gyHzqL{E
zK3|+sH^+w!TQJURJ&vfIw&eCgU~>Cg_~y{f2S$g3KwWy8{=%Wav<1(w(Bs`!{)ulK
z=6&G4Npq|p&=>U)-ojE9=+Uq$_iRtlQG#q_g`w&BrbK^9Up{5cvGbST^W8x`qV!b^
zbJ9WB&@Fja-qte{slDA_zUrUA0SP6Ord&W<dt=i^_T-9>P}%6yu;Fjox2Rp9jMw8&
zGj{hM=u=_8(exG6Y)h`k3VG5r^BGDO9)tesH%|WZn;fPg(u_j;4_U`&26ieaz#Tej
z+@vEbjCeS)Fl2fM&A6X@E%=W+*fBz02pFTZaxWv8V2SupJYOMw-9*z$wURzoOJdxA
zP2cgugFE~laDmkSYa3cj4v785?NmiAPK{n}d~rN&ZhQVFcOhscr_*H{S;%AD<LI*B
zk*JSc?Ngo0ae_BDba!NLR=z3nwwVc^gw8^W5=CG^g{z|c7tILW8cHJt8S|E%xIZA7
zVvGtPGcqlhQ3jf;F+en4o?DE5S%A)fYUZ2YvZ?>*ox6XWjz;|SLEDMFc*K1x$^>*m
zIC<jl6{3K8aSL?DX|d~-`7TY&UgY9_-a#K^x80UtH0T}ywx@Kfg<UxyA$&p6pNy{&
zD*Ywe@fhu71%Ps;m~B+%Tew1{myxN&T(K|xJ>d@ru&fA>Ca1b8JmwC9SD%gg_K9wf
z1aQJam<f#(rd>N3iiu2VXlDKePo7MJqr`D9hB0pdb~m7K()lo7?u#K7bzT5RblKOL
zZyzkEwNQyRCeXSE3}eFYx`z!9p$P=0YHt0$(OvJGV^9B`w?eH|O1kf?e$0QGmdkQ#
z^Lo`HVbUktO6w|;6+S7oroH?V_p-^mXN4vb0eAi>C`h`V5(t>}eO4QTyW!`8SP7h2
zl~CxGY!-5j4QB>T1lNLvP$|s+B|AdsEZxQCGaHt_U@~(Z;IQ;$CWCqwTH;~v0ryWn
zu93S|kDuAhD=N&S4*R*~ljQiZ98A*#)QFrN%qZF9#9K?zXLJEiK;=;LTeO#Cm)h<E
zH+(;~E8-k&C8(FgbmUmPvciESK3%%f5%V}>ErdwedeGn+TM*CcPliK=__)n1#>OdC
z;HoMOpm>Y?N$Q@4%xmRHJB2Sv%6w`fZ-^<=iKr4cvqsIrr5QGJHBu;(p_<^a(U>EY
zI{3$X)VZ0RofuJ$2tDNzr{64CrCNg9(4xi%J+s>1l~S`V?OVaA+?tx?=$b~M?Ld}<
z+b-Nm$RL>LDn-{B>EhzO?*ld9Wh!Tb|3aRX#R;GS{Y`Gx5GiMo2E{lXs!4gt19wwi
zQ20|j<QG?s5R7R2yZgQIAT8+JA%tj19LC(2Hs>@5cJ!FZ@LT)iUz^6uN$wfGu>@U+
zaK)lyGA%sL2%;|qeDV6>G7<f3(LpZ%{v__PEkQ6$D7BU)Vc6DM&?!f2DGr{XQvpb?
zU3$qtXGrruCDEEEgGz(5AXFPHT}T7`d?mQJB(fd$t0v};2hcj?Yx`%CZ1^G{XJw>i
zo49Y|Yc9jjEVItc@o}a+Qe_4Gn<W?~Hb31N(*kqJX?D9Cnj`OQLSP~nZ0>D(dl>G`
z1do&%H%mS5em4Dc4q-hvB#}V7_;IDf7Wo$=sWANgR4(w7i~owmR$u5u`3WrKSKCHQ
zKH0Y5VU-C^W({!kUjE?lCqX+wQOU@X)PtJ>Wp+oVOg$aYeemekZ{)~YK7#BwRf{?-
z{dA_UJwE)O&Dmr`?C{Uyji1t0m$_Ev`vT|qwT<Rwf2QVpH-GEwG5?2FguNgH59C{K
z!cp>zfKATzQ!y~^mp>!>>CTBBuB^OEUEV=T?~?YX%3zj`K3KYkYK|ZA9zEDTN=}$t
z_U+rotfHf~5~ML_IVodxtCn9klZ^K+0xc*ETHp3H9{No|kp=CH%x{DFUI9X(8A$94
zb(`Jrv~tICZ?)3GaJau3^<r3YCdfo5^|g~WI2sYRa^;?+ODVBo%`%UWdRxAf{wmv5
zaOr*{!8=j;lJq51bIc}ecsi%HF-s8=Z*WAP!vi0v3n38WO_aguS1^piV^)yaR-1Qd
zRlKJQIphWUXMq3`A9yobc})n5(se2#VAcn27|c~MDoZ_$`2GUIb|+dGEAkX(8L}X-
z<|h3(bO9PsBf7C6Zhsr>&auQKuCu2%%Kg~G;Ifpxf#ma}_AvOykl>fIuzYm~93v5$
zueJ&&&=OuKArE{{thiS~iG?>@UwZ9s(cZo-yUgOBpTqn_FwF)Q0A53tdibEcJ*o33
zsikEPmiXP!huv3Dfjg#WKR(O2DXM;Y3YYn?r-0e!c$6kPb781Z#M$cOW%jaU5sXWm
zfCBrDrl6@Z+^^g1l1%;d)iJneeRG6c>il=4#P`Xs{jmh^veN6HcXi;WKFM*_?{Lgm
z;@rWZ{`<Qc(y!S6)ltlNKKG3zBQ$~(&OIfY6Tl^0bmA5B7wPuCcZWX@JA_8_??ViF
z;_Tnx%IADUjUh@3k5+&%dqRdj{UtQkExr^Lrsh{PyD56C_p*$?x76`LN*~m5nNNgr
zi~52&^|Ozz5`>B8(bd40-Kf~c($wvj!t^%^O#F`(`O7M2gdCKJ-7UInl^r(zi=$f)
z?HoVH6a2d_RV!*=US*Elm!;B_`-A5Pt}#-XcGuzOn8bFrOY!>3A2m~544<IU6%@a7
zm4UkH(uj4ddaMSU+A9BO7tI@+{<0DHQWZT+Wpjevyv2<vNp+cmAuEs&*gjYn%#Gd6
zpov{uWB0dt)!eE%;v*C`+{&T5<M9bBu>sr({6q_JM6frtH!iXP(sh~#*%AyMxE_d~
zkq{`7lqk+nKX85S3EX{hZv1W_T~2IvzWK&)?O00M=R{|pEx4eHPvJ=~OYxz84$~Ml
zr~FB|-1EiZEWk*q?h^2G1#)V;m$rE((?TDmJ@{cLTh48_7s{_*y$D;$RT{gu00Bv9
zu;Q>_6HeM2HA9}cKxj?gf@#5w=a?9ow(~frjJo-Er7bPk)xLRih)m&FCkh%yOX)9E
z{kUitpJBbS7s)8oyr3|D2Py(*_A<WT>0ZJ@%zr%llw!k~nhUBoD+q`Y!>);s2v*fj
zRK+=13a7%9%SWuF`4+9{b+$u1WZ)=+rY`Y9vG?7Ep_OHY`*x=82etjWgrnPhy7>#q
zze;k3{Jzm@31ow1`*t1{@t(I&79qscLxWzYi`{}jV)XWewECWfDrF8h+wX$JDXn)2
z8AS`vfrKDm=#`=)`z6Yhkp0hU*tJX|8<e`^qh3#ubRoiKKrDClCc_$q@_3%^5|Ixb
z8w11u{`Cipuk+&RdXd_w44K2KFf_!Nl@l1?m+TXDMW=N!^?Hu*x5PZbr`jw1o?~-T
z?pkk<Yw&{``)9BJTO())zmY1B+>9hEcBFTPy-yeZ@wQ8jSG=}^WdL)HgM4h&%p0rk
zA!&1H%c*vjS#t*Q9<`fVy2b|ZrdGc<fu<j&?vt`5HAj|E>&L+iBy5kM<+!H!9is46
zD;<Pg(?I(yJlew*fc?w7sqwb;EE<!k8qF-+wtf^p#Z&aNSwVz5=dX3|u)er5@li+#
z&4-FerR)5Nx{Nkh)^lZ;O9y8ineSYmgIUj=R#FGK^{6`CrO0v!roU0gSZuGaSKj6m
zipSmE!ZUR+$10I)P5pv@hTmFjuGgcv=@kl&l$UX|R2ezS*gysj%dvbBycW^T34D?+
zrz-g3fZhQlFXpP+l>I)T?$|*GHU&FNo>Uy3W4?G%)M7V()JXcjOoo+Wg?;h!uUz=Y
z(I>WdC7-*3Cdi}Qk(IDyeeT}tp&qG&>%QsH7+Hw$Lom{`=|Ah3YJM?PSDwE!2Uc?r
zjCG<_bGR#vIpi{9kJO-<*+_q=`z+uZe|h}=tmh`Tx8gmjw_U;uy<Ni+oXBdOpJI{5
zhm8>V6DU79Uu4k<DWvtwrrqUsdFJXVX}xtWHTzXfm*!>N`CFfe7(kMDKPp)#wYM;{
z22!>ufY;Dg)xys+4&%ovxC+~&l2Dsz>!MVl$);`>z7ke&Bn;E5dbJRA+yBbgS%cz;
z81r`}X&<+pD*5N65K})EOW(vXdtYxF7a@ND!kfmg{13vY*u*X4zhbF;5JWN@LPOl>
z{^QSgjQJZ`Eb8YiJrzuLJ0UG#K<nkW+|B-Bn=j!0QBc$>7jz*O_gCc%3}i;qYKfs_
z+Ve@0G(Wo!ouDJ7GOWC4<JVk|DJy22<RjOCCSG6Y)5lh@I$S(nmFaD-tGpEiOJJ`-
zb_z)L@TlV$o0X&ccnOCJn(D##)Nwk#;+n;JG&KkP8}VDmIgR!`cbNLA`;%x!al=Y|
zCc1gt0%2gIJfc)nyyqSfuLs0)d$?XL!*5IL1L;g%YKe_6Y~&-~p<WurmX?^)*fIat
zk}Z<H3y{}#5d6rfL(Ya|sBY^2a~Y<UCMc0zcYihpLcp*NTc7FDw#qlJygVPa+me1A
zAD&23I?55E8h3FrrtN(=1z&Ka71xkb@2eZpflpF+^;uRo@PE7*l<0LX=#6@wUyObL
z9w6_Q8%^Xo%JEn33Nt~sM)*WrMsbmHJp;bq<1G$0*Y#=K0NxGlmaedh95wkAYgy)+
zH$pW2;R83|{ThB8T0cfk2r?atpSiwD$!-{;bt}V)P7#sE40z4kznzn~-2Q%tcsdwk
z5WBEhDFz6IqJR(cfWF)nSpujZVUI*>Cmh-8Hpl;CJ?6wz>>w!8U_RkIR?4NAElMa1
z$G>ZAGX>kSeq=lulA%JMJOJ^NeFdT_H0Fm-=u<(!EDBRchQY5Pv>^ndG0ydT#8<L{
z!K^R`g<Rt0B+ftf5nv%jywh*b&PMVCooY_Zx%Cta#07w#f$HqFxtik4MZw4SfTI8Y
z0_=*4Mi{O+tjFwcj!eS_AX#~n#QH6M=$hPlhI&^8vl81USevf@pDg8^+<t1W>pbIT
z+bpGe;uM@7CPPem<=?Ha8nstcf?-DQ7#ye^tflGTYeZQ?(_WNC^WSo<{ctbw_lDmS
z-yo6YWTa@xB%D`AXioLwTU|P-Q8E8#dw`hrR^|PuYX#nXTos@ot1443WghYW02SpU
A&;S4c

literal 0
HcmV?d00001

diff --git a/doc/markdown/markdown.md b/doc/markdown/markdown.md
index f6bffba9fdb..c400cdac64d 100644
--- a/doc/markdown/markdown.md
+++ b/doc/markdown/markdown.md
@@ -424,24 +424,24 @@ will point the link to `wikis/style` when the link is inside of a wiki markdown
     Here's our logo (hover to see the title text):
 
     Inline-style:
-    ![alt text](assets/logo.svg)
+    ![alt text](img/logo.png)
 
     Reference-style:
     ![alt text1][logo]
 
-    [logo]: assets/logo.svg
+    [logo]: img/logo.png
 
 Here's our logo:
 
 Inline-style:
 
-![alt text](/assets/logo.svg)
+![alt text](img/logo.png)
 
 Reference-style:
 
 ![alt text][logo]
 
-[logo]: /assets/logo.svg
+[logo]: img/logo.png
 
 ## Blockquotes
 

From c880d877b8982132448999f13e3cf4258dcb906f Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Thu, 11 Feb 2016 14:31:31 -0500
Subject: [PATCH 107/134] Loosen Nokogiri version requirement

Closes #13218
---
 Gemfile      | 2 +-
 Gemfile.lock | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile b/Gemfile
index a13f49ad50e..9114fdd33ac 100644
--- a/Gemfile
+++ b/Gemfile
@@ -105,7 +105,7 @@ gem 'rouge',         '~> 1.10.1'
 
 # See https://groups.google.com/forum/#!topic/ruby-security-ann/aSbgDiwb24s
 # and https://groups.google.com/forum/#!topic/ruby-security-ann/Dy7YiKb_pMM
-gem 'nokogiri', '1.6.7.2'
+gem 'nokogiri', '~> 1.6.7', '>= 1.6.7.2'
 
 # Diffs
 gem 'diffy', '~> 3.0.3'
diff --git a/Gemfile.lock b/Gemfile.lock
index df5099c7581..98a36724fe0 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -959,7 +959,7 @@ DEPENDENCIES
   mysql2 (~> 0.3.16)
   nested_form (~> 0.3.2)
   net-ssh (~> 3.0.1)
-  nokogiri (= 1.6.7.2)
+  nokogiri (~> 1.6.7, >= 1.6.7.2)
   nprogress-rails (~> 0.1.6.7)
   oauth2 (~> 1.0.0)
   octokit (~> 3.8.0)

From 5a5ee6188ba2960b80d0e00fa5404ebb55135698 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rub=C3=A9n=20D=C3=A1vila?= <rdavila84@gmail.com>
Date: Thu, 11 Feb 2016 18:30:05 -0500
Subject: [PATCH 108/134] Load all blob data when highlighting content for
 git-blame.

---
 lib/gitlab/blame.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/gitlab/blame.rb b/lib/gitlab/blame.rb
index 313e6b9fc03..997a22779a0 100644
--- a/lib/gitlab/blame.rb
+++ b/lib/gitlab/blame.rb
@@ -40,6 +40,7 @@ module Gitlab
     end
 
     def highlighted_lines
+      @blob.load_all_data!(repository)
       @highlighted_lines ||= Gitlab::Highlight.highlight(@blob.name, @blob.data).lines
     end
 

From 4d1e82e0bb443e9f1adc8c6c27925fb50f12578b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rub=C3=A9n=20D=C3=A1vila?= <rdavila84@gmail.com>
Date: Thu, 11 Feb 2016 19:02:52 -0500
Subject: [PATCH 109/134] Don't show fork button if user can't fork the
 project.

---
 app/views/projects/forks/index.html.haml | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/app/views/projects/forks/index.html.haml b/app/views/projects/forks/index.html.haml
index c834bf63b28..42fa6fdb782 100644
--- a/app/views/projects/forks/index.html.haml
+++ b/app/views/projects/forks/index.html.haml
@@ -29,14 +29,15 @@
           = link_to page_filter_path(sort: sort_value_oldest_updated, without: excluded_filters) do
             = sort_title_oldest_updated
 
-    - if current_user.already_forked?(@project) && current_user.manageable_namespaces.size < 2
-      = link_to namespace_project_path(current_user, current_user.fork_of(@project)), title: 'Go to your fork', class: 'btn btn-new' do
-        = icon('code-fork fw')
-        Fork
-    - else
-      = link_to new_namespace_project_fork_path(@project.namespace, @project), title: "Fork project", class: 'btn btn-new' do
-        = icon('code-fork fw')
-        Fork
+    - if current_user && can?(current_user, :fork_project, @project)
+      - if current_user.already_forked?(@project) && current_user.manageable_namespaces.size < 2
+        = link_to namespace_project_path(current_user, current_user.fork_of(@project)), title: 'Go to your fork', class: 'btn btn-new' do
+          = icon('code-fork fw')
+          Fork
+      - else
+        = link_to new_namespace_project_fork_path(@project.namespace, @project), title: "Fork project", class: 'btn btn-new' do
+          = icon('code-fork fw')
+          Fork
 
 
 .projects-list-holder

From d3a688135803eec6a667f6e02ab39a27b91c3144 Mon Sep 17 00:00:00 2001
From: Jacob Vosmaer <contact@jacobvosmaer.nl>
Date: Fri, 12 Feb 2016 09:46:04 +0100
Subject: [PATCH 110/134] Use gitlab-workhorse 0.6.4

---
 GITLAB_WORKHORSE_VERSION    | 2 +-
 doc/install/installation.md | 2 +-
 doc/update/8.4-to-8.5.md    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/GITLAB_WORKHORSE_VERSION b/GITLAB_WORKHORSE_VERSION
index 844f6a91acb..d2b13eb644d 100644
--- a/GITLAB_WORKHORSE_VERSION
+++ b/GITLAB_WORKHORSE_VERSION
@@ -1 +1 @@
-0.6.3
+0.6.4
diff --git a/doc/install/installation.md b/doc/install/installation.md
index fe614df91fd..7d3f9d0a2ed 100644
--- a/doc/install/installation.md
+++ b/doc/install/installation.md
@@ -358,7 +358,7 @@ GitLab Shell is an SSH access and repository management software developed speci
     cd /home/git
     sudo -u git -H git clone https://gitlab.com/gitlab-org/gitlab-workhorse.git
     cd gitlab-workhorse
-    sudo -u git -H git checkout 0.6.3
+    sudo -u git -H git checkout 0.6.4
     sudo -u git -H make
 
 ### Initialize Database and Activate Advanced Features
diff --git a/doc/update/8.4-to-8.5.md b/doc/update/8.4-to-8.5.md
index 6e035047b24..c10da356a6b 100644
--- a/doc/update/8.4-to-8.5.md
+++ b/doc/update/8.4-to-8.5.md
@@ -49,7 +49,7 @@ GitLab 8.1.
 ```bash
 cd /home/git/gitlab-workhorse
 sudo -u git -H git fetch --all
-sudo -u git -H git checkout 0.6.3
+sudo -u git -H git checkout 0.6.4
 sudo -u git -H make
 ```
 

From 324e6743cf328a48afd7655c99c56199ae456632 Mon Sep 17 00:00:00 2001
From: Achilleas Pipinellis <axilleas@axilleas.me>
Date: Fri, 12 Feb 2016 11:25:20 +0200
Subject: [PATCH 111/134] Fix typo in doc/api/builds.md

[ci skip]
---
 doc/api/builds.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/api/builds.md b/doc/api/builds.md
index 4dd4ee8b4bb..43edb40e911 100644
--- a/doc/api/builds.md
+++ b/doc/api/builds.md
@@ -112,7 +112,7 @@ GET /projects/:id/repository/commits/:sha/builds
 |-----------|---------|----------|---------------------|
 | `id`      | integer | yes      | The ID of a project |
 | `sha`     | string  | yes      | The SHA id of a commit |
-| `scope`   | stringi **or** array of strings | no | The scope of builds to show, one or array of: `pending`, `running`, `failed`, `success`, `canceled`; showing all builds if none provided |
+| `scope`   | string **or** array of strings | no | The scope of builds to show, one or array of: `pending`, `running`, `failed`, `success`, `canceled`; showing all builds if none provided |
 
 ```
 curl -H "PRIVATE-TOKEN: 9koXpg98eAheJpvBs5tK" "https://gitlab.example.com/api/v3/projects/1/repository/commits/0ff3ae198f8601a285adcf5c0fff204ee6fba5fd/builds"

From 41d24868e9efc0f4a7d2888683e0224ad9e144b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Coutable?= <remy@rymai.me>
Date: Fri, 12 Feb 2016 10:32:47 +0100
Subject: [PATCH 112/134] Re-add "Update configuration files" section in the
 8.4 to 8.5 upgrade guide

Needed because of !2782.

[ci skip]
---
 doc/update/8.4-to-8.5.md | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/doc/update/8.4-to-8.5.md b/doc/update/8.4-to-8.5.md
index 6e035047b24..a2b43356b59 100644
--- a/doc/update/8.4-to-8.5.md
+++ b/doc/update/8.4-to-8.5.md
@@ -72,12 +72,22 @@ sudo -u git -H bundle exec rake assets:clean assets:precompile cache:clear RAILS
 
 ```
 
-### 7. Start application
+### 7. Update configuration files
+
+#### New configuration options for `gitlab.yml`
+
+There are new configuration options available for [`gitlab.yml`](config/gitlab.yml.example). View them with the command below and apply them manually to your current `gitlab.yml`:
+
+```sh
+git diff origin/8-4-stable:config/gitlab.yml.example origin/8-5-stable:config/gitlab.yml.example
+```
+
+### 8. Start application
 
     sudo service gitlab start
     sudo service nginx restart
 
-### 8. Check application status
+### 9. Check application status
 
 Check if GitLab and its environment are configured correctly:
 

From c9f202b2efdecda2e9fa5290ba5de413ab345a7d Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Thu, 11 Feb 2016 15:08:10 +0100
Subject: [PATCH 113/134] Fix broken link in CI build notification emails

Closes #13199
---
 app/mailers/emails/builds.rb                  | 13 +--
 app/views/notify/build_fail_email.html.haml   |  3 +-
 .../notify/build_success_email.html.haml      |  2 +-
 spec/mailers/notify_spec.rb                   | 82 ++++++++++---------
 4 files changed, 52 insertions(+), 48 deletions(-)

diff --git a/app/mailers/emails/builds.rb b/app/mailers/emails/builds.rb
index 64c1ce8cfab..2f86d1be576 100644
--- a/app/mailers/emails/builds.rb
+++ b/app/mailers/emails/builds.rb
@@ -3,26 +3,27 @@ module Emails
     def build_fail_email(build_id, to)
       @build = Ci::Build.find(build_id)
       @project = @build.project
+
       add_project_headers
-      add_build_headers
-      headers['X-GitLab-Build-Status'] = "failed"
+      add_build_headers('failed')
       mail(to: to, subject: subject("Build failed for #{@project.name}", @build.short_sha))
     end
 
     def build_success_email(build_id, to)
       @build = Ci::Build.find(build_id)
       @project = @build.project
+
       add_project_headers
-      add_build_headers
-      headers['X-GitLab-Build-Status'] = "success"
+      add_build_headers('success')
       mail(to: to, subject: subject("Build success for #{@project.name}", @build.short_sha))
     end
 
     private
-    def add_build_headers
+
+    def add_build_headers(status)
       headers['X-GitLab-Build-Id'] = @build.id
       headers['X-GitLab-Build-Ref'] = @build.ref
+      headers['X-GitLab-Build-Status'] = status.to_s
     end
-
   end
 end
diff --git a/app/views/notify/build_fail_email.html.haml b/app/views/notify/build_fail_email.html.haml
index f4e9749e5c7..81d65037312 100644
--- a/app/views/notify/build_fail_email.html.haml
+++ b/app/views/notify/build_fail_email.html.haml
@@ -1,9 +1,10 @@
 - content_for :header do
   %h1{style: "background: #c40834; color: #FFF; font: normal 20px Helvetica, Arial, sans-serif; margin: 0; padding: 5px 10px; line-height: 32px; font-size: 16px;"}
     GitLab (build failed)
+
 %h3
   Project:
-  = link_to ci_project_url(@project) do
+  = link_to namespace_project_url(@project.namespace, @project) do
     = @project.name
 
 %p
diff --git a/app/views/notify/build_success_email.html.haml b/app/views/notify/build_success_email.html.haml
index 8b004d34cca..5d247eb4cf2 100644
--- a/app/views/notify/build_success_email.html.haml
+++ b/app/views/notify/build_success_email.html.haml
@@ -4,7 +4,7 @@
 
 %h3
   Project:
-  = link_to ci_project_url(@project) do
+  = link_to namespace_project_url(@project.namespace, @project) do
     = @project.name
 
 %p
diff --git a/spec/mailers/notify_spec.rb b/spec/mailers/notify_spec.rb
index 82bd057b16c..c22ff7f8cea 100644
--- a/spec/mailers/notify_spec.rb
+++ b/spec/mailers/notify_spec.rb
@@ -13,7 +13,6 @@ describe Notify do
   let(:gitlab_sender_reply_to) { Gitlab.config.gitlab.email_reply_to }
   let(:recipient) { create(:user, email: 'recipient@example.com') }
   let(:project) { create(:project) }
-  let(:build) { create(:ci_build) }
 
   before(:each) do
     ActionMailer::Base.deliveries.clear
@@ -48,13 +47,6 @@ describe Notify do
     end
   end
 
-  shared_examples 'an email with X-GitLab headers containing build details' do
-    it 'has X-GitLab-Build* headers' do
-      is_expected.to have_header 'X-GitLab-Build-Id', /#{build.id}/
-      is_expected.to have_header 'X-GitLab-Build-Ref', /#{build.ref}/
-    end
-  end
-
   shared_examples 'an email that contains a header with author username' do
     it 'has X-GitLab-Author header containing author\'s username' do
       is_expected.to have_header 'X-GitLab-Author', user.username
@@ -971,49 +963,59 @@ describe Notify do
     end
   end
 
-  describe 'build success' do
-    before { build.success }
+  describe 'build notification email' do
+    let(:build) { create(:ci_build) }
+    let(:project) { build.project }
 
-    subject { Notify.build_success_email(build.id, 'wow@example.com') }
+    shared_examples 'build email' do
+      it 'contains name of project' do
+        is_expected.to have_body_text build.project_name
+      end
 
-    it_behaves_like 'an email with X-GitLab headers containing build details'
-    it_behaves_like 'an email with X-GitLab headers containing project details' do
-      let(:project) { build.project }
+      it 'contains link to project' do
+        is_expected.to have_body_text namespace_project_path(project.namespace, project)
+      end
     end
 
-    it 'has header indicating build status' do
-      is_expected.to have_header 'X-GitLab-Build-Status', 'success'
+    shared_examples 'an email with X-GitLab headers containing build details' do
+      it 'has X-GitLab-Build* headers' do
+        is_expected.to have_header 'X-GitLab-Build-Id', /#{build.id}/
+        is_expected.to have_header 'X-GitLab-Build-Ref', /#{build.ref}/
+      end
     end
 
-    it 'has the correct subject' do
-      should have_subject /Build success for/
+    describe 'build success' do
+      subject { Notify.build_success_email(build.id, 'wow@example.com') }
+      before { build.success }
+
+      it_behaves_like 'build email'
+      it_behaves_like 'an email with X-GitLab headers containing build details'
+      it_behaves_like 'an email with X-GitLab headers containing project details'
+
+      it 'has header indicating build status' do
+        is_expected.to have_header 'X-GitLab-Build-Status', 'success'
+      end
+
+      it 'has the correct subject' do
+        is_expected.to have_subject /Build success for/
+      end
     end
 
-    it 'contains name of project' do
-      should have_body_text build.project_name
-    end
-  end
+    describe 'build fail' do
+      subject { Notify.build_fail_email(build.id, 'wow@example.com') }
+      before { build.drop }
 
-  describe 'build fail' do
-    before { build.drop }
+      it_behaves_like 'build email'
+      it_behaves_like 'an email with X-GitLab headers containing build details'
+      it_behaves_like 'an email with X-GitLab headers containing project details'
 
-    subject { Notify.build_fail_email(build.id, 'wow@example.com') }
+      it 'has header indicating build status' do
+        is_expected.to have_header 'X-GitLab-Build-Status', 'failed'
+      end
 
-    it_behaves_like 'an email with X-GitLab headers containing build details'
-    it_behaves_like 'an email with X-GitLab headers containing project details' do
-      let(:project) { build.project }
-    end
-
-    it 'has header indicating build status' do
-      is_expected.to have_header 'X-GitLab-Build-Status', 'failed'
-    end
-
-    it 'has the correct subject' do
-      should have_subject /Build failed for/
-    end
-
-    it 'contains name of project' do
-      should have_body_text build.project_name
+      it 'has the correct subject' do
+        is_expected.to have_subject /Build failed for/
+      end
     end
   end
 end

From 349adab1425ba97065614e320deb3108d2a99758 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Fri, 12 Feb 2016 12:51:46 +0100
Subject: [PATCH 114/134] Add Changelog entry for links fixes in build emails

---
 CHANGELOG | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG b/CHANGELOG
index ea84cf0fd79..ce2716bf0fa 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -52,6 +52,7 @@ v 8.5.0 (unreleased)
   - Validate correctness of maximum attachment size application setting
   - Replaces "Create merge request" link with one to the "Merge Request" when one exists
   - Fix CI builds badge, add a new link to builds badge, deprecate the old one
+  - Fix broken link to project in build notification emails
 
 v 8.4.4
   - Update omniauth-saml gem to 1.4.2

From 055ec4dc0ae1fd765ee1e624f307bf2b00fa4c12 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Fri, 12 Feb 2016 13:20:21 +0100
Subject: [PATCH 115/134] Move build emails specs to separate file

This also extracts shared examples for notification emails to separate
file.
---
 spec/mailers/emails/builds_spec.rb |  65 +++++++++++
 spec/mailers/notify_spec.rb        | 181 +----------------------------
 spec/mailers/shared/notify.rb      | 117 +++++++++++++++++++
 3 files changed, 186 insertions(+), 177 deletions(-)
 create mode 100644 spec/mailers/emails/builds_spec.rb
 create mode 100644 spec/mailers/shared/notify.rb

diff --git a/spec/mailers/emails/builds_spec.rb b/spec/mailers/emails/builds_spec.rb
new file mode 100644
index 00000000000..0df89938e97
--- /dev/null
+++ b/spec/mailers/emails/builds_spec.rb
@@ -0,0 +1,65 @@
+require 'spec_helper'
+require 'email_spec'
+require 'mailers/shared/notify'
+
+describe Notify do
+  include EmailSpec::Matchers
+
+  include_context 'gitlab email notification'
+
+  describe 'build notification email' do
+    let(:build) { create(:ci_build) }
+    let(:project) { build.project }
+
+    shared_examples 'build email' do
+      it 'contains name of project' do
+        is_expected.to have_body_text build.project_name
+      end
+
+      it 'contains link to project' do
+        is_expected.to have_body_text namespace_project_path(project.namespace, project)
+      end
+    end
+
+    shared_examples 'an email with X-GitLab headers containing build details' do
+      it 'has X-GitLab-Build* headers' do
+        is_expected.to have_header 'X-GitLab-Build-Id', /#{build.id}/
+        is_expected.to have_header 'X-GitLab-Build-Ref', /#{build.ref}/
+      end
+    end
+
+    describe 'build success' do
+      subject { Notify.build_success_email(build.id, 'wow@example.com') }
+      before { build.success }
+
+      it_behaves_like 'build email'
+      it_behaves_like 'an email with X-GitLab headers containing build details'
+      it_behaves_like 'an email with X-GitLab headers containing project details'
+
+      it 'has header indicating build status' do
+        is_expected.to have_header 'X-GitLab-Build-Status', 'success'
+      end
+
+      it 'has the correct subject' do
+        is_expected.to have_subject /Build success for/
+      end
+    end
+
+    describe 'build fail' do
+      subject { Notify.build_fail_email(build.id, 'wow@example.com') }
+      before { build.drop }
+
+      it_behaves_like 'build email'
+      it_behaves_like 'an email with X-GitLab headers containing build details'
+      it_behaves_like 'an email with X-GitLab headers containing project details'
+
+      it 'has header indicating build status' do
+        is_expected.to have_header 'X-GitLab-Build-Status', 'failed'
+      end
+
+      it 'has the correct subject' do
+        is_expected.to have_subject /Build failed for/
+      end
+    end
+  end
+end
diff --git a/spec/mailers/notify_spec.rb b/spec/mailers/notify_spec.rb
index c22ff7f8cea..2060895f16d 100644
--- a/spec/mailers/notify_spec.rb
+++ b/spec/mailers/notify_spec.rb
@@ -1,131 +1,13 @@
 require 'spec_helper'
 require 'email_spec'
+require 'mailers/shared/notify'
 
 describe Notify do
   include EmailSpec::Helpers
   include EmailSpec::Matchers
   include RepoHelpers
 
-  new_user_address = 'newguy@example.com'
-
-  let(:gitlab_sender_display_name) { Gitlab.config.gitlab.email_display_name }
-  let(:gitlab_sender) { Gitlab.config.gitlab.email_from }
-  let(:gitlab_sender_reply_to) { Gitlab.config.gitlab.email_reply_to }
-  let(:recipient) { create(:user, email: 'recipient@example.com') }
-  let(:project) { create(:project) }
-
-  before(:each) do
-    ActionMailer::Base.deliveries.clear
-    email = recipient.emails.create(email: "notifications@example.com")
-    recipient.update_attribute(:notification_email, email.email)
-  end
-
-  shared_examples 'a multiple recipients email' do
-    it 'is sent to the given recipient' do
-      is_expected.to deliver_to recipient.notification_email
-    end
-  end
-
-  shared_examples 'an email sent from GitLab' do
-    it 'is sent from GitLab' do
-      sender = subject.header[:from].addrs[0]
-      expect(sender.display_name).to eq(gitlab_sender_display_name)
-      expect(sender.address).to eq(gitlab_sender)
-    end
-
-    it 'has a Reply-To address' do
-      reply_to = subject.header[:reply_to].addresses
-      expect(reply_to).to eq([gitlab_sender_reply_to])
-    end
-  end
-
-  shared_examples 'an email with X-GitLab headers containing project details' do
-    it 'has X-GitLab-Project* headers' do
-      is_expected.to have_header 'X-GitLab-Project', /#{project.name}/
-      is_expected.to have_header 'X-GitLab-Project-Id', /#{project.id}/
-      is_expected.to have_header 'X-GitLab-Project-Path', /#{project.path_with_namespace}/
-    end
-  end
-
-  shared_examples 'an email that contains a header with author username' do
-    it 'has X-GitLab-Author header containing author\'s username' do
-      is_expected.to have_header 'X-GitLab-Author', user.username
-    end
-  end
-
-  shared_examples 'an email starting a new thread' do |message_id_prefix|
-    include_examples 'an email with X-GitLab headers containing project details'
-
-    it 'has a discussion identifier' do
-      is_expected.to have_header 'Message-ID',  /<#{message_id_prefix}(.*)@#{Gitlab.config.gitlab.host}>/
-    end
-  end
-
-  shared_examples 'an answer to an existing thread' do |thread_id_prefix|
-    include_examples 'an email with X-GitLab headers containing project details'
-
-    it 'has a subject that begins with Re: ' do
-      is_expected.to have_subject /^Re: /
-    end
-
-    it 'has headers that reference an existing thread' do
-      is_expected.to have_header 'Message-ID',  /<(.*)@#{Gitlab.config.gitlab.host}>/
-      is_expected.to have_header 'References',  /<#{thread_id_prefix}(.*)@#{Gitlab.config.gitlab.host}>/
-      is_expected.to have_header 'In-Reply-To', /<#{thread_id_prefix}(.*)@#{Gitlab.config.gitlab.host}>/
-    end
-  end
-
-  shared_examples 'a new user email' do |user_email, site_path|
-    it 'is sent to the new user' do
-      is_expected.to deliver_to user_email
-    end
-
-    it 'has the correct subject' do
-      is_expected.to have_subject /^Account was created for you$/i
-    end
-
-    it 'contains the new user\'s login name' do
-      is_expected.to have_body_text /#{user_email}/
-    end
-
-    it 'includes a link to the site' do
-      is_expected.to have_body_text /#{site_path}/
-    end
-  end
-
-  shared_examples 'it should have Gmail Actions links' do
-    it { is_expected.to have_body_text /ViewAction/ }
-  end
-
-  shared_examples 'it should not have Gmail Actions links' do
-    it { is_expected.to_not have_body_text /ViewAction/ }
-  end
-
-  shared_examples 'it should show Gmail Actions View Issue link' do
-    it_behaves_like 'it should have Gmail Actions links'
-
-    it { is_expected.to have_body_text /View Issue/ }
-  end
-
-  shared_examples 'it should show Gmail Actions View Merge request link' do
-    it_behaves_like 'it should have Gmail Actions links'
-
-    it { is_expected.to have_body_text /View Merge request/ }
-  end
-
-  shared_examples 'it should show Gmail Actions View Commit link' do
-    it_behaves_like 'it should have Gmail Actions links'
-
-    it { is_expected.to have_body_text /View Commit/ }
-  end
-
-  shared_examples 'an unsubscribeable thread' do
-    it { is_expected.to have_body_text /unsubscribe/ }
-  end
-
-  shared_examples "a user cannot unsubscribe through footer link" do
-    it { is_expected.not_to have_body_text /unsubscribe/ }
-  end
+  include_context 'gitlab email notification'
 
   describe 'for new users, the email' do
     let(:example_site_path) { root_path }
@@ -136,7 +18,7 @@ describe Notify do
     subject { Notify.new_user_email(new_user.id, token) }
 
     it_behaves_like 'an email sent from GitLab'
-    it_behaves_like 'a new user email', new_user_address
+    it_behaves_like 'a new user email'
     it_behaves_like 'it should not have Gmail Actions links'
     it_behaves_like 'a user cannot unsubscribe through footer link'
 
@@ -165,7 +47,7 @@ describe Notify do
     subject { Notify.new_user_email(new_user.id) }
 
     it_behaves_like 'an email sent from GitLab'
-    it_behaves_like 'a new user email', new_user_address
+    it_behaves_like 'a new user email'
     it_behaves_like 'it should not have Gmail Actions links'
     it_behaves_like 'a user cannot unsubscribe through footer link'
 
@@ -963,59 +845,4 @@ describe Notify do
     end
   end
 
-  describe 'build notification email' do
-    let(:build) { create(:ci_build) }
-    let(:project) { build.project }
-
-    shared_examples 'build email' do
-      it 'contains name of project' do
-        is_expected.to have_body_text build.project_name
-      end
-
-      it 'contains link to project' do
-        is_expected.to have_body_text namespace_project_path(project.namespace, project)
-      end
-    end
-
-    shared_examples 'an email with X-GitLab headers containing build details' do
-      it 'has X-GitLab-Build* headers' do
-        is_expected.to have_header 'X-GitLab-Build-Id', /#{build.id}/
-        is_expected.to have_header 'X-GitLab-Build-Ref', /#{build.ref}/
-      end
-    end
-
-    describe 'build success' do
-      subject { Notify.build_success_email(build.id, 'wow@example.com') }
-      before { build.success }
-
-      it_behaves_like 'build email'
-      it_behaves_like 'an email with X-GitLab headers containing build details'
-      it_behaves_like 'an email with X-GitLab headers containing project details'
-
-      it 'has header indicating build status' do
-        is_expected.to have_header 'X-GitLab-Build-Status', 'success'
-      end
-
-      it 'has the correct subject' do
-        is_expected.to have_subject /Build success for/
-      end
-    end
-
-    describe 'build fail' do
-      subject { Notify.build_fail_email(build.id, 'wow@example.com') }
-      before { build.drop }
-
-      it_behaves_like 'build email'
-      it_behaves_like 'an email with X-GitLab headers containing build details'
-      it_behaves_like 'an email with X-GitLab headers containing project details'
-
-      it 'has header indicating build status' do
-        is_expected.to have_header 'X-GitLab-Build-Status', 'failed'
-      end
-
-      it 'has the correct subject' do
-        is_expected.to have_subject /Build failed for/
-      end
-    end
-  end
 end
diff --git a/spec/mailers/shared/notify.rb b/spec/mailers/shared/notify.rb
new file mode 100644
index 00000000000..48c851ebbd6
--- /dev/null
+++ b/spec/mailers/shared/notify.rb
@@ -0,0 +1,117 @@
+shared_context 'gitlab email notification' do
+  let(:gitlab_sender_display_name) { Gitlab.config.gitlab.email_display_name }
+  let(:gitlab_sender) { Gitlab.config.gitlab.email_from }
+  let(:gitlab_sender_reply_to) { Gitlab.config.gitlab.email_reply_to }
+  let(:recipient) { create(:user, email: 'recipient@example.com') }
+  let(:project) { create(:project) }
+  let(:new_user_address) { 'newguy@example.com' }
+
+  before do
+    ActionMailer::Base.deliveries.clear
+    email = recipient.emails.create(email: "notifications@example.com")
+    recipient.update_attribute(:notification_email, email.email)
+  end
+end
+
+shared_examples 'a multiple recipients email' do
+  it 'is sent to the given recipient' do
+    is_expected.to deliver_to recipient.notification_email
+  end
+end
+
+shared_examples 'an email sent from GitLab' do
+  it 'is sent from GitLab' do
+    sender = subject.header[:from].addrs[0]
+    expect(sender.display_name).to eq(gitlab_sender_display_name)
+    expect(sender.address).to eq(gitlab_sender)
+  end
+
+  it 'has a Reply-To address' do
+    reply_to = subject.header[:reply_to].addresses
+    expect(reply_to).to eq([gitlab_sender_reply_to])
+  end
+end
+
+shared_examples 'an email that contains a header with author username' do
+  it 'has X-GitLab-Author header containing author\'s username' do
+    is_expected.to have_header 'X-GitLab-Author', user.username
+  end
+end
+
+shared_examples 'an email with X-GitLab headers containing project details' do
+  it 'has X-GitLab-Project* headers' do
+    is_expected.to have_header 'X-GitLab-Project', /#{project.name}/
+    is_expected.to have_header 'X-GitLab-Project-Id', /#{project.id}/
+    is_expected.to have_header 'X-GitLab-Project-Path', /#{project.path_with_namespace}/
+  end
+end
+
+shared_examples 'an email starting a new thread' do |message_id_prefix|
+  include_examples 'an email with X-GitLab headers containing project details'
+
+  it 'has a discussion identifier' do
+    is_expected.to have_header 'Message-ID',  /<#{message_id_prefix}(.*)@#{Gitlab.config.gitlab.host}>/
+  end
+end
+
+shared_examples 'an answer to an existing thread' do |thread_id_prefix|
+  include_examples 'an email with X-GitLab headers containing project details'
+
+  it 'has a subject that begins with Re: ' do
+    is_expected.to have_subject /^Re: /
+  end
+
+  it 'has headers that reference an existing thread' do
+    is_expected.to have_header 'Message-ID',  /<(.*)@#{Gitlab.config.gitlab.host}>/
+    is_expected.to have_header 'References',  /<#{thread_id_prefix}(.*)@#{Gitlab.config.gitlab.host}>/
+    is_expected.to have_header 'In-Reply-To', /<#{thread_id_prefix}(.*)@#{Gitlab.config.gitlab.host}>/
+  end
+end
+
+shared_examples 'a new user email' do
+  it 'is sent to the new user' do
+    is_expected.to deliver_to new_user_address
+  end
+
+  it 'has the correct subject' do
+    is_expected.to have_subject /^Account was created for you$/i
+  end
+
+  it 'contains the new user\'s login name' do
+    is_expected.to have_body_text /#{new_user_address}/
+  end
+end
+
+shared_examples 'it should have Gmail Actions links' do
+  it { is_expected.to have_body_text /ViewAction/ }
+end
+
+shared_examples 'it should not have Gmail Actions links' do
+  it { is_expected.to_not have_body_text /ViewAction/ }
+end
+
+shared_examples 'it should show Gmail Actions View Issue link' do
+  it_behaves_like 'it should have Gmail Actions links'
+
+  it { is_expected.to have_body_text /View Issue/ }
+end
+
+shared_examples 'it should show Gmail Actions View Merge request link' do
+  it_behaves_like 'it should have Gmail Actions links'
+
+  it { is_expected.to have_body_text /View Merge request/ }
+end
+
+shared_examples 'it should show Gmail Actions View Commit link' do
+  it_behaves_like 'it should have Gmail Actions links'
+
+  it { is_expected.to have_body_text /View Commit/ }
+end
+
+shared_examples 'an unsubscribeable thread' do
+  it { is_expected.to have_body_text /unsubscribe/ }
+end
+
+shared_examples "a user cannot unsubscribe through footer link" do
+  it { is_expected.not_to have_body_text /unsubscribe/ }
+end

From c0033e96ba2121df08267f701fdc0b22c1aaa076 Mon Sep 17 00:00:00 2001
From: Grzegorz Bizon <grzesiek.bizon@gmail.com>
Date: Fri, 12 Feb 2016 13:52:29 +0100
Subject: [PATCH 116/134] Move profile notifications specs to separate file

---
 spec/mailers/emails/profile_spec.rb | 107 ++++++++++++++++++++++++++++
 spec/mailers/notify_spec.rb         |  98 -------------------------
 2 files changed, 107 insertions(+), 98 deletions(-)
 create mode 100644 spec/mailers/emails/profile_spec.rb

diff --git a/spec/mailers/emails/profile_spec.rb b/spec/mailers/emails/profile_spec.rb
new file mode 100644
index 00000000000..5b575da34f3
--- /dev/null
+++ b/spec/mailers/emails/profile_spec.rb
@@ -0,0 +1,107 @@
+require 'spec_helper'
+require 'email_spec'
+require 'mailers/shared/notify'
+
+describe Notify do
+  include EmailSpec::Matchers
+  include_context 'gitlab email notification'
+
+  describe 'profile notifications' do
+    describe 'for new users, the email' do
+      let(:example_site_path) { root_path }
+      let(:new_user) { create(:user, email: new_user_address, created_by_id: 1) }
+      let(:token) { 'kETLwRaayvigPq_x3SNM' }
+      
+      subject { Notify.new_user_email(new_user.id, token) }
+
+      it_behaves_like 'an email sent from GitLab'
+      it_behaves_like 'a new user email'
+      it_behaves_like 'it should not have Gmail Actions links'
+      it_behaves_like 'a user cannot unsubscribe through footer link'
+
+      it 'contains the password text' do
+        is_expected.to have_body_text /Click here to set your password/
+      end
+
+      it 'includes a link for user to set password' do
+        params = "reset_password_token=#{token}"
+        is_expected.to have_body_text(
+          %r{http://localhost(:\d+)?/users/password/edit\?#{params}}
+        )
+      end
+
+      it 'explains the reset link expiration' do
+        is_expected.to have_body_text(/This link is valid for \d+ (hours?|days?)/)
+        is_expected.to have_body_text(new_user_password_url)
+        is_expected.to have_body_text(/\?user_email=.*%40.*/)
+      end
+    end
+
+    describe 'for users that signed up, the email' do
+      let(:example_site_path) { root_path }
+      let(:new_user) { create(:user, email: new_user_address, password: "securePassword") }
+
+      subject { Notify.new_user_email(new_user.id) }
+
+      it_behaves_like 'an email sent from GitLab'
+      it_behaves_like 'a new user email'
+      it_behaves_like 'it should not have Gmail Actions links'
+      it_behaves_like 'a user cannot unsubscribe through footer link'
+
+      it 'should not contain the new user\'s password' do
+        is_expected.not_to have_body_text /password/
+      end
+    end
+
+    describe 'user added ssh key' do
+      let(:key) { create(:personal_key) }
+
+      subject { Notify.new_ssh_key_email(key.id) }
+
+      it_behaves_like 'an email sent from GitLab'
+      it_behaves_like 'it should not have Gmail Actions links'
+      it_behaves_like 'a user cannot unsubscribe through footer link'
+
+      it 'is sent to the new user' do
+        is_expected.to deliver_to key.user.email
+      end
+
+      it 'has the correct subject' do
+        is_expected.to have_subject /^SSH key was added to your account$/i
+      end
+
+      it 'contains the new ssh key title' do
+        is_expected.to have_body_text /#{key.title}/
+      end
+
+      it 'includes a link to ssh keys page' do
+        is_expected.to have_body_text /#{profile_keys_path}/
+      end
+    end
+
+    describe 'user added email' do
+      let(:email) { create(:email) }
+
+      subject { Notify.new_email_email(email.id) }
+
+      it_behaves_like 'it should not have Gmail Actions links'
+      it_behaves_like 'a user cannot unsubscribe through footer link'
+
+      it 'is sent to the new user' do
+        is_expected.to deliver_to email.user.email
+      end
+
+      it 'has the correct subject' do
+        is_expected.to have_subject /^Email was added to your account$/i
+      end
+
+      it 'contains the new email address' do
+        is_expected.to have_body_text /#{email.email}/
+      end
+
+      it 'includes a link to emails page' do
+        is_expected.to have_body_text /#{profile_emails_path}/
+      end
+    end
+  end
+end
diff --git a/spec/mailers/notify_spec.rb b/spec/mailers/notify_spec.rb
index 2060895f16d..232a11245a6 100644
--- a/spec/mailers/notify_spec.rb
+++ b/spec/mailers/notify_spec.rb
@@ -9,104 +9,6 @@ describe Notify do
 
   include_context 'gitlab email notification'
 
-  describe 'for new users, the email' do
-    let(:example_site_path) { root_path }
-    let(:new_user) { create(:user, email: new_user_address, created_by_id: 1) }
-
-    token = 'kETLwRaayvigPq_x3SNM'
-
-    subject { Notify.new_user_email(new_user.id, token) }
-
-    it_behaves_like 'an email sent from GitLab'
-    it_behaves_like 'a new user email'
-    it_behaves_like 'it should not have Gmail Actions links'
-    it_behaves_like 'a user cannot unsubscribe through footer link'
-
-    it 'contains the password text' do
-      is_expected.to have_body_text /Click here to set your password/
-    end
-
-    it 'includes a link for user to set password' do
-      params = "reset_password_token=#{token}"
-      is_expected.to have_body_text(
-        %r{http://localhost(:\d+)?/users/password/edit\?#{params}}
-      )
-    end
-
-    it 'explains the reset link expiration' do
-      is_expected.to have_body_text(/This link is valid for \d+ (hours?|days?)/)
-      is_expected.to have_body_text(new_user_password_url)
-      is_expected.to have_body_text(/\?user_email=.*%40.*/)
-    end
-  end
-
-  describe 'for users that signed up, the email' do
-    let(:example_site_path) { root_path }
-    let(:new_user) { create(:user, email: new_user_address, password: "securePassword") }
-
-    subject { Notify.new_user_email(new_user.id) }
-
-    it_behaves_like 'an email sent from GitLab'
-    it_behaves_like 'a new user email'
-    it_behaves_like 'it should not have Gmail Actions links'
-    it_behaves_like 'a user cannot unsubscribe through footer link'
-
-    it 'should not contain the new user\'s password' do
-      is_expected.not_to have_body_text /password/
-    end
-  end
-
-  describe 'user added ssh key' do
-    let(:key) { create(:personal_key) }
-
-    subject { Notify.new_ssh_key_email(key.id) }
-
-    it_behaves_like 'an email sent from GitLab'
-    it_behaves_like 'it should not have Gmail Actions links'
-    it_behaves_like 'a user cannot unsubscribe through footer link'
-
-    it 'is sent to the new user' do
-      is_expected.to deliver_to key.user.email
-    end
-
-    it 'has the correct subject' do
-      is_expected.to have_subject /^SSH key was added to your account$/i
-    end
-
-    it 'contains the new ssh key title' do
-      is_expected.to have_body_text /#{key.title}/
-    end
-
-    it 'includes a link to ssh keys page' do
-      is_expected.to have_body_text /#{profile_keys_path}/
-    end
-  end
-
-  describe 'user added email' do
-    let(:email) { create(:email) }
-
-    subject { Notify.new_email_email(email.id) }
-
-    it_behaves_like 'it should not have Gmail Actions links'
-    it_behaves_like 'a user cannot unsubscribe through footer link'
-
-    it 'is sent to the new user' do
-      is_expected.to deliver_to email.user.email
-    end
-
-    it 'has the correct subject' do
-      is_expected.to have_subject /^Email was added to your account$/i
-    end
-
-    it 'contains the new email address' do
-      is_expected.to have_body_text /#{email.email}/
-    end
-
-    it 'includes a link to emails page' do
-      is_expected.to have_body_text /#{profile_emails_path}/
-    end
-  end
-
   context 'for a project' do
     describe 'items that are assignable, the email' do
       let(:current_user) { create(:user, email: "current@email.com") }

From e919b5a4e9dd5e09628daf28b7b96424b764863b Mon Sep 17 00:00:00 2001
From: Ben Boeckel <ben.boeckel@kitware.com>
Date: Mon, 1 Feb 2016 11:07:59 -0500
Subject: [PATCH 117/134] Fix relative links in other markup formats

- Apply the RelativeLinkFilter filter to other formats, e.g.,
  reStructuredText so links from the Files view or the Project view work
- Remove the AsciidocPipeline pipeline

Fixes #3533.
---
 CHANGELOG                                |  1 +
 app/helpers/application_helper.rb        |  3 +--
 app/helpers/gitlab_markdown_helper.rb    | 15 +++++++++++++++
 lib/banzai/pipeline/asciidoc_pipeline.rb | 11 -----------
 lib/gitlab/asciidoc.rb                   |  4 +---
 lib/gitlab/other_markup.rb               | 24 ++++++++++++++++++++++++
 spec/helpers/application_helper_spec.rb  |  4 ++++
 spec/lib/gitlab/asciidoc_spec.rb         | 16 ----------------
 8 files changed, 46 insertions(+), 32 deletions(-)
 delete mode 100644 lib/banzai/pipeline/asciidoc_pipeline.rb
 create mode 100644 lib/gitlab/other_markup.rb

diff --git a/CHANGELOG b/CHANGELOG
index ea84cf0fd79..78b34b83700 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -16,6 +16,7 @@ v 8.5.0 (unreleased)
     set it up
   - API: Added "merge_requests/:merge_request_id/closes_issues" (Gal Schlezinger)
   - Fix diff comments loaded by AJAX to load comment with diff in discussion tab
+  - Fix relative links in other markup formats (Ben Boeckel)
   - Whitelist raw "abbr" elements when parsing Markdown (Benedict Etzel)
   - Fix label links for a merge request pointing to issues list
   - Don't vendor minified JS
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 622cbfe3cc4..02357e2f23e 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -212,8 +212,7 @@ module ApplicationHelper
         file_content
       end
     else
-      GitHub::Markup.render(file_name, file_content).
-        force_encoding(file_content.encoding).html_safe
+      other_markup(file_name, file_content)
     end
   rescue RuntimeError
     simple_format(file_content)
diff --git a/app/helpers/gitlab_markdown_helper.rb b/app/helpers/gitlab_markdown_helper.rb
index 1a226252251..89d2a648494 100644
--- a/app/helpers/gitlab_markdown_helper.rb
+++ b/app/helpers/gitlab_markdown_helper.rb
@@ -78,6 +78,21 @@ module GitlabMarkdownHelper
     )
   end
 
+  def other_markup(file_name, text)
+    Gitlab::OtherMarkup.render(
+      file_name,
+      text,
+      project:      @project,
+      current_user: (current_user if defined?(current_user)),
+
+      # RelativeLinkFilter
+      project_wiki:   @project_wiki,
+      requested_path: @path,
+      ref:            @ref,
+      commit:         @commit
+    )
+  end
+
   # Return the first line of +text+, up to +max_chars+, after parsing the line
   # as Markdown.  HTML tags in the parsed output are not counted toward the
   # +max_chars+ limit.  If the length limit falls within a tag's contents, then
diff --git a/lib/banzai/pipeline/asciidoc_pipeline.rb b/lib/banzai/pipeline/asciidoc_pipeline.rb
deleted file mode 100644
index f1331c0ebf9..00000000000
--- a/lib/banzai/pipeline/asciidoc_pipeline.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-module Banzai
-  module Pipeline
-    class AsciidocPipeline < BasePipeline
-      def self.filters
-        [
-          Filter::RelativeLinkFilter
-        ]
-      end
-    end
-  end
-end
diff --git a/lib/gitlab/asciidoc.rb b/lib/gitlab/asciidoc.rb
index b203b9d70e4..0b9c2e730f9 100644
--- a/lib/gitlab/asciidoc.rb
+++ b/lib/gitlab/asciidoc.rb
@@ -31,9 +31,7 @@ module Gitlab
 
       html = ::Asciidoctor.convert(input, asciidoc_opts)
 
-      if context[:project]
-        html = Banzai.render(html, context.merge(pipeline: :asciidoc))
-      end
+      html = Banzai.post_process(html, context)
 
       html.html_safe
     end
diff --git a/lib/gitlab/other_markup.rb b/lib/gitlab/other_markup.rb
new file mode 100644
index 00000000000..746ec283330
--- /dev/null
+++ b/lib/gitlab/other_markup.rb
@@ -0,0 +1,24 @@
+module Gitlab
+  # Parser/renderer for markups without other special support code.
+  module OtherMarkup
+
+    # Public: Converts the provided markup into HTML.
+    #
+    # input         - the source text in a markup format
+    # context       - a Hash with the template context:
+    #                 :commit
+    #                 :project
+    #                 :project_wiki
+    #                 :requested_path
+    #                 :ref
+    #
+    def self.render(file_name, input, context)
+      html = GitHub::Markup.render(file_name, input).
+        force_encoding(input.encoding)
+
+      html = Banzai.post_process(html, context)
+
+      html.html_safe
+    end
+  end
+end
diff --git a/spec/helpers/application_helper_spec.rb b/spec/helpers/application_helper_spec.rb
index 30e353148a8..f6c1005d265 100644
--- a/spec/helpers/application_helper_spec.rb
+++ b/spec/helpers/application_helper_spec.rb
@@ -293,6 +293,10 @@ describe ApplicationHelper do
 
   describe 'render_markup' do
     let(:content) { 'Noël' }
+    let(:user) { create(:user) }
+    before do
+      allow(helper).to receive(:current_user).and_return(user)
+    end
 
     it 'should preserve encoding' do
       expect(content.encoding.name).to eq('UTF-8')
diff --git a/spec/lib/gitlab/asciidoc_spec.rb b/spec/lib/gitlab/asciidoc_spec.rb
index 6beb21c6d2b..736bf787208 100644
--- a/spec/lib/gitlab/asciidoc_spec.rb
+++ b/spec/lib/gitlab/asciidoc_spec.rb
@@ -42,22 +42,6 @@ module Gitlab
       end
     end
 
-    context "with project in context" do
-
-      let(:context) { { project: create(:project) } }
-
-      it "should filter converted input via HTML pipeline and return result" do
-        filtered_html = '<b>ASCII</b>'
-
-        allow(Asciidoctor).to receive(:convert).and_return(html)
-        expect(Banzai).to receive(:render)
-          .with(html, context.merge(pipeline: :asciidoc))
-          .and_return(filtered_html)
-
-        expect( render('foo', context) ).to eql filtered_html
-      end
-    end
-
     def render(*args)
       described_class.render(*args)
     end

From 4089be8fedbe0499108b32dc0c08b6378efc534c Mon Sep 17 00:00:00 2001
From: James Lopez <james@jameslopez.es>
Date: Fri, 12 Feb 2016 18:01:47 +0100
Subject: [PATCH 118/134] woo hoo - getting there with the cross-reference
 issue. Should fix the problem and updated spec

---
 app/services/system_note_service.rb       | 15 +++++++++++----
 spec/services/system_note_service_spec.rb | 10 ++++++----
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/app/services/system_note_service.rb b/app/services/system_note_service.rb
index 34b6636c39f..843b44abd17 100644
--- a/app/services/system_note_service.rb
+++ b/app/services/system_note_service.rb
@@ -280,6 +280,7 @@ class SystemNoteService
   # mentioner - Mentionable object
   #
   # Returns Boolean
+
   def self.cross_reference_exists?(noteable, mentioner)
     # Initial scope should be system notes of this noteable type
     notes = Note.system.where(noteable_type: noteable.class)
@@ -291,14 +292,20 @@ class SystemNoteService
       notes = notes.where(noteable_id: noteable.id)
     end
 
-    gfm_reference = mentioner.gfm_reference(nil)
-    notes = notes.where('note LIKE ?', "#{cross_reference_note_prefix}%#{gfm_reference}")
-
-    notes.count > 0
+    notes_for_mentioner(mentioner, noteable, notes).count > 0
   end
 
   private
 
+  def self.notes_for_mentioner(mentioner, noteable, notes)
+    if mentioner.is_a?(Commit)
+      notes.where('note LIKE ?', "#{cross_reference_note_prefix}%#{mentioner.to_reference(nil)}")
+    else
+      gfm_reference = mentioner.gfm_reference(noteable.project)
+      notes.where(note: cross_reference_note_content(gfm_reference))
+    end
+  end
+
   def self.create_note(args = {})
     Note.create(args.merge(system: true))
   end
diff --git a/spec/services/system_note_service_spec.rb b/spec/services/system_note_service_spec.rb
index 655efa0670b..0c063fcb959 100644
--- a/spec/services/system_note_service_spec.rb
+++ b/spec/services/system_note_service_spec.rb
@@ -425,18 +425,20 @@ describe SystemNoteService, services: true do
       end
     end
 
-    context 'commit from fork' do
+    context 'commit with cross-reference from fork' do
       let(:author2) { create(:user) }
       let(:forked_project) { Projects::ForkService.new(project, author2).execute }
       let(:commit2) { forked_project.commit }
 
       before do
-        described_class.cross_reference(noteable, commit2, author2)
+        allow(commit0).to receive(:to_reference) { noteable.project.to_reference +
+            commit0.class.reference_prefix + commit0.id}
+        described_class.cross_reference(noteable, commit0, author2)
       end
 
-      it 'is falsey when is a fork mentioning an external issue' do
+      it 'is true when a fork mentions an external issue' do
         expect(described_class.cross_reference_exists?(noteable, commit2)).
-            to be_falsey
+            to be true
       end
     end
   end

From 99a50447a15abb49ae6a3225332f850af78744a9 Mon Sep 17 00:00:00 2001
From: James Lopez <james@jameslopez.es>
Date: Fri, 12 Feb 2016 18:21:01 +0100
Subject: [PATCH 119/134] fix rubocop warning

---
 spec/services/system_note_service_spec.rb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/spec/services/system_note_service_spec.rb b/spec/services/system_note_service_spec.rb
index 0c063fcb959..9b9732ea01f 100644
--- a/spec/services/system_note_service_spec.rb
+++ b/spec/services/system_note_service_spec.rb
@@ -431,8 +431,10 @@ describe SystemNoteService, services: true do
       let(:commit2) { forked_project.commit }
 
       before do
-        allow(commit0).to receive(:to_reference) { noteable.project.to_reference +
-            commit0.class.reference_prefix + commit0.id}
+        allow(commit0).to receive(:to_reference) {
+          noteable.project.to_reference +
+              commit0.class.reference_prefix + commit0.id
+        }
         described_class.cross_reference(noteable, commit0, author2)
       end
 

From 8a62fbdb42304b1c9012a718819aa0d363249c16 Mon Sep 17 00:00:00 2001
From: Achilleas Pipinellis <axilleas@axilleas.me>
Date: Sat, 13 Feb 2016 00:37:43 +0200
Subject: [PATCH 120/134] Remove note on backing up GitLab CI as a separate
 service

[ci skip]
---
 doc/raketasks/backup_restore.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/doc/raketasks/backup_restore.md b/doc/raketasks/backup_restore.md
index cdd6652b7b0..f6d1234ac4a 100644
--- a/doc/raketasks/backup_restore.md
+++ b/doc/raketasks/backup_restore.md
@@ -18,8 +18,6 @@ for two-factor authentication. If you restore a GitLab backup without
 restoring the database encryption key, users who have two-factor
 authentication enabled will lose access to your GitLab server.
 
-If you are interested in GitLab CI backup please follow to the [CI backup documentation](https://gitlab.com/gitlab-org/gitlab-ci/blob/master/doc/raketasks/backup_restore.md)*
-
 ```
 # use this command if you've installed GitLab with the Omnibus package
 sudo gitlab-rake gitlab:backup:create

From 4646cbc4c65854f8f3d0fc42ec385fb9f31db82b Mon Sep 17 00:00:00 2001
From: Takuya Noguchi <tak.noguchi.iridge@gmail.com>
Date: Sat, 13 Feb 2016 12:59:55 +0900
Subject: [PATCH 121/134] Update omniauth to 1.3.1 for memory performance

---
 Gemfile      | 2 +-
 Gemfile.lock | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Gemfile b/Gemfile
index 9114fdd33ac..a1c57af4bac 100644
--- a/Gemfile
+++ b/Gemfile
@@ -21,7 +21,7 @@ gem "pg", '~> 0.18.2', group: :postgres
 gem 'devise',                 '~> 3.5.4'
 gem 'devise-async',           '~> 0.9.0'
 gem 'doorkeeper',             '~> 2.2.0'
-gem 'omniauth',               '~> 1.2.2'
+gem 'omniauth',               '~> 1.3.1'
 gem 'omniauth-azure-oauth2',  '~> 0.0.6'
 gem 'omniauth-bitbucket',     '~> 0.0.2'
 gem 'omniauth-cas3',          '~> 1.1.2'
diff --git a/Gemfile.lock b/Gemfile.lock
index 98a36724fe0..718285e1665 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -491,9 +491,9 @@ GEM
       rack (~> 1.2)
     octokit (3.8.0)
       sawyer (~> 0.6.0, >= 0.5.3)
-    omniauth (1.2.2)
+    omniauth (1.3.1)
       hashie (>= 1.2, < 4)
-      rack (~> 1.0)
+      rack (>= 1.0, < 3)
     omniauth-azure-oauth2 (0.0.6)
       jwt (~> 1.0)
       omniauth (~> 1.0)
@@ -963,7 +963,7 @@ DEPENDENCIES
   nprogress-rails (~> 0.1.6.7)
   oauth2 (~> 1.0.0)
   octokit (~> 3.8.0)
-  omniauth (~> 1.2.2)
+  omniauth (~> 1.3.1)
   omniauth-azure-oauth2 (~> 0.0.6)
   omniauth-bitbucket (~> 0.0.2)
   omniauth-cas3 (~> 1.1.2)

From 7ffcc5a17bc462b652e91c1cff36b8baaeb6a41a Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Fri, 12 Feb 2016 17:41:52 -0800
Subject: [PATCH 122/134] Fix duplicate "me" in tooltip of the "thumbsup"
 awards Emoji

Steps to reproduce:

1. Go to a MR or issue
2. Click on "thumbsup" Emoji 3 times
3. Observe the tooltip becomes "me, me"

Closes #13374, #12788
---
 CHANGELOG                                    | 1 +
 app/assets/javascripts/awards_handler.coffee | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 9b2d6d58a5c..a3ceca34b07 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
 Please view this file on the master branch, on stable branches it's out of date.
 
 v 8.5.0 (unreleased)
+  - Fix duplicate "me" in tooltip of the "thumbsup" awards Emoji (Stan Hu)
   - Cache various Repository methods to improve performance (Yorick Peterse)
   - Fix duplicated branch creation/deletion Web hooks/service notifications when using Web UI (Stan Hu)
   - Ensure rake tasks that don't need a DB connection can be run without one
diff --git a/app/assets/javascripts/awards_handler.coffee b/app/assets/javascripts/awards_handler.coffee
index 047df4786a9..360acb864f6 100644
--- a/app/assets/javascripts/awards_handler.coffee
+++ b/app/assets/javascripts/awards_handler.coffee
@@ -49,10 +49,11 @@ class @AwardsHandler
       counter.text(parseInt(counter.text()) - 1)
       emojiIcon.removeClass("active")
       @removeMeFromAuthorList(emoji)
-    else if emoji =="thumbsup" || emoji == "thumbsdown"
+    else if emoji == "thumbsup" || emoji == "thumbsdown"
       emojiIcon.tooltip("destroy")
       counter.text(0)
       emojiIcon.removeClass("active")
+      @removeMeFromAuthorList(emoji)
     else
       emojiIcon.tooltip("destroy")
       emojiIcon.remove()

From 46d35cdbe572e7cad434ed9c61fc264160184aba Mon Sep 17 00:00:00 2001
From: Stan Hu <stanhu@gmail.com>
Date: Sat, 13 Feb 2016 02:47:15 -0800
Subject: [PATCH 123/134] Add spinach tests for award emoji

---
 features/project/issues/award_emoji.feature  | 11 ++++++++-
 features/steps/project/issues/award_emoji.rb | 26 ++++++++++++++++++++
 2 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/features/project/issues/award_emoji.feature b/features/project/issues/award_emoji.feature
index bfde89fd896..2945bb3753a 100644
--- a/features/project/issues/award_emoji.feature
+++ b/features/project/issues/award_emoji.feature
@@ -7,7 +7,16 @@ Feature: Award Emoji
     And I visit "Bugfix" issue page
 
   @javascript
-  Scenario: I add and remove award in the issue
+  Scenario: I repeatedly add and remove thumbsup award in the issue
+    Given I click the thumbsup award Emoji
+    Then I have award added
+    Given I click the thumbsup award Emoji
+    Then I have no awards added
+    Given I click the thumbsup award Emoji
+    Then I have award added
+
+  @javascript
+  Scenario: I add and remove custom award in the issue
     Given I click to emoji-picker
     Then The search field is focused
     And I click to emoji in the picker
diff --git a/features/steps/project/issues/award_emoji.rb b/features/steps/project/issues/award_emoji.rb
index 69695d493f3..8b9aa6aabfa 100644
--- a/features/steps/project/issues/award_emoji.rb
+++ b/features/steps/project/issues/award_emoji.rb
@@ -8,6 +8,15 @@ class Spinach::Features::AwardEmoji < Spinach::FeatureSteps
     visit namespace_project_issue_path(@project.namespace, @project, @issue)
   end
 
+  step 'I click the thumbsup award Emoji' do
+    page.within '.awards' do
+      thumbsup = page.find('.award .emoji-1F44D')
+      thumbsup.click
+      thumbsup.hover
+      sleep 0.3
+    end
+  end
+
   step 'I click to emoji-picker' do
     page.within '.awards-controls' do
       page.find('.add-award').click
@@ -40,6 +49,23 @@ class Spinach::Features::AwardEmoji < Spinach::FeatureSteps
     page.within '.awards' do
       expect(page).to have_selector '.award'
       expect(page.find('.award.active .counter')).to have_content '1'
+      expect(page.find('.award.active')['data-original-title']).to eq('me')
+    end
+  end
+
+  step 'I have no awards added' do
+    page.within '.awards' do
+      expect(page).to have_selector '.award'
+      expect(page.all('.award').size).to eq(2)
+
+      # Check tooltip data
+      page.all('.award').each do |element|
+        expect(element['title']).to eq("")
+      end
+
+      page.all('.award .counter').each do |element|
+        expect(element).to have_content '0'
+      end
     end
   end
 

From 54613b6af56008588a3cc8a9e9f2ee642ca59a36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Coutable?= <remy@rymai.me>
Date: Mon, 15 Feb 2016 15:19:23 +0100
Subject: [PATCH 124/134] Fix the "x of y" displayed at the top of Issuables'
 sidebar

1. We now display the index of the current issuable among all its project's
issuables, of the same type and with the same state.
2. Also, refactored a bit the Issuable helpers into a new IssuablesHelper
module.
3. Added acceptance specs for the sidebar counter.
---
 app/helpers/application_helper.rb            | 70 --------------------
 app/helpers/issuables_helper.rb              | 41 ++++++++++++
 app/helpers/nav_helper.rb                    | 18 +----
 app/models/concerns/issuable.rb              | 10 +++
 app/views/shared/issuable/_sidebar.html.haml | 17 ++---
 features/project/issues/issues.feature       |  9 ++-
 features/project/merge_requests.feature      |  1 +
 features/steps/project/issues/issues.rb      |  5 ++
 features/steps/shared/issuable.rb            | 24 +++++++
 9 files changed, 99 insertions(+), 96 deletions(-)
 create mode 100644 app/helpers/issuables_helper.rb

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 02357e2f23e..ecefa9b006d 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -280,76 +280,6 @@ module ApplicationHelper
     end
   end
 
-  def issuable_link_next(project,issuable)
-    if project.nil?
-      nil
-    elsif current_controller?(:issues)
-      namespace_project_issue_path(project.namespace, project, next_issuable_for(project, issuable.id).try(:iid))
-    elsif current_controller?(:merge_requests)
-      namespace_project_merge_request_path(project.namespace, project, next_issuable_for(project, issuable.id).try(:iid))
-    end
-  end
-
-  def issuable_link_prev(project,issuable)
-    if project.nil?
-      nil
-    elsif current_controller?(:issues)
-      namespace_project_issue_path(project.namespace, project, prev_issuable_for(project, issuable.id).try(:iid))
-    elsif current_controller?(:merge_requests)
-      namespace_project_merge_request_path(project.namespace, project, prev_issuable_for(project, issuable.id).try(:iid))
-    end
-  end
-
-  def issuable_count(entity, project)
-    if project.nil?
-      0
-    elsif current_controller?(:issues)
-      project.issues.send(entity).count
-    elsif current_controller?(:merge_requests)
-      project.merge_requests.send(entity).count
-    end
-  end
-
-  def next_issuable_for(project, id)
-    if project.nil?
-      nil
-    elsif current_controller?(:issues)
-      project.issues.where("id > ?", id).last
-    elsif current_controller?(:merge_requests)
-      project.merge_requests.where("id > ?", id).last
-    end
-  end
-
-  def has_next_issuable?(project, id)
-    if project.nil?
-      nil
-    elsif current_controller?(:issues)
-      project.issues.where("id > ?", id).last
-    elsif current_controller?(:merge_requests)
-      project.merge_requests.where("id > ?", id).last
-    end
-  end
-
-  def prev_issuable_for(project, id)
-    if project.nil?
-      nil
-    elsif current_controller?(:issues)
-      project.issues.where("id < ?", id).first
-    elsif current_controller?(:merge_requests)
-      project.merge_requests.where("id < ?", id).first
-    end
-  end
-
-  def has_prev_issuable?(project, id)
-    if project.nil?
-      nil
-    elsif current_controller?(:issues)
-      project.issues.where("id < ?", id).first
-    elsif current_controller?(:merge_requests)
-      project.merge_requests.where("id < ?", id).first
-    end
-  end
-
   def state_filters_text_for(entity, project)
     titles = {
       opened: "Open"
diff --git a/app/helpers/issuables_helper.rb b/app/helpers/issuables_helper.rb
new file mode 100644
index 00000000000..ccbd93967a2
--- /dev/null
+++ b/app/helpers/issuables_helper.rb
@@ -0,0 +1,41 @@
+module IssuablesHelper
+
+  def sidebar_gutter_toggle_icon
+    sidebar_gutter_collapsed? ? icon('angle-double-left') : icon('angle-double-right')
+  end
+
+  def sidebar_gutter_collapsed_class
+    "right-sidebar-#{sidebar_gutter_collapsed? ? 'collapsed' : 'expanded'}"
+  end
+
+  def issuable_index(issuable)
+    base_issuable_scope(issuable).where('id < ?', issuable.id).size + 1
+  end
+
+  def issuables_count(issuable)
+    base_issuable_scope(issuable).size
+  end
+
+  def next_issuable_for(issuable)
+    base_issuable_scope(issuable).where('id > ?', issuable.id).last
+  end
+
+  def prev_issuable_for(issuable)
+    base_issuable_scope(issuable).where('id < ?', issuable.id).first
+  end
+
+  private
+
+  def sidebar_gutter_collapsed?
+    cookies[:collapsed_gutter] == 'true'
+  end
+
+  def base_issuable_scope(issuable)
+    issuable.project.send(issuable.to_scope_name).send(issuable_state_scope(issuable))
+  end
+
+  def issuable_state_scope(issuable)
+    issuable.open? ? :opened : :closed
+  end
+
+end
diff --git a/app/helpers/nav_helper.rb b/app/helpers/nav_helper.rb
index 75f2ed5e054..29cb753e62c 100644
--- a/app/helpers/nav_helper.rb
+++ b/app/helpers/nav_helper.rb
@@ -3,18 +3,6 @@ module NavHelper
     cookies[:collapsed_nav] == 'true'
   end
 
-  def sidebar_gutter_collapsed_class
-    if cookies[:collapsed_gutter] == 'true'
-      "right-sidebar-collapsed"
-    else
-      "right-sidebar-expanded"
-    end
-  end
-
-  def sidebar_gutter_collapsed?
-    cookies[:collapsed_gutter] == 'true'
-  end
-
   def nav_sidebar_class
     if nav_menu_collapsed?
       "sidebar-collapsed"
@@ -32,9 +20,9 @@ module NavHelper
   end
 
   def page_gutter_class
-    if current_path?('merge_requests#show') || 
-      current_path?('merge_requests#diffs') || 
-      current_path?('merge_requests#commits') || 
+    if current_path?('merge_requests#show') ||
+      current_path?('merge_requests#diffs') ||
+      current_path?('merge_requests#commits') ||
       current_path?('issues#show')
       if cookies[:collapsed_gutter] == 'true'
         "page-gutter right-sidebar-collapsed"
diff --git a/app/models/concerns/issuable.rb b/app/models/concerns/issuable.rb
index cf6aa592e2a..e08687135d6 100644
--- a/app/models/concerns/issuable.rb
+++ b/app/models/concerns/issuable.rb
@@ -168,6 +168,16 @@ module Issuable
     self.class.to_s.underscore
   end
 
+  # Convert this Issuable class name to a format usable for scoping
+  #
+  # Examples:
+  #
+  #   issuable.class         # => MergeRequest
+  #   issuable.to_scope_name # => "merge_requests"
+  def to_scope_name
+    self.class.to_s.tableize
+  end
+
   # Returns a Hash of attributes to be used for Twitter card metadata
   def card_attributes
     {
diff --git a/app/views/shared/issuable/_sidebar.html.haml b/app/views/shared/issuable/_sidebar.html.haml
index ae96a45453f..cb5378964bc 100644
--- a/app/views/shared/issuable/_sidebar.html.haml
+++ b/app/views/shared/issuable/_sidebar.html.haml
@@ -2,23 +2,20 @@
   .issuable-sidebar
     .block
       %span.issuable-count.pull-left
-        = issuable.iid
+        = issuable_index(issuable)
         of
-        = issuable_count(:all, @project)
+        = issuables_count(issuable)
       %span.pull-right
         %a.gutter-toggle{href: '#'}
-          - if sidebar_gutter_collapsed?
-            = icon('angle-double-left')
-          - else
-            = icon('angle-double-right')
+          = sidebar_gutter_toggle_icon
       .issuable-nav.pull-right.btn-group{role: 'group', "aria-label" => '...'}
-        - if has_prev_issuable?(@project, issuable.id)
-          = link_to 'Prev', issuable_link_prev(@project, issuable), class: 'btn btn-default prev-btn'
+        - if prev_issuable = prev_issuable_for(issuable)
+          = link_to 'Prev', [@project.namespace.becomes(Namespace), @project, prev_issuable], class: 'btn btn-default prev-btn'
         - else
           %a.btn.btn-default.disabled{href: '#'}
             Prev
-        - if has_next_issuable?(@project, issuable.id)
-          = link_to 'Next', issuable_link_next(@project, issuable), class: 'btn btn-default next-btn'
+        - if next_issuable = next_issuable_for(issuable)
+          = link_to 'Next', [@project.namespace.becomes(Namespace), @project, next_issuable], class: 'btn btn-default next-btn'
         - else
           %a.btn.btn-default.disabled{href: '#'}
             Next
diff --git a/features/project/issues/issues.feature b/features/project/issues/issues.feature
index 0b3d03aa2a5..ca2399d85a9 100644
--- a/features/project/issues/issues.feature
+++ b/features/project/issues/issues.feature
@@ -25,9 +25,16 @@ Feature: Project Issues
   Scenario: I visit issue page
     Given I click link "Release 0.4"
     Then I should see issue "Release 0.4"
+    And I should see "1 of 2" in the sidebar
+
+  Scenario: I navigate between issues
+    Given I click link "Release 0.4"
+    Then I click link "Next" in the sidebar
+    Then I should see issue "Tweet control"
+    And I should see "2 of 2" in the sidebar
 
   @javascript
-  Scenario: I visit issue page
+  Scenario: I filter by author
     Given I add a user to project "Shop"
     And I click "author" dropdown
     Then I see current user as the first user
diff --git a/features/project/merge_requests.feature b/features/project/merge_requests.feature
index ca1ee6b3c2b..5995e787961 100644
--- a/features/project/merge_requests.feature
+++ b/features/project/merge_requests.feature
@@ -39,6 +39,7 @@ Feature: Project Merge Requests
   Scenario: I visit merge request page
     Given I click link "Bug NS-04"
     Then I should see merge request "Bug NS-04"
+    And I should see "1 of 1" in the sidebar
 
   Scenario: I close merge request page
     Given I click link "Bug NS-04"
diff --git a/features/steps/project/issues/issues.rb b/features/steps/project/issues/issues.rb
index d556b73f9fd..09a89e99831 100644
--- a/features/steps/project/issues/issues.rb
+++ b/features/steps/project/issues/issues.rb
@@ -54,6 +54,10 @@ class Spinach::Features::ProjectIssues < Spinach::FeatureSteps
     expect(page).to have_content "Release 0.4"
   end
 
+  step 'I should see issue "Tweet control"' do
+    expect(page).to have_content "Tweet control"
+  end
+
   step 'I click link "New Issue"' do
     click_link "New Issue"
   end
@@ -301,4 +305,5 @@ class Spinach::Features::ProjectIssues < Spinach::FeatureSteps
   def filter_issue(text)
     fill_in 'issue_search', with: text
   end
+
 end
diff --git a/features/steps/shared/issuable.rb b/features/steps/shared/issuable.rb
index 25c2b476f43..2117feaedb8 100644
--- a/features/steps/shared/issuable.rb
+++ b/features/steps/shared/issuable.rb
@@ -119,6 +119,24 @@ module SharedIssuable
     end
   end
 
+  step 'I should see "1 of 1" in the sidebar' do
+    expect_sidebar_content('1 of 1')
+  end
+
+  step 'I should see "1 of 2" in the sidebar' do
+    expect_sidebar_content('1 of 2')
+  end
+
+  step 'I should see "2 of 2" in the sidebar' do
+    expect_sidebar_content('2 of 2')
+  end
+
+  step 'I click link "Next" in the sidebar' do
+    page.within '.issuable-sidebar' do
+      click_link 'Next'
+    end
+  end
+
   def create_issuable_for_project(project_name:, title:, type: :issue)
     project = Project.find_by(name: project_name)
 
@@ -159,4 +177,10 @@ module SharedIssuable
     expect(page).to have_content("mentioned in #{issuable.class.to_s.titleize.downcase} #{issuable.to_reference(project)}")
   end
 
+  def expect_sidebar_content(content)
+    page.within '.issuable-sidebar' do
+      expect(page).to have_content content
+    end
+  end
+
 end

From 447568d15f9ec2d47a15fc04aeb2cb507cd6a55c Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Mon, 15 Feb 2016 14:13:47 -0500
Subject: [PATCH 125/134] Fix undefined method `postgresql?` during migration

---
 lib/gitlab/database.rb           |  8 ++------
 spec/lib/gitlab/database_spec.rb | 32 ++++++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/lib/gitlab/database.rb b/lib/gitlab/database.rb
index 6ebb8027553..6f9da69983a 100644
--- a/lib/gitlab/database.rb
+++ b/lib/gitlab/database.rb
@@ -17,7 +17,7 @@ module Gitlab
     end
 
     def true_value
-      if self.class.postgresql?
+      if Gitlab::Database.postgresql?
         "'t'"
       else
         1
@@ -25,7 +25,7 @@ module Gitlab
     end
 
     def false_value
-      if self.class.postgresql?
+      if Gitlab::Database.postgresql?
         "'f'"
       else
         0
@@ -47,9 +47,5 @@ module Gitlab
         row.first
       end
     end
-
-    def connection
-      self.class.connection
-    end
   end
 end
diff --git a/spec/lib/gitlab/database_spec.rb b/spec/lib/gitlab/database_spec.rb
index bd8688fefa1..d0a447753b7 100644
--- a/spec/lib/gitlab/database_spec.rb
+++ b/spec/lib/gitlab/database_spec.rb
@@ -1,5 +1,9 @@
 require 'spec_helper'
 
+class MigrationTest
+  include Gitlab::Database
+end
+
 describe Gitlab::Database, lib: true do
   # These are just simple smoke tests to check if the methods work (regardless
   # of what they may return).
@@ -34,4 +38,32 @@ describe Gitlab::Database, lib: true do
       end
     end
   end
+
+  describe '#true_value' do
+    it 'returns correct value for PostgreSQL' do
+      expect(described_class).to receive(:postgresql?).and_return(true)
+
+      expect(MigrationTest.new.true_value).to eq "'t'"
+    end
+
+    it 'returns correct value for MySQL' do
+      expect(described_class).to receive(:postgresql?).and_return(false)
+
+      expect(MigrationTest.new.true_value).to eq 1
+    end
+  end
+
+  describe '#false_value' do
+    it 'returns correct value for PostgreSQL' do
+      expect(described_class).to receive(:postgresql?).and_return(true)
+
+      expect(MigrationTest.new.false_value).to eq "'f'"
+    end
+
+    it 'returns correct value for MySQL' do
+      expect(described_class).to receive(:postgresql?).and_return(false)
+
+      expect(MigrationTest.new.false_value).to eq 0
+    end
+  end
 end

From f5ab126fd0e607811638ca36b6752d5c74535adf Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Mon, 15 Feb 2016 15:48:16 -0500
Subject: [PATCH 126/134] Ensure Commit#show responds 404 instead of 500 when
 given an invalid ID

Closes #13467
---
 app/controllers/projects/commit_controller.rb |  4 +-
 .../projects/commit_controller_spec.rb        | 37 +++++++++++++++++++
 2 files changed, 39 insertions(+), 2 deletions(-)
 create mode 100644 spec/controllers/projects/commit_controller_spec.rb

diff --git a/app/controllers/projects/commit_controller.rb b/app/controllers/projects/commit_controller.rb
index 21f4d9f44ec..36951b91372 100644
--- a/app/controllers/projects/commit_controller.rb
+++ b/app/controllers/projects/commit_controller.rb
@@ -11,8 +11,6 @@ class Projects::CommitController < Projects::ApplicationController
   before_action :define_show_vars, only: [:show, :builds]
 
   def show
-    return git_not_found! unless @commit
-
     apply_diff_view_cookie!
 
     @line_notes = commit.notes.inline
@@ -68,6 +66,8 @@ class Projects::CommitController < Projects::ApplicationController
   end
 
   def define_show_vars
+    return git_not_found! unless commit
+
     if params[:w].to_i == 1
       @diffs = commit.diffs({ ignore_whitespace_change: true })
     else
diff --git a/spec/controllers/projects/commit_controller_spec.rb b/spec/controllers/projects/commit_controller_spec.rb
new file mode 100644
index 00000000000..438e776ec4b
--- /dev/null
+++ b/spec/controllers/projects/commit_controller_spec.rb
@@ -0,0 +1,37 @@
+require 'rails_helper'
+
+describe Projects::CommitController do
+  describe 'GET show' do
+    let(:project) { create(:project) }
+
+    before do
+      user = create(:user)
+      project.team << [user, :master]
+
+      sign_in(user)
+    end
+
+    context 'with valid id' do
+      it 'responds with 200' do
+        go id: project.commit.id
+
+        expect(response).to be_ok
+      end
+    end
+
+    context 'with invalid id' do
+      it 'responds with 404' do
+        go id: project.commit.id.reverse
+
+        expect(response).to be_not_found
+      end
+    end
+
+    def go(id:)
+      get :show,
+        namespace_id: project.namespace.to_param,
+        project_id: project.to_param,
+        id: id
+    end
+  end
+end

From 012c75d1b0a24aff3c31ca5b5d475e06d5f77428 Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Mon, 15 Feb 2016 15:52:39 -0500
Subject: [PATCH 127/134] Properly render the `errors/git_not_found` page

---
 app/controllers/application_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 48b1f95acb9..7afe3c0c471 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -164,7 +164,7 @@ class ApplicationController < ActionController::Base
   end
 
   def git_not_found!
-    render html: "errors/git_not_found", layout: "errors", status: 404
+    render "errors/git_not_found", layout: "errors", status: 404
   end
 
   def method_missing(method_sym, *arguments, &block)

From ae13389b0b8654abcffead659788580e8c1f1a15 Mon Sep 17 00:00:00 2001
From: Robert Speicher <rspeicher@gmail.com>
Date: Mon, 15 Feb 2016 16:38:27 -0500
Subject: [PATCH 128/134] Provide explicit html format when rendering
 git_not_found page

Prior, if the request format was, for example, .zip, we'd get an
`ActionView::MissingTemplate` error.
---
 app/controllers/application_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 7afe3c0c471..2c329b60a19 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -164,7 +164,7 @@ class ApplicationController < ActionController::Base
   end
 
   def git_not_found!
-    render "errors/git_not_found", layout: "errors", status: 404
+    render "errors/git_not_found.html", layout: "errors", status: 404
   end
 
   def method_missing(method_sym, *arguments, &block)

From 3de6edd6041a725aaffba95603d4eb2912627d42 Mon Sep 17 00:00:00 2001
From: Sytse Sijbrandij <sytse@gitlab.com>
Date: Mon, 15 Feb 2016 19:38:36 -0800
Subject: [PATCH 129/134] Updates to git flow documentation.

---
 doc/workflow/gitlab_flow.md | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/doc/workflow/gitlab_flow.md b/doc/workflow/gitlab_flow.md
index be32f0c720b..0b205ea6de7 100644
--- a/doc/workflow/gitlab_flow.md
+++ b/doc/workflow/gitlab_flow.md
@@ -187,12 +187,15 @@ If you have an issue that spans across multiple repositories, the best thing is
 ![Vim screen showing the rebase view](rebase.png)
 
 With git you can use an interactive rebase (`rebase -i`) to squash multiple commits into one and reorder them.
+In GitLab EE and .com you can also [rebase before merge](http://doc.gitlab.com/ee/workflow/rebase_before_merge.html) from the web interface.
 This functionality is useful if you made a couple of commits for small changes during development and want to replace them with a single commit or if you want to make the order more logical.
 However you should never rebase commits you have pushed to a remote server.
 Somebody can have referred to the commits or cherry-picked them.
 When you rebase you change the identifier (SHA-1) of the commit and this is confusing.
 If you do that the same change will be known under multiple identifiers and this can cause much confusion.
 If people already reviewed your code it will be hard for them to review only the improvements you made since then if you have rebased everything into one commit.
+Another reasons not to rebase is that you lose authorship information, maybe someone created a merge request, another person pushed a commit on there to improve it and a third one merged it.
+In this case rebasing all the commits into one prevent the other authors from being properly attributed and sharing part of the [git blame](https://git-scm.com/docs/git-blame).
 
 People are encouraged to commit often and to frequently push to the remote repository so other people are aware what everyone is working on.
 This will lead to many commits per change which makes the history harder to understand.
@@ -221,13 +224,11 @@ You can reuse recorded resolutions (rerere) sometimes, but without rebasing you
 There has to be a better way to avoid many merge commits.
 
 The way to prevent creating many merge commits is to not frequently merge master into the feature branch.
-We'll discuss the three reasons to merge in master: leveraging code, solving merge conflicts and long running branches.
+We'll discuss the three reasons to merge in master: leveraging code, merge conflicts, and long running branches.
 If you need to leverage some code that was introduced in master after you created the feature branch you can sometimes solve this by just cherry-picking a commit.
 If your feature branch has a merge conflict, creating a merge commit is a normal way of solving this.
-You should aim to prevent merge conflicts where they are likely to occur.
-One example is the CHANGELOG file where each significant change in the codebase is documented under a version header.
-Instead of everyone adding their change at the bottom of the list for the current version it is better to randomly insert it in the current list for that version.
-This it is likely that multiple feature branches that add to the CHANGELOG can be merged before a conflict occurs.
+You can prevent some merge conflicts by using [gitattributes](http://git-scm.com/docs/gitattributes) for files that can be in a random order.
+For example in GitLab our changelog file is specified in .gitattributes as `CHANGELOG merge=union` so that there are fewer merge conflicts in it.
 The last reason for creating merge commits is having long lived branches that you want to keep up to date with the latest state of the project.
 Martin Fowler, in [his article about feature branches](http://martinfowler.com/bliki/FeatureBranch.html) talks about this Continuous Integration (CI).
 At GitLab we are guilty of confusing CI with branch testing. Quoting Martin Fowler: "I've heard people say they are doing CI because they are running builds, perhaps using a CI server, on every branch with every commit.

From 11913a762a3ed6514594e6ac6ffe1717dd362ae1 Mon Sep 17 00:00:00 2001
From: James Lopez <james@jameslopez.es>
Date: Tue, 16 Feb 2016 09:01:56 +0100
Subject: [PATCH 130/134] updated system note service and spec based on
 feedback

---
 app/services/system_note_service.rb       | 4 +++-
 spec/services/system_note_service_spec.rb | 4 ----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/app/services/system_note_service.rb b/app/services/system_note_service.rb
index 843b44abd17..edced010811 100644
--- a/app/services/system_note_service.rb
+++ b/app/services/system_note_service.rb
@@ -274,7 +274,9 @@ class SystemNoteService
   # Check if a cross reference to a noteable from a mentioner already exists
   #
   # This method is used to prevent multiple notes being created for a mention
-  # when a issue is updated, for example.
+  # when a issue is updated, for example. The method also calls notes_for_mentioner
+  # to check if the mentioner is a commit, and return matches only on commit hash
+  # instead of project + commit, to avoid repeated mentions from forks.
   #
   # noteable  - Noteable object being referenced
   # mentioner - Mentionable object
diff --git a/spec/services/system_note_service_spec.rb b/spec/services/system_note_service_spec.rb
index 9b9732ea01f..1bdc03af12d 100644
--- a/spec/services/system_note_service_spec.rb
+++ b/spec/services/system_note_service_spec.rb
@@ -431,10 +431,6 @@ describe SystemNoteService, services: true do
       let(:commit2) { forked_project.commit }
 
       before do
-        allow(commit0).to receive(:to_reference) {
-          noteable.project.to_reference +
-              commit0.class.reference_prefix + commit0.id
-        }
         described_class.cross_reference(noteable, commit0, author2)
       end
 

From 5cd20de7499840463eb1ee91793359ea52f29af8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Coutable?= <remy@rymai.me>
Date: Tue, 16 Feb 2016 10:48:37 +0100
Subject: [PATCH 131/134] Eager-load image blob data in diffs

Since gitlab_git 8.0, blob data are lazy-loaded so we have to call
blob.load_all_data!(repo) to eager-load them.

Fixes #13458.
---
 app/views/projects/diffs/_image.html.haml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/views/projects/diffs/_image.html.haml b/app/views/projects/diffs/_image.html.haml
index 058b71b21f5..4fcf7ea0b26 100644
--- a/app/views/projects/diffs/_image.html.haml
+++ b/app/views/projects/diffs/_image.html.haml
@@ -1,4 +1,5 @@
 - diff = diff_file.diff
+- file.load_all_data!(@project.repository)
 - if diff.renamed_file || diff.new_file || diff.deleted_file
   .image
     %span.wrap
@@ -6,6 +7,7 @@
         %img{src: "data:#{file.mime_type};base64,#{Base64.encode64(file.data)}"}
       %p.image-info= "#{number_to_human_size file.size}"
 - else
+  - old_file.load_all_data!(@project.repository)
   .image
     %div.two-up.view
       %span.wrap

From f253f72529824198a591e06537d321917eca1d5e Mon Sep 17 00:00:00 2001
From: Yorick Peterse <yorickpeterse@gmail.com>
Date: Tue, 16 Feb 2016 12:13:13 +0100
Subject: [PATCH 132/134] Cleaned up Repository#initialize

The "default_branch" argument is never used and the "project" argument
isn't optional.
---
 app/models/project.rb      | 2 +-
 app/models/project_wiki.rb | 2 +-
 app/models/repository.rb   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/models/project.rb b/app/models/project.rb
index f11c6d7c6be..d18131a6762 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -342,7 +342,7 @@ class Project < ActiveRecord::Base
   end
 
   def repository
-    @repository ||= Repository.new(path_with_namespace, nil, self)
+    @repository ||= Repository.new(path_with_namespace, self)
   end
 
   def commit(id = 'HEAD')
diff --git a/app/models/project_wiki.rb b/app/models/project_wiki.rb
index c847eba8d1c..c96e6f0b8ea 100644
--- a/app/models/project_wiki.rb
+++ b/app/models/project_wiki.rb
@@ -123,7 +123,7 @@ class ProjectWiki
   end
 
   def repository
-    Repository.new(path_with_namespace, default_branch, @project)
+    Repository.new(path_with_namespace, @project)
   end
 
   def default_branch
diff --git a/app/models/repository.rb b/app/models/repository.rb
index 7f0047a002e..ba275fd9803 100644
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -15,7 +15,7 @@ class Repository
     Gitlab::Popen.popen(%W(find #{repository_downloads_path} -not -path #{repository_downloads_path} -mmin +120 -delete))
   end
 
-  def initialize(path_with_namespace, default_branch = nil, project = nil)
+  def initialize(path_with_namespace, project)
     @path_with_namespace = path_with_namespace
     @project = project
   end

From d28fa2ce233e057dc47de17bb6c1f2dff141059a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Coutable?= <remy@rymai.me>
Date: Tue, 16 Feb 2016 12:58:12 +0100
Subject: [PATCH 133/134] Display "iid of max_iid" in Issuables' sidebar

---
 app/helpers/issuables_helper.rb              | 12 ++++--------
 app/models/concerns/issuable.rb              | 10 ----------
 app/views/shared/issuable/_sidebar.html.haml |  2 +-
 3 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/app/helpers/issuables_helper.rb b/app/helpers/issuables_helper.rb
index ccbd93967a2..91a3aa371ef 100644
--- a/app/helpers/issuables_helper.rb
+++ b/app/helpers/issuables_helper.rb
@@ -8,20 +8,16 @@ module IssuablesHelper
     "right-sidebar-#{sidebar_gutter_collapsed? ? 'collapsed' : 'expanded'}"
   end
 
-  def issuable_index(issuable)
-    base_issuable_scope(issuable).where('id < ?', issuable.id).size + 1
-  end
-
   def issuables_count(issuable)
-    base_issuable_scope(issuable).size
+    base_issuable_scope(issuable).maximum(:iid)
   end
 
   def next_issuable_for(issuable)
-    base_issuable_scope(issuable).where('id > ?', issuable.id).last
+    base_issuable_scope(issuable).where('iid > ?', issuable.iid).last
   end
 
   def prev_issuable_for(issuable)
-    base_issuable_scope(issuable).where('id < ?', issuable.id).first
+    base_issuable_scope(issuable).where('iid < ?', issuable.iid).first
   end
 
   private
@@ -31,7 +27,7 @@ module IssuablesHelper
   end
 
   def base_issuable_scope(issuable)
-    issuable.project.send(issuable.to_scope_name).send(issuable_state_scope(issuable))
+    issuable.project.send(issuable.class.table_name).send(issuable_state_scope(issuable))
   end
 
   def issuable_state_scope(issuable)
diff --git a/app/models/concerns/issuable.rb b/app/models/concerns/issuable.rb
index e08687135d6..cf6aa592e2a 100644
--- a/app/models/concerns/issuable.rb
+++ b/app/models/concerns/issuable.rb
@@ -168,16 +168,6 @@ module Issuable
     self.class.to_s.underscore
   end
 
-  # Convert this Issuable class name to a format usable for scoping
-  #
-  # Examples:
-  #
-  #   issuable.class         # => MergeRequest
-  #   issuable.to_scope_name # => "merge_requests"
-  def to_scope_name
-    self.class.to_s.tableize
-  end
-
   # Returns a Hash of attributes to be used for Twitter card metadata
   def card_attributes
     {
diff --git a/app/views/shared/issuable/_sidebar.html.haml b/app/views/shared/issuable/_sidebar.html.haml
index cb5378964bc..e1aecdd9436 100644
--- a/app/views/shared/issuable/_sidebar.html.haml
+++ b/app/views/shared/issuable/_sidebar.html.haml
@@ -2,7 +2,7 @@
   .issuable-sidebar
     .block
       %span.issuable-count.pull-left
-        = issuable_index(issuable)
+        = issuable.iid
         of
         = issuables_count(issuable)
       %span.pull-right

From 1de95137906e1b262eeaf2d627469c9a1e47a536 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Coutable?= <remy@rymai.me>
Date: Tue, 16 Feb 2016 13:03:00 +0100
Subject: [PATCH 134/134] Use project.web_url instead deprecated
 repository.homepage in PushoverService

---
 app/models/project_services/pushover_service.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/project_services/pushover_service.rb b/app/models/project_services/pushover_service.rb
index 3d7e8bbee61..e76d9eca2ab 100644
--- a/app/models/project_services/pushover_service.rb
+++ b/app/models/project_services/pushover_service.rb
@@ -112,7 +112,7 @@ class PushoverService < Service
       priority: priority,
       title: "#{project.name_with_namespace}",
       message: message,
-      url: data[:repository][:homepage],
+      url: data[:project][:web_url],
       url_title: "See project #{project.name_with_namespace}"
     }